DecisionsDev · lgrateau · Jun 17, 2025 · Sep 12, 2023 · Nov 27, 2023 · Nov 27, 2023
diff --git 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
@@ -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
@@ -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
@@ -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 <i>Configuring the clients</i> section)
 
 ## Compiling the service

diff --git 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
@@ -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
@@ -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).
 
diff --git 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
@@ -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
diff --git a/charts/stable/index.yaml b/charts/stable/index.yaml
@@ -1,9 +1,40 @@
 apiVersion: v1
 entries:
   ibm-odm-metering:
+  - apiVersion: v2
+    appVersion: 1.0.0
+    created: "2025-06-02T14:22:19.361896326+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-XFJS-ENV5LE
+    digest: 5aeb96b5810a1b78ba33698d0043278c79310e1aaf7b4c862187ab9bccf0849a
+    home: https://www.ibm.com/docs/en/odm/9.5.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-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.