From d3836cc42931f06ebb7d38f7cbb45e15fde82e01 Mon Sep 17 00:00:00 2001 From: Laurent GRATEAU Date: Tue, 17 Jun 2025 14:38:07 +0200 Subject: [PATCH 1/3] Prepare Delivery (#68) * Decisions convergence (#48) * Implement support for both Decisions products and refactoring - Made service compatible with ODM and ADS - Integrated metering model for simplified dependencies - Renamed packages, options, produced jar file - Adapted, refactored and reviewed documentation accordingly * Update copyright notices * Deliver next release - 8.12.0 (#45) * Switch to the next version * Change copyright year: DBACLD-90119 * Pre delivery 812 (#44) * Prepare new release. * increase time to run test * Change liberty version for the next release * Use a pre-deploy ruleset * Adapt test after moving to the new rule set * Prepare next delivery * Update Chart.yaml - Fix bad odm version * fix bad version * Update test.sh * Update docker-compose.yml Try to add network * Update docker-compose.yml - Remove network * Update build-and-test.yml * Update build-and-test.yml debug * Update test.sh * Update test.sh * Take the new jar file name into account * Trigger new action build --------- Co-authored-by: Anthony Acremann * Prepare next release * Update Liberty version * Update build-and-test.yml * Update build-and-test.yml * Update build-and-test.yml - Revert * Bad reference url * Update build-and-test.yml - Change Liberty version * Change for the next release * Update build-and-test.yml * Try to workaround issue DBACLD-118818 * Fix location * Update Chart.yaml * Update values.yaml * Update values.yaml * Move to the new release name 9.0.0 * Linter failed * DBACLD-125217 Metering service does not store correctly the metrics * Override delivery to fix issue * New description for the dockerjub * DBACLD-125376 Change copyright * Dbacld 125217 (#50) * Fix configuration of the service * DBACLD-125217 * Try to fix Github action * Fix initVariable syntax * Fix shell syntax. * no message * Debug * Fix metrics check * Move to JDK 17 * improve logging * DBACLD-134790 Change License for the next release * Prepare next release * Preprare next release * Prepare next release * Update README_ODM.md * Update Chart.yaml * Update kuberentes version * Fix Kubernetes requirement * Change home url + Kubernetes version * Try to add artifacthub verified status * Add markdown link check (#53) * DBACLD-139987 - Put in place checker link * ignore some broken links * ignore broken links with localhost URL --------- Co-authored-by: Frederic Mercier * Fix broken link * Fix broken link * prepare next release 24.1.0 (#55) * DBACLD-148300 Enable detect secret * DBACLD-148300 Enable detect secret * Update README.md * add GitHub action running detect-secrets * send notification to Slack if detect-secrets failed * Prep delivery - First pass fix linter (#56) * Prepare next release * Move to a CV new version * Try to fix build. Improve certification level. * Fix remaining linter issues * Fix ODM version to be able to test * Prep delivery (#57) * Prepare next release * Move to a CV new version * Try to fix build. Improve certification level. * Fix remaining linter issues * Fix ODM version to be able to test * Switch Java version to jdk 17 + update the linter version. * Remove duplicate entry * Fix liberty location image * Prep delivery 2401 (#58) * Switch Java version to jdk 17 + update the linter version. * Remove duplicate entry * Fix liberty location image * Preparing new delivery of the helm charts * Prepare next release (#62) * Jakarta (#63) * Prepare IFixes release 9.0.0.1 (#59) * Decisions convergence (#48) * Implement support for both Decisions products and refactoring - Made service compatible with ODM and ADS - Integrated metering model for simplified dependencies - Renamed packages, options, produced jar file - Adapted, refactored and reviewed documentation accordingly * Update copyright notices * Deliver next release - 8.12.0 (#45) * Switch to the next version * Change copyright year: DBACLD-90119 * Pre delivery 812 (#44) * Prepare new release. * increase time to run test * Change liberty version for the next release * Use a pre-deploy ruleset * Adapt test after moving to the new rule set * Prepare next delivery * Update Chart.yaml - Fix bad odm version * fix bad version * Update test.sh * Update docker-compose.yml Try to add network * Update docker-compose.yml - Remove network * Update build-and-test.yml * Update build-and-test.yml debug * Update test.sh * Update test.sh * Take the new jar file name into account * Trigger new action build --------- Co-authored-by: Anthony Acremann * Prepare next release * Update Liberty version * Update build-and-test.yml * Update build-and-test.yml * Update build-and-test.yml - Revert * Bad reference url * Update build-and-test.yml - Change Liberty version * Change for the next release * Update build-and-test.yml * Try to workaround issue DBACLD-118818 * Fix location * Update Chart.yaml * Update values.yaml * Update values.yaml * Move to the new release name 9.0.0 * Linter failed * DBACLD-125217 Metering service does not store correctly the metrics * Override delivery to fix issue * New description for the dockerjub * DBACLD-125376 Change copyright * Dbacld 125217 (#50) * Fix configuration of the service * DBACLD-125217 * Try to fix Github action * Fix initVariable syntax * Fix shell syntax. * no message * Debug * Fix metrics check * Move to JDK 17 * improve logging * DBACLD-134790 Change License for the next release * Prepare next release * Preprare next release * Prepare next release * Update README_ODM.md * Update Chart.yaml * Update kuberentes version * Fix Kubernetes requirement * Change home url + Kubernetes version * Try to add artifacthub verified status * Add markdown link check (#53) * DBACLD-139987 - Put in place checker link * ignore some broken links * ignore broken links with localhost URL --------- Co-authored-by: Frederic Mercier * Fix broken link * Fix broken link * prepare next release 24.1.0 (#55) * DBACLD-148300 Enable detect secret * DBACLD-148300 Enable detect secret * Update README.md * add GitHub action running detect-secrets * send notification to Slack if detect-secrets failed * Prep delivery - First pass fix linter (#56) * Prepare next release * Move to a CV new version * Try to fix build. Improve certification level. * Fix remaining linter issues * Fix ODM version to be able to test * Prep delivery (#57) * Prepare next release * Move to a CV new version * Try to fix build. Improve certification level. * Fix remaining linter issues * Fix ODM version to be able to test * Switch Java version to jdk 17 + update the linter version. * Remove duplicate entry * Fix liberty location image * Prep delivery 2401 (#58) * Switch Java version to jdk 17 + update the linter version. * Remove duplicate entry * Fix liberty location image * Preparing new delivery of the helm charts --------- Co-authored-by: Anthony Acremann Co-authored-by: Frederic Mercier Co-authored-by: Frederic Mercier Co-authored-by: siasin * move to spring-boot-2.7.18 * move to spring-boot-2.7.18 * Value too long for column issue * move to spring-boot-3.0 * uses java 17 * sprint boot 3.1.5 * sprint boot 3.1.12 * issue on hibernate * tentative null comparison * move to SB 3.40 * remove deprecation --------- Co-authored-by: Laurent GRATEAU Co-authored-by: Anthony Acremann Co-authored-by: Frederic Mercier Co-authored-by: Frederic Mercier Co-authored-by: siasin * Move to JDK 21 * Update .env * Move to jdk 21 * Move to JDK 21 Fix bad image location * DBACLD-161157 - new versioning 1.0.0 for the charts and the image * Updated copyright to 2025 (#66) * Updated copyright to 2025 * more files * Move to the latest Liberty supported version * Refresh liberty version * Change docker login behavior * fix Error: Cannot perform an interactive login from a non TTY device * 2nd try fix Error: Cannot perform an interactive login from a non TTY device * DBACLD-174146 Upgrade Sprint version for security purpose. * DBACLD-176518 Update License for 25.0.0.0/9.5.0.0 Release * DBACLD-179576 Deliver Metering service github repository * Fix license + update index.yaml file * Prepare next release * DBACLD-176888 - update ref to odm 95 (#67) * DBACLD-176888 update doc and metafiles to ODM 9.5 * add replacementPatterns for Internal KC * update KC url * Update full-description.md --------- Co-authored-by: Laurent GRATEAU * Remove obsolete 1.0.0 release --------- Co-authored-by: Anthony Acremann Co-authored-by: Frederic Mercier Co-authored-by: Frederic Mercier Co-authored-by: siasin Co-authored-by: Mathias Mouly --- .env | 6 +-- .github/workflows/build-and-test.yml | 11 +++-- .md_check_config.json | 4 ++ README_ODM.md | 10 ++--- charts/ibm-odm-metering/Chart.yaml | 8 ++-- charts/ibm-odm-metering/LICENSES/LICENSE-LI | 19 +++----- charts/ibm-odm-metering/README.md | 4 +- charts/ibm-odm-metering/RELEASENOTES.md | 14 +++--- charts/ibm-odm-metering/values.yaml | 4 +- charts/stable/ibm-odm-metering-1.0.0.tgz | Bin 0 -> 34044 bytes charts/stable/index.yaml | 41 +++++++++++++++--- docker/dockerhub/full-description.md | 4 +- .../ibm/rules/metering/messages.properties | 2 +- .../metering/ilmt/model/EqualUtil.java | 2 +- .../metering/ilmt/model/GenericResponse.java | 2 +- .../decision/metering/ilmt/model/Helper.java | 2 +- .../metering/ilmt/model/MessageHandler.java | 2 +- .../metering/ilmt/model/Messages.java | 2 +- .../ilmt/model/ProductSpecificData.java | 2 +- .../metering/ilmt/model/RequestBase.java | 2 +- .../metering/ilmt/model/RequestID.java | 2 +- .../metering/ilmt/model/Response.java | 2 +- .../metering/ilmt/model/StateValidator.java | 2 +- .../ilmt/model/metric/AggregationMethod.java | 2 +- .../ilmt/model/metric/Aggregator.java | 2 +- .../ilmt/model/metric/AggregatorImpl.java | 2 +- .../metering/ilmt/model/metric/Group.java | 2 +- .../ilmt/model/metric/GroupAggregation.java | 2 +- .../model/metric/GroupAggregationImpl.java | 2 +- .../metering/ilmt/model/metric/GroupImpl.java | 2 +- .../metering/ilmt/model/metric/Metric.java | 2 +- .../ilmt/model/metric/MetricDefinition.java | 2 +- .../model/metric/MetricDefinitionImpl.java | 2 +- .../ilmt/model/metric/MetricImpl.java | 2 +- .../ilmt/model/metric/MetricUsage.java | 2 +- .../ilmt/model/metric/SupportedLocale.java | 2 +- .../ilmt/model/metric/TranslatedName.java | 2 +- .../ilmt/model/metric/TranslatedUnits.java | 2 +- .../metering/ilmt/model/metric/Version.java | 2 +- .../ilmt/model/registration/Product.java | 2 +- .../registration/RegistrationRequest.java | 2 +- .../metering/ilmt/model/usage/Usage.java | 2 +- .../ilmt/model/usage/UsageRequest.java | 2 +- service/pom.xml | 2 +- .../main/config/application_ADS.properties | 2 +- .../main/config/application_ODM.properties | 2 +- .../application/CustomErrorController.java | 2 +- .../application/ExceptionController.java | 2 +- .../application/GlobalErrorHandler.java | 2 +- .../service/application/HomeController.java | 2 +- .../application/ILMTBackupController.java | 2 +- .../MeteringServiceApplication.java | 2 +- .../metric/repository/MetricEntity.java | 2 +- .../metric/repository/MetricRepository.java | 2 +- .../metric/repository/RemainderStatus.java | 2 +- .../controller/RegistrationController.java | 2 +- .../repository/RegistrationEntity.java | 2 +- .../repository/RegistrationRepository.java | 2 +- .../repository/RegistrationService.java | 2 +- .../reporting/DecisionMeteringReport.java | 2 +- .../reporting/FixedMetricFormatter.java | 2 +- .../reporting/MetricAggregationMethod.java | 2 +- .../service/reporting/MetricAggregator.java | 2 +- .../reporting/MetricConfiguration.java | 2 +- .../service/reporting/MetricDefinition.java | 2 +- .../service/reporting/MetricFormatter.java | 2 +- .../reporting/MetricIdentification.java | 2 +- .../reporting/MetricProductCategory.java | 2 +- .../ilmt/service/reporting/MetricValue.java | 2 +- .../ilmt/service/reporting/ReportHandler.java | 2 +- .../reporting/ThresholdMetricFormatter.java | 2 +- .../service/reporting/ValueApproximation.java | 2 +- .../reporting/repository/ReportEntity.java | 2 +- .../repository/ReportRepository.java | 2 +- .../reporting/repository/ReportStatus.java | 2 +- .../usage/controller/UsageController.java | 2 +- .../service/usage/repository/UsageEntity.java | 2 +- .../usage/repository/UsageRepository.java | 2 +- .../usage/repository/UsageService.java | 2 +- .../ilmt/service/util/Environment.java | 2 +- .../metering/ilmt/service/util/Messages.java | 2 +- .../metering_service_default.properties | 2 +- .../metering_service_messages.properties | 2 +- service/src/main/resources/schema.sql | 2 +- .../service/application/EndpointsTest.java | 2 +- .../service/application/ReportingTest.java | 2 +- .../application/model/LicenseFile.java | 2 +- .../service/application/model/Metric.java | 2 +- .../application/model/SoftwareIdentity.java | 2 +- .../ilmt/service/application/model/Usage.java | 2 +- .../application/util/MetricExpectation.java | 2 +- .../util/RemainderExpectation.java | 2 +- .../application/util/RequestFactory.java | 2 +- .../service/application/util/TestUtility.java | 2 +- .../src/test/resources/application.properties | 2 +- src/main/resources/application.properties | 2 +- .../metering_service_default.properties | 2 +- src/test/resources/application.properties | 2 +- topics/dssetup.md | 2 +- topics/servers/dcdisablemet.md | 2 +- topics/servers/dcenableliberty.md | 2 +- topics/servers/dcenabletomcat.md | 2 +- topics/servers/dcenablewas.md | 2 +- topics/servers/disablej2se.md | 2 +- topics/servers/disableliberty.md | 2 +- topics/servers/disabletomcat.md | 2 +- topics/servers/disablewas.md | 2 +- topics/servers/enablej2se.md | 4 +- topics/servers/enableliberty.md | 2 +- topics/servers/enabletomcat.md | 2 +- topics/servers/enablewas.md | 2 +- 111 files changed, 180 insertions(+), 145 deletions(-) create mode 100644 charts/stable/ibm-odm-metering-1.0.0.tgz diff --git a/.env b/.env index 9cf84bd..565720f 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ # ODM product version -ODMVERSION=9.0.0.1 -ODMIMAGEVERSION=9.0.0.1 +ODMVERSION=9.5.0.0 +ODMIMAGEVERSION=9.5.0.0 # Directory name of the odm-ondocker checkout ODMDOCKERDIR=docker @@ -11,4 +11,4 @@ REPOSITORY=ibmcom PREFIXIMAGE=odm # Liberty Version -FROMLIBERTY=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi +FROMLIBERTY=icr.io/appcafe/websphere-liberty:25.0.0.3-kernel-java21-openj9-ubi-minimal diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 8c8ebd1..166fbf4 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,7 +2,7 @@ name: Build and test on: [push] env: DOCKER_COMPOSE_VERSION: 1.29.2 - FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi + FROMLIBERTY: icr.io/appcafe/websphere-liberty:25.0.0.3-kernel-java21-openj9-ubi-minimal HELM_VERSION: 3.6.2 ODM_VERSION: 9.0.0.1 ODMDOCKERDIR: docker @@ -40,9 +40,14 @@ jobs: ODM_URL: ${{ secrets.ODM_URL }} - uses: actions/setup-java@v1 with: - java-version: 17 + java-version: 21 - run: bash build.sh - - run: echo "${{ secrets.ARTIFACTORY_PASSWORD }}" | docker login ${{ secrets.ARTIFACTORY_URL }} --username ${{ secrets.ARTIFACTORY_USER }} --password-stdin + - name: log in artifactory + uses: docker/login-action@v3 + with: + registry: ${{ secrets.ARTIFACTORY_URL }} + username: ${{ vars.ARTIFACTORY_USER }} + password: ${{ secrets.ARTIFACTORY_PASSWORD }} - run: sudo docker-compose build - run: sudo docker-compose up -d - run: sudo --preserve-env docker-compose -f docker/testing/docker-compose-metering.yml pull diff --git a/.md_check_config.json b/.md_check_config.json index 17934a0..83050d9 100644 --- a/.md_check_config.json +++ b/.md_check_config.json @@ -8,6 +8,10 @@ { "pattern": "^/LICENSE", "replacement": "{{BASEURL}}/LICENSE" + }, + { + "pattern": "https://www.ibm.com/docs", + "replacement": "https://ibmdocs-test.dcs.ibm.com/docs" } ], "timeout": "20s" diff --git a/README_ODM.md b/README_ODM.md index d45d34e..f1918c9 100644 --- a/README_ODM.md +++ b/README_ODM.md @@ -25,13 +25,13 @@ You can deploy the IBM Operational Decision Manager usage metering service: ## Prerequisites #### For compilation -- IBM Operational Decision Manager 9.0.0 or later version -- Java SDK 17 -- Maven 3.6.3 or later version +- IBM Operational Decision Manager 9.5.0 or later version +- Java SDK 21 +- Maven 3.9 or later version #### For use -- JRE 17 -- IBM Operational Decision Manager 9.0.0 or later version +- JRE 21 +- IBM Operational Decision Manager 9.5.0 or later version (with configuration set for metering - please see the Configuring the clients section) ## Compiling the service diff --git a/charts/ibm-odm-metering/Chart.yaml b/charts/ibm-odm-metering/Chart.yaml index 640de3c..d03710f 100644 --- a/charts/ibm-odm-metering/Chart.yaml +++ b/charts/ibm-odm-metering/Chart.yaml @@ -1,14 +1,14 @@ apiVersion: v2 description: IBM Operational Decision Manager metering service name: ibm-odm-metering -version: 24.1.0 -appVersion: 9.0.0.1 +version: 1.0.0 +appVersion: 1.0.0 description: |- IBM Operational Decision Manager for Developers License - By installing this product you accept the following license terms: https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?li_formnum=L-RBPW-WQTC4A -home: https://www.ibm.com/docs/en/odm/9.0.0 + By installing this product you accept the following license terms: https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?li_formnum=L-XFJS-ENV5LE +home: https://www.ibm.com/docs/en/odm/9.5.0 icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png sources: - https://github.com/ODMDev/decisions-metering diff --git a/charts/ibm-odm-metering/LICENSES/LICENSE-LI b/charts/ibm-odm-metering/LICENSES/LICENSE-LI index a484ffa..9db1d5f 100644 --- a/charts/ibm-odm-metering/LICENSES/LICENSE-LI +++ b/charts/ibm-odm-metering/LICENSES/LICENSE-LI @@ -1,11 +1,12 @@ -The translated license terms can be viewed here: https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?li_formnum=L-RBPW-WQTC4A +The translated license terms can be viewed here: +https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?li_formnum=L-XFJS-ENV5LE LICENSE INFORMATION The Programs listed below are licensed under the following License Information terms and conditions in addition to the Program license terms previously agreed to by Client and IBM. If Client does not have previously agreed to license terms in effect for the Program, the International License Agreement for Non-Warranted Programs (i125-5589-06) applies. Program Name (Program Number): -IBM Operational Decision Manager for Developers V9.0 (5725-B69) +IBM Operational Decision Manager for Developers V9.5 (5725-B69) The following standard terms apply to Licensee's use of the Program. @@ -28,14 +29,6 @@ Modifiable Third Party Code To the extent, if any, in the NOTICES file IBM identifies third party code as "Modifiable Third Party Code," IBM authorizes Licensee to 1) modify the Modifiable Third Party Code and 2) reverse engineer the Program modules that directly interface with the Modifiable Third Party Code provided that it is only for the purpose of debugging Licensee's modifications to such third party code. IBM's service and support obligations, if any, apply only to the unmodified Program. -Separately Licensed Code - -Each of the components listed in the NON_IBM_LICENSE file is considered "Separately Licensed Code" licensed to Licensee under the terms of the applicable third party license agreement(s) set forth in the NON_IBM_LICENSE file(s) that accompanies the Program, and not this Agreement. Future Program updates or fixes may contain additional Separately Licensed Code. Such additional Separately Licensed Code and related licenses are listed in the applicable NON_IBM_LICENSE file that accompanies the Program update or fix. - -Note: Notwithstanding any of the terms in the third party license agreement, the Agreement, or any other agreement Licensee may have with IBM, with respect to the Separately Licensed Code: -(a) IBM provides it to Licensee WITHOUT WARRANTIES OF ANY KIND AND DISCLAIMS ANY AND ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS INCLUDING, BUT NOT LIMITED TO, THE WARRANTY OF TITLE, NON-INFRINGEMENT OR NON-INTERFERENCE, AND THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE; -(b) IBM is not liable for any direct, indirect, incidental, special, exemplary, punitive or consequential damages including, but not limited to, lost data, lost savings, and lost profits. - Privacy Licensee acknowledges and agrees that IBM may use cookie and tracking technologies to collect personal information in gathering product usage statistics and information designed to help improve user experience and/or to tailor interactions with users in accordance with the IBM Online Privacy Policy, available at http://www.ibm.com/privacy/. @@ -49,9 +42,9 @@ Third Party Data and Services The Program provides access to third party data services, databases, web services, software, or other third party content (all, "Third Party Content"). Access to this Third Party Content is provided "AS-IS", WITH NO WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING THE WARRANTY OF TITLE, NON-INFRINGEMENT OR NON-INTERFERENCE AND THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Access can be terminated by the relevant third parties at their sole discretion at any time. Licensee may be required to enter into separate agreements with the third parties for the access to or use of such Third Party Content. IBM is not a party to any such separate agreements and as an express condition of this license Licensee agrees to comply with the terms of such separate agreements. -L/N: L-RBPW-WQTC4A -D/N: L-RBPW-WQTC4A -P/N: L-RBPW-WQTC4A +L/N: L-XFJS-ENV5LE +D/N: L-XFJS-ENV5LE +P/N: L-XFJS-ENV5LE International License Agreement for Non-Warranted Programs diff --git a/charts/ibm-odm-metering/README.md b/charts/ibm-odm-metering/README.md index 88d03b0..b7acd39 100644 --- a/charts/ibm-odm-metering/README.md +++ b/charts/ibm-odm-metering/README.md @@ -6,7 +6,7 @@ The [IBM Operational Decision Manager metering service](https://github.com/ODMDe The IBM License Metering Tool (ILMT) provides information about the usage of decision artifacts and executed decisions. Users of subscription services can obtain details about these billable artifacts. The license covers consumption in the form of traffic between RuleApps and client applications. -For more information, see the [Operational Decision Manager documentation](https://www.ibm.com/docs/en/odm/9.0.0?topic=kubernetes-licensing-metering). +For more information, see the [Operational Decision Manager documentation](https://www.ibm.com/docs/en/odm/9.5.0?topic=kubernetes-licensing-metering). ## Chart Details @@ -370,5 +370,5 @@ Only one pod can be instanciated for the metering service. ## Documentation -For more information, see [ODM documentation](https://www.ibm.com/docs/en/odm/9.0.0?topic=kubernetes-licensing-metering). +For more information, see [ODM documentation](https://www.ibm.com/docs/en/odm/9.5.0?topic=kubernetes-licensing-metering). \ No newline at end of file diff --git a/charts/ibm-odm-metering/RELEASENOTES.md b/charts/ibm-odm-metering/RELEASENOTES.md index eb9293a..26b43a1 100644 --- a/charts/ibm-odm-metering/RELEASENOTES.md +++ b/charts/ibm-odm-metering/RELEASENOTES.md @@ -1,12 +1,13 @@ -# What's new in Helm chart 24.0.0 -The version 24.0.0 of the Helm chart installs version 9.0.0 of the IBM Operational Decision Manager metering service. +# What's new in Helm chart 25.0.0 +The version 25.0.0 of the Helm chart installs version 9.5.0 of the IBM Operational Decision Manager metering service. # Prerequisites -1. Kubernetes 1.25 or higher, with Helm 3.2 or higher. -2. For the internal database, create a persistent volume or use dynamic provisioning. +1. Kubernetes 1.28 or higher. +2. Helm aligned with the Kubernetes version. +3. For the internal database, create a persistent volume or use dynamic provisioning. # Documentation -For more information go to [Operational Decision Manager Documentation](https://www.ibm.com/docs/en/odm/9.0.0?topic=kubernetes-licensing-metering) and [Github](https://github.com/ODMDev/decisions-metering). +For more information go to [Operational Decision Manager Documentation](https://www.ibm.com/docs/en/odm/9.5.0?topic=kubernetes-licensing-metering) and [Github](https://github.com/ODMDev/decisions-metering). # Breaking Changes * None @@ -20,7 +21,8 @@ None # Version History | Chart | Date | Details | |--------|-----------|----------------------------------------------------------| -| 24.1.0 | Dec 2024 | ODM 9.0.0.1 release | +| 25.0.0 | June 2025 | ODM 9.5.0.0 release - Support Kubernetes 1.28 or higher | +| 24.1.0 | Dec 2024 | ODM 9.0.0.1 release | | 24.0.0 | June 2024 | ODM 9.0.0 release - Support Kubernetes 1.25 or higher | | 23.0.2 | Dec 2023 | ODM 8.12.0.1 release - Support Kubernetes 1.23 or higher | | 23.0.1 | June 2023 | ODM 8.12.0.0 release - Support Kubernetes 1.23 or higher | diff --git a/charts/ibm-odm-metering/values.yaml b/charts/ibm-odm-metering/values.yaml index 2cb022f..f20a321 100644 --- a/charts/ibm-odm-metering/values.yaml +++ b/charts/ibm-odm-metering/values.yaml @@ -1,4 +1,4 @@ -# © Copyright IBM Corporation 2024 +# © Copyright IBM Corporation 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ license: "" # Declare variables to be passed into your templates. image: repository: "icr.io/cpopen/odm-k8s" - tag: 9.0.0.1 + tag: 1.0.0 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/charts/stable/ibm-odm-metering-1.0.0.tgz b/charts/stable/ibm-odm-metering-1.0.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..1107177da394eace4c61b4f1510370f1d8dcf8ed GIT binary patch literal 34044 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 1.25.0-0' + maintainers: + - name: ODMDev + - name: IBM + name: ibm-odm-metering + sources: + - https://github.com/ODMDev/decisions-metering + urls: + - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-1.0.0.tgz + version: 1.0.0 - apiVersion: v2 appVersion: 9.0.0.1 - created: "2024-11-14T17:19:58.822586+01:00" + created: "2025-05-28T16:11:16.62553+02:00" description: 'IBM Operational Decision Manager for Developers License By installing this product you accept the following license terms: https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?li_formnum=L-RBPW-WQTC4A' digest: e9e5e1c776241aa632f62b7d8ab4507ce992468dd5366b8dd1ac69e35248f1e4 @@ -31,7 +62,7 @@ entries: version: 24.1.0 - apiVersion: v1 appVersion: 9.0.0 - created: "2024-11-14T17:19:58.821417+01:00" + created: "2025-05-28T16:11:16.624247+02:00" description: IBM Operational Decision Manager metering service digest: d860ee71da9ec8c8fe2de3f034ad8b21d01be4e62a8aea885486d6d1f15e78f9 home: https://www.ibm.com/docs/en/odm/9.0.0 @@ -56,7 +87,7 @@ entries: version: 24.0.0 - apiVersion: v1 appVersion: 8.12.0.1 - created: "2024-11-14T17:19:58.820262+01:00" + created: "2025-05-28T16:11:16.623267+02:00" description: IBM Operational Decision Manager metering service digest: 02896c88de2ae97a9b31fa54a65b1c2845fcaae50aad3e25bd49ccbe6eb24a99 home: https://developer.ibm.com/odm/ @@ -81,7 +112,7 @@ entries: version: 23.2.0 - apiVersion: v1 appVersion: 8.11.0.0 - created: "2024-11-14T17:19:58.819111+01:00" + created: "2025-05-28T16:11:16.621913+02:00" description: IBM Operational Decision Manager metering service digest: c201c12f38caeee07efb38c37a06ed4d3cae3568b2ca2ed8cdf4533aa9e084a7 home: https://developer.ibm.com/odm/ @@ -104,4 +135,4 @@ entries: urls: - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-21.3.0.tgz version: 21.3.0 -generated: "2024-11-14T17:19:58.817657+01:00" +generated: "2025-05-28T16:11:16.618978+02:00" diff --git a/docker/dockerhub/full-description.md b/docker/dockerhub/full-description.md index cb74b80..e58332f 100644 --- a/docker/dockerhub/full-description.md +++ b/docker/dockerhub/full-description.md @@ -4,7 +4,7 @@ IBM® is now hosting product images on the IBM Container Registry, *icr.io*. You can obtain the IBM Operational Decision Manager for Developers image without authenticating by using this IBM-controlled source: *icr.io/cpopen/odm-k8s*. ```console -docker pull icr.io/cpopen/odm-k8s/odm-metering-service:9.0-amd64 +docker pull icr.io/cpopen/odm-k8s/odm-metering-service:latest-amd64 ``` # Quick Reference @@ -13,7 +13,7 @@ docker pull icr.io/cpopen/odm-k8s/odm-metering-service:9.0-amd64 [ODM developer community](https://developer.ibm.com/odm/) - [ODM Licensing and metering documentation](https://www.ibm.com/docs/en/odm/9.0.0?topic=kubernetes-licensing-metering) + [ODM Licensing and metering documentation](https://www.ibm.com/docs/en/odm/9.5.0?topic=kubernetes-licensing-metering) - **Where to file issues**: diff --git a/model/src/main/i18n/com/ibm/rules/metering/messages.properties b/model/src/main/i18n/com/ibm/rules/metering/messages.properties index 70185e4..4a3db32 100644 --- a/model/src/main/i18n/com/ibm/rules/metering/messages.properties +++ b/model/src/main/i18n/com/ibm/rules/metering/messages.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/EqualUtil.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/EqualUtil.java index 69b5819..8d7294f 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/EqualUtil.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/EqualUtil.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/GenericResponse.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/GenericResponse.java index bf79028..c1e3d8c 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/GenericResponse.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/GenericResponse.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/Helper.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/Helper.java index ad4b02c..a0b0264 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/Helper.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/Helper.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/MessageHandler.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/MessageHandler.java index 7dd4f72..3743364 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/MessageHandler.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/MessageHandler.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/Messages.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/Messages.java index 1e9fdb4..30aaefd 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/Messages.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/Messages.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/ProductSpecificData.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/ProductSpecificData.java index 683714e..46f537a 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/ProductSpecificData.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/ProductSpecificData.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestBase.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestBase.java index f96e22d..59dcbb2 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestBase.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestBase.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestID.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestID.java index 8f76b12..25c8c43 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestID.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/RequestID.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/Response.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/Response.java index 9b36a5b..6639c82 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/Response.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/Response.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/StateValidator.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/StateValidator.java index 72a22e7..429db54 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/StateValidator.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/StateValidator.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregationMethod.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregationMethod.java index 30bf508..a270fee 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregationMethod.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregationMethod.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Aggregator.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Aggregator.java index 851d50e..16ad615 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Aggregator.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Aggregator.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregatorImpl.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregatorImpl.java index 47b070b..7389433 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregatorImpl.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/AggregatorImpl.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Group.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Group.java index 972ed0d..74e6e55 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Group.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Group.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregation.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregation.java index 8991b08..8e60dea 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregation.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregation.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregationImpl.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregationImpl.java index 56a3767..b7e036a 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregationImpl.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupAggregationImpl.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupImpl.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupImpl.java index bd12912..7537b1a 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupImpl.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/GroupImpl.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Metric.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Metric.java index 0cbe198..18333e8 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Metric.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Metric.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinition.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinition.java index b2e09d8..b1314c3 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinition.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinition.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinitionImpl.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinitionImpl.java index f130527..d446f12 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinitionImpl.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricDefinitionImpl.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricImpl.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricImpl.java index 7df0448..4f210c9 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricImpl.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricImpl.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricUsage.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricUsage.java index a300fb2..aef57f7 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricUsage.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/MetricUsage.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/SupportedLocale.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/SupportedLocale.java index 6dd6101..8e440af 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/SupportedLocale.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/SupportedLocale.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedName.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedName.java index 06d5a75..088d699 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedName.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedName.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedUnits.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedUnits.java index 4133085..b5a3943 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedUnits.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/TranslatedUnits.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Version.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Version.java index 07cf922..4477400 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Version.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/metric/Version.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/Product.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/Product.java index b028ebf..47fbed5 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/Product.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/Product.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/RegistrationRequest.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/RegistrationRequest.java index fa4e500..2e05db3 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/RegistrationRequest.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/registration/RegistrationRequest.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/Usage.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/Usage.java index 48eb96f..fbd7380 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/Usage.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/Usage.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/UsageRequest.java b/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/UsageRequest.java index 7a66c68..cacb6bc 100644 --- a/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/UsageRequest.java +++ b/model/src/main/java/com/ibm/decision/metering/ilmt/model/usage/UsageRequest.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/pom.xml b/service/pom.xml index 7476910..e3fe9e4 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0 + 3.4.4 com.ibm.decision diff --git a/service/src/main/config/application_ADS.properties b/service/src/main/config/application_ADS.properties index 8086eb6..16bb800 100644 --- a/service/src/main/config/application_ADS.properties +++ b/service/src/main/config/application_ADS.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/service/src/main/config/application_ODM.properties b/service/src/main/config/application_ODM.properties index 7b31385..b152316 100644 --- a/service/src/main/config/application_ODM.properties +++ b/service/src/main/config/application_ODM.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/CustomErrorController.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/CustomErrorController.java index 7d07551..a5c9a5c 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/CustomErrorController.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/CustomErrorController.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ExceptionController.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ExceptionController.java index f00448d..193f47a 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ExceptionController.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ExceptionController.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/GlobalErrorHandler.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/GlobalErrorHandler.java index 0cff17e..f57a19d 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/GlobalErrorHandler.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/GlobalErrorHandler.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/HomeController.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/HomeController.java index 9f201dd..90f5287 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/HomeController.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/HomeController.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ILMTBackupController.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ILMTBackupController.java index 07499d3..8e86575 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ILMTBackupController.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/ILMTBackupController.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/MeteringServiceApplication.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/MeteringServiceApplication.java index 593a166..d8ecb94 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/MeteringServiceApplication.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/application/MeteringServiceApplication.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricEntity.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricEntity.java index 4847b07..f23ab7c 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricEntity.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricEntity.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricRepository.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricRepository.java index ab67ae1..b51d02f 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricRepository.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/MetricRepository.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/RemainderStatus.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/RemainderStatus.java index 3f9e44b..d378aca 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/RemainderStatus.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/metric/repository/RemainderStatus.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/controller/RegistrationController.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/controller/RegistrationController.java index d43847e..0541219 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/controller/RegistrationController.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/controller/RegistrationController.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationEntity.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationEntity.java index b7310db..abd2715 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationEntity.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationEntity.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationRepository.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationRepository.java index cbbe06e..3416639 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationRepository.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationRepository.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationService.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationService.java index 5c9bd42..ccceffd 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationService.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationService.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/DecisionMeteringReport.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/DecisionMeteringReport.java index 2afcbfe..69fea26 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/DecisionMeteringReport.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/DecisionMeteringReport.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/FixedMetricFormatter.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/FixedMetricFormatter.java index f0ad416..9ee4101 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/FixedMetricFormatter.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/FixedMetricFormatter.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregationMethod.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregationMethod.java index f73c84c..83956fd 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregationMethod.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregationMethod.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregator.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregator.java index 075e416..64d2397 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregator.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricAggregator.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricConfiguration.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricConfiguration.java index 043ec95..6520411 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricConfiguration.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricConfiguration.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricDefinition.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricDefinition.java index be231a1..d865994 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricDefinition.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricDefinition.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricFormatter.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricFormatter.java index 9cf4f67..c2433c6 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricFormatter.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricFormatter.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricIdentification.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricIdentification.java index b578800..361a02b 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricIdentification.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricIdentification.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricProductCategory.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricProductCategory.java index 1329739..1b1d232 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricProductCategory.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricProductCategory.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricValue.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricValue.java index ea1f742..c51eda8 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricValue.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/MetricValue.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ReportHandler.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ReportHandler.java index 2a7730c..334b4b4 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ReportHandler.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ReportHandler.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ThresholdMetricFormatter.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ThresholdMetricFormatter.java index f71e3d9..77a2480 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ThresholdMetricFormatter.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ThresholdMetricFormatter.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ValueApproximation.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ValueApproximation.java index a71b27c..9c71fd6 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ValueApproximation.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/ValueApproximation.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportEntity.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportEntity.java index 404972d..e8b110d 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportEntity.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportEntity.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportRepository.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportRepository.java index f1f296d..94d07f1 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportRepository.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportRepository.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportStatus.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportStatus.java index 5ea596f..9d8a683 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportStatus.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/reporting/repository/ReportStatus.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/controller/UsageController.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/controller/UsageController.java index 6866176..875baa6 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/controller/UsageController.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/controller/UsageController.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageEntity.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageEntity.java index fbe136c..32cb851 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageEntity.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageEntity.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageRepository.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageRepository.java index 28d4d31..42f1588 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageRepository.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageRepository.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageService.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageService.java index be12242..7a831b0 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageService.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageService.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Environment.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Environment.java index 2611ea0..07d5f52 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Environment.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Environment.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Messages.java b/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Messages.java index 1e28ce1..b4cdef3 100644 --- a/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Messages.java +++ b/service/src/main/java/com/ibm/decision/metering/ilmt/service/util/Messages.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/main/resources/metering_service_default.properties b/service/src/main/resources/metering_service_default.properties index 3ab67a6..0bbbcc2 100644 --- a/service/src/main/resources/metering_service_default.properties +++ b/service/src/main/resources/metering_service_default.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/service/src/main/resources/metering_service_messages.properties b/service/src/main/resources/metering_service_messages.properties index c327b40..4876134 100644 --- a/service/src/main/resources/metering_service_messages.properties +++ b/service/src/main/resources/metering_service_messages.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/service/src/main/resources/schema.sql b/service/src/main/resources/schema.sql index cbbed33..b07373b 100644 --- a/service/src/main/resources/schema.sql +++ b/service/src/main/resources/schema.sql @@ -1,7 +1,7 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/EndpointsTest.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/EndpointsTest.java index 65a8689..7b19b10 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/EndpointsTest.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/EndpointsTest.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/ReportingTest.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/ReportingTest.java index 34d7621..ef3b5fb 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/ReportingTest.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/ReportingTest.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/LicenseFile.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/LicenseFile.java index 27769ed..0900a14 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/LicenseFile.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/LicenseFile.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Metric.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Metric.java index 72c77a4..da999db 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Metric.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Metric.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/SoftwareIdentity.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/SoftwareIdentity.java index 76f5eb2..6d25299 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/SoftwareIdentity.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/SoftwareIdentity.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Usage.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Usage.java index 08deef2..1da6a21 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Usage.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/model/Usage.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/MetricExpectation.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/MetricExpectation.java index 5911759..dd9526c 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/MetricExpectation.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/MetricExpectation.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RemainderExpectation.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RemainderExpectation.java index 2423f6c..5a048fa 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RemainderExpectation.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RemainderExpectation.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RequestFactory.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RequestFactory.java index 1673b96..e4d82fc 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RequestFactory.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/RequestFactory.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/TestUtility.java b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/TestUtility.java index 1f36eb6..de9c9e7 100644 --- a/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/TestUtility.java +++ b/service/src/test/java/com/ibm/decision/metering/ilmt/service/application/util/TestUtility.java @@ -1,6 +1,6 @@ /* * - * Copyright IBM Corp. 2024 + * Copyright IBM Corp. 2025 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/service/src/test/resources/application.properties b/service/src/test/resources/application.properties index 5bb6c2e..db625a4 100644 --- a/service/src/test/resources/application.properties +++ b/service/src/test/resources/application.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 037eb39..18e2dca 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/main/resources/metering_service_default.properties b/src/main/resources/metering_service_default.properties index 8d31f1a..1a5b77e 100644 --- a/src/main/resources/metering_service_default.properties +++ b/src/main/resources/metering_service_default.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 2a2b294..a560871 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,6 +1,6 @@ # # -# Copyright IBM Corp. 2024 +# Copyright IBM Corp. 2025 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/topics/dssetup.md b/topics/dssetup.md index 46c7225..1c9f81e 100644 --- a/topics/dssetup.md +++ b/topics/dssetup.md @@ -6,7 +6,7 @@ After building and customizing your metering service, you are ready to use the r You can use the ressetup.xml Ant file or write your own to set up the metering feature in Operational Decision Manager. If you use the res-setup.xml template file, some values are predefined such as metering.server.url, but you must customize most of them. -The res-setup task is described at [res-setup](https://www.ibm.com/docs/en/odm/9.0.0?topic=setup-res). To setup metering, use the following guide. +The res-setup task is described at [res-setup](https://www.ibm.com/docs/en/odm/9.5.0?topic=setup-res). To setup metering, use the following guide. ## Summary of res-setup usage for metering configuration diff --git a/topics/servers/dcdisablemet.md b/topics/servers/dcdisablemet.md index c00c741..403e9ad 100644 --- a/topics/servers/dcdisablemet.md +++ b/topics/servers/dcdisablemet.md @@ -13,5 +13,5 @@ You can stop usage reporting and metering at any time. Back to [Setting up Decision Center to integrate with the metering services](../dcsetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/dcenableliberty.md b/topics/servers/dcenableliberty.md index a78e9f4..f96c21b 100644 --- a/topics/servers/dcenableliberty.md +++ b/topics/servers/dcenableliberty.md @@ -44,5 +44,5 @@ The Decision Center data is now sent to your metering service. Back to [Setting up Decision Center to integrate with the metering services](../dcsetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/dcenabletomcat.md b/topics/servers/dcenabletomcat.md index 0b482c0..8be5505 100644 --- a/topics/servers/dcenabletomcat.md +++ b/topics/servers/dcenabletomcat.md @@ -40,5 +40,5 @@ The Decision Center data is now sent to your metering service. Back to [Setting up Decision Center to integrate with the metering services](../dcsetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/dcenablewas.md b/topics/servers/dcenablewas.md index 177a525..354aee6 100644 --- a/topics/servers/dcenablewas.md +++ b/topics/servers/dcenablewas.md @@ -50,5 +50,5 @@ The Decision Center data is now sent to your metering service. Back to [Setting up Decision Center to integrate with the metering services](../dcsetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/disablej2se.md b/topics/servers/disablej2se.md index 039b86f..9369141 100644 --- a/topics/servers/disablej2se.md +++ b/topics/servers/disablej2se.md @@ -11,5 +11,5 @@ Disable the metering feature in J2SE by setting the metering.enable attribute to Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/disableliberty.md b/topics/servers/disableliberty.md index ccdd299..3807958 100644 --- a/topics/servers/disableliberty.md +++ b/topics/servers/disableliberty.md @@ -21,4 +21,4 @@ Disable the metering feature on a Liberty app server by setting the metering.ena Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/disabletomcat.md b/topics/servers/disabletomcat.md index 651073d..f65fa13 100644 --- a/topics/servers/disabletomcat.md +++ b/topics/servers/disabletomcat.md @@ -21,5 +21,5 @@ Disable the metering feature on a Tomcat application server by setting the meter Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/disablewas.md b/topics/servers/disablewas.md index 435ca09..e1ddb3f 100644 --- a/topics/servers/disablewas.md +++ b/topics/servers/disablewas.md @@ -13,5 +13,5 @@ For example, for WebSphere Application Server, the execution unit (XU) is shared Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/enablej2se.md b/topics/servers/enablej2se.md index 283e8c2..f2b0ffe 100644 --- a/topics/servers/enablej2se.md +++ b/topics/servers/enablej2se.md @@ -19,7 +19,7 @@ You enable the metering feature in a Java SE environment as described below. The {pluginClass=Metering,server.url=http://host.company.com:8888,api.key=ABC,enable=true,send.usages=true,instance.identifier=MyApplication1}" -If you are embedding or packaging Java™ rule sessions in a web container, you must package the generated ra.xml file as described in [Packaging Java rule sessions for Java SE](https://www.ibm.com/docs/en/odm/9.0.0?topic=factories-packaging-java-rule-sessions-java-se). +If you are embedding or packaging Java™ rule sessions in a web container, you must package the generated ra.xml file as described in [Packaging Java rule sessions for Java SE](https://www.ibm.com/docs/en/odm/9.5.0?topic=factories-packaging-java-rule-sessions-java-se). 2. Optional: When more than one Decision Server instance connects to the metering service, in particular in the case of a cluster, each instance must be uniquely identified by using the attributes metering.install.directory and metering.instance.identifier. 3. Restart the application server. @@ -30,4 +30,4 @@ The Decision Server data is now sent to your metering service. Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/enableliberty.md b/topics/servers/enableliberty.md index 36efc22..b9f0f9f 100644 --- a/topics/servers/enableliberty.md +++ b/topics/servers/enableliberty.md @@ -71,5 +71,5 @@ The Decision Server data is now sent to your metering service. Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/enabletomcat.md b/topics/servers/enabletomcat.md index 8025264..6fbd945 100644 --- a/topics/servers/enabletomcat.md +++ b/topics/servers/enabletomcat.md @@ -43,5 +43,5 @@ The Decision Server data is now sent to your metering service. Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 diff --git a/topics/servers/enablewas.md b/topics/servers/enablewas.md index e61d5d8..5aa566d 100644 --- a/topics/servers/enablewas.md +++ b/topics/servers/enablewas.md @@ -56,5 +56,5 @@ The Decision Server data is now sent to your metering service. Back to [Setting up Decision Server to integrate with the metering services](../dssetup.md) -© Copyright IBM Corporation 2024 +© Copyright IBM Corporation 2025 From 7d7d1d9f3bb6f58cffec1f371febb24aacf0a703 Mon Sep 17 00:00:00 2001 From: Laurent GRATEAU Date: Tue, 17 Jun 2025 16:06:27 +0200 Subject: [PATCH 2/3] Put only 1.0.0 version available --- charts/stable/index.yaml | 103 --------------------------------------- 1 file changed, 103 deletions(-) diff --git a/charts/stable/index.yaml b/charts/stable/index.yaml index d160bbb..91ba2e3 100644 --- a/charts/stable/index.yaml +++ b/charts/stable/index.yaml @@ -32,107 +32,4 @@ entries: urls: - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-1.0.0.tgz version: 1.0.0 - - apiVersion: v2 - appVersion: 9.0.0.1 - created: "2025-05-28T16:11:16.62553+02:00" - description: 'IBM Operational Decision Manager for Developers License By - installing this product you accept the following license terms: https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?li_formnum=L-RBPW-WQTC4A' - digest: e9e5e1c776241aa632f62b7d8ab4507ce992468dd5366b8dd1ac69e35248f1e4 - home: https://www.ibm.com/docs/en/odm/9.0.0 - icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png - keywords: - - OperationalDecisionManager - - businessrules - - Limited - - RHOCP - - ROKS - - amd64 - - s390x - - ppc64le - - Middleware - kubeVersion: '>= 1.25.0-0' - maintainers: - - name: ODMDev - - name: IBM - name: ibm-odm-metering - sources: - - https://github.com/ODMDev/decisions-metering - urls: - - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-24.1.0.tgz - version: 24.1.0 - - apiVersion: v1 - appVersion: 9.0.0 - created: "2025-05-28T16:11:16.624247+02:00" - description: IBM Operational Decision Manager metering service - digest: d860ee71da9ec8c8fe2de3f034ad8b21d01be4e62a8aea885486d6d1f15e78f9 - home: https://www.ibm.com/docs/en/odm/9.0.0 - icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png - keywords: - - OperationalDecisionManager - - businessrules - - Limited - - ICP - - amd64 - - s390x - - ppc64le - - ICPRHOCP - kubeVersion: '>= 1.24.0-0' - maintainers: - - name: ODMDev - name: ibm-odm-metering - sources: - - https://github.com/ODMDev/decisions-metering - urls: - - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-24.0.0.tgz - version: 24.0.0 - - apiVersion: v1 - appVersion: 8.12.0.1 - created: "2025-05-28T16:11:16.623267+02:00" - description: IBM Operational Decision Manager metering service - digest: 02896c88de2ae97a9b31fa54a65b1c2845fcaae50aad3e25bd49ccbe6eb24a99 - home: https://developer.ibm.com/odm/ - icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png - keywords: - - OperationalDecisionManager - - businessrules - - Limited - - ICP - - amd64 - - s390x - - ppc64le - - ICPRHOCP - kubeVersion: '>=1.11.0-0' - maintainers: - - name: ODMDev - name: ibm-odm-metering - sources: - - https://github.com/ODMDev/decisions-metering - urls: - - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-23.2.0.tgz - version: 23.2.0 - - apiVersion: v1 - appVersion: 8.11.0.0 - created: "2025-05-28T16:11:16.621913+02:00" - description: IBM Operational Decision Manager metering service - digest: c201c12f38caeee07efb38c37a06ed4d3cae3568b2ca2ed8cdf4533aa9e084a7 - home: https://developer.ibm.com/odm/ - icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png - keywords: - - OperationalDecisionManager - - businessrules - - Limited - - ICP - - amd64 - - s390x - - ppc64le - - ICPRHOCP - kubeVersion: '>=1.11.0-0' - maintainers: - - name: ODMDev - name: ibm-odm-metering - sources: - - https://github.com/ODMDev/decisions-metering - urls: - - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-21.3.0.tgz - version: 21.3.0 generated: "2025-05-28T16:11:16.618978+02:00" From eeaa854583d2b5e8d9d649063e6acba05ec46be1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 11:35:57 +0200 Subject: [PATCH 3/3] Bump actions/setup-java from 1 to 5 (#71) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v1...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 166fbf4..1be296c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -38,7 +38,7 @@ jobs: ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }} ODM_URL: ${{ secrets.ODM_URL }} - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v5 with: java-version: 21 - run: bash build.sh