Spring boot 2.7.18

.env

@@ -1,6 +1,6 @@
 # ODM product version
-ODMVERSION=9.0.0.0
-ODMIMAGEVERSION=9.0.0.0
+ODMVERSION=9.0.0.1
+ODMIMAGEVERSION=9.0.0.1
 # Directory name of the odm-ondocker checkout
 ODMDOCKERDIR=docker
 
@@ -11,4 +11,4 @@ REPOSITORY=ibmcom
 PREFIXIMAGE=odm
 
 # Liberty Version
-FROMLIBERTY=ibmcom/websphere-liberty:24.0.0.3-kernel-java17-openj9-ubi
+FROMLIBERTY=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi

.github/workflows/build-and-test.yml

@@ -2,12 +2,12 @@ name: Build and test
 on: [push]
 env:
   DOCKER_COMPOSE_VERSION: 1.29.2
-  FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.3-kernel-java11-openj9-ubi
+  FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi
   HELM_VERSION: 3.6.2
-  ODM_VERSION: 9.0.0.0
+  ODM_VERSION: 9.0.0.1
   ODMDOCKERDIR: docker
-  ODMIMAGEVERSION: 8.12.0.1
-  ODMVERSION: 8.12.0.1-amd64
+  ODMIMAGEVERSION: 9.0.0.0
+  ODMVERSION: 9.0.0.1-amd64
   PREFIXIMAGE: odm
 
 jobs:
@@ -32,7 +32,7 @@ jobs:
         run: tar zxfv helm.tar.gz && chmod 755 cv docker-compose linux-amd64/helm hey && sudo mv cv docker-compose linux-amd64/helm hey /usr/local/bin/
       - run: docker-compose --version
       - run: helm version
-      - run: cv lint helm charts/ibm-odm-metering -o charts/ibm-odm-metering/tests/lintOverride.yaml
+      - run: cv lint helm charts/ibm-odm-metering -o charts/ibm-odm-metering/tests/lintOverride.yaml --set license=accept
       - run: bash download-odm.sh
         env:
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

README.md

@@ -12,7 +12,7 @@ To configure metering for use with IBM Automation Decision Services, see the fol
 
 To troubleshoot faulty behavior:
 
-- Ensure there is no HTTP port conflict that can prevent the service from starting.
+- Ensure there is no HTTP port conflict that can prevent the service from starting. 
 - Check that the service is responding to HTTP requests, for example, load the root server URL (by default ```http://localhost:8888/```) with a browser.
 - Check that the service is accessible from the server environment where the clients are configured.
 - Review the client configuration and make sure that the settings are correct.

charts/ibm-odm-metering/Chart.yaml

@@ -1,8 +1,13 @@
-apiVersion: v1
+apiVersion: v2
 description: IBM Operational Decision Manager metering service
 name: ibm-odm-metering
-version: 24.0.0
-appVersion: 9.0.0
+version: 24.1.0
+appVersion: 9.0.0.1
+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
 icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png
 sources:
@@ -11,12 +16,13 @@ keywords:
 - OperationalDecisionManager
 - businessrules
 - Limited
-- ICP
+- RHOCP
+- ROKS
 - amd64
 - s390x
 - ppc64le
-- ICPRHOCP
+- Middleware
 maintainers:
 - name: ODMDev
-tillerVersion: ">=2.9.1"
-kubeVersion: ">= 1.24.0-0"
+- name: IBM
+kubeVersion: ">= 1.25.0-0"

charts/ibm-odm-metering/README.md

@@ -343,11 +343,11 @@ readOnlyRootFilesystem: false
 requiredDropCapabilities:
 - ALL
 runAsUser:
-  type: MustRunAsNonRoot
+  type: MustRunAsRange
 seccompProfiles:
 - docker/default
 seLinuxContext:
-  type: RunAsAny
+  type: MustRunAs
 supplementalGroups:
   type: MustRunAs
   ranges:

charts/ibm-odm-metering/RELEASENOTES.md

@@ -18,13 +18,14 @@ None
 [Operational Decision Manager Interim Fixes](http://www.ibm.com/support/docview.wss?uid=swg21640630)
 
 # Version History
-| Chart | Date     | Details                           |
-| ----- | -------- | --------------------------------- |
-| 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 |
+| Chart  | Date      | Details                                                  |
+|--------|-----------|----------------------------------------------------------|
+| 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 |
-| 22.0.2 | Dec 2022 | ODM 8.11.1.0 release |
-| 22.0.1 | June 2022 | ODM 8.11.0.1 release |
-| 21.0.3 | Dec 2021 | ODM 8.11.0 release |
-| 21.0.2 | June 2021 | ODM 8.10.5.1 release |
-| 21.0.1 |  2021 | First release |
+| 22.0.2 | Dec 2022  | ODM 8.11.1.0 release                                     |
+| 22.0.1 | June 2022 | ODM 8.11.0.1 release                                     |
+| 21.0.3 | Dec 2021  | ODM 8.11.0 release                                       |
+| 21.0.2 | June 2021 | ODM 8.10.5.1 release                                     |
+| 21.0.1 | 2021      | First release                                            |

charts/ibm-odm-metering/templates/tests/test-pattern.yaml

@@ -10,6 +10,7 @@ metadata:
 {{ include "odm-additional-labels" . | indent 4 }}
   annotations:
     helm.sh/hook: test-success
+    productMetric: "FREE"
 spec:
 {{ include "odm-serviceAccountName" . | indent 2 }}
   hostNetwork: false

charts/ibm-odm-metering/tests/lintOverride.yaml

@@ -14,4 +14,6 @@ overrides:
 - rule: ReadmeHasRequiredSections
   reason: "Prefer to have cutomization section than configuration."
 - rule: NoReadWriteMany
-  reason: "Needs to work on it. Too late for the 22.0.1 Release."
+  reason: "Needs to work on it. Too late for the 22.0.1 Release."
+- rule: ContainerLivenessOverLongInitialDelaySeconds
+  reason: "Metering service take time to start"

charts/ibm-odm-metering/values.yaml

@@ -20,7 +20,7 @@ license: ""
 # Declare variables to be passed into your templates.
 image:
   repository: "icr.io/cpopen/odm-k8s"
-  tag: 9.0.0.0
+  tag: 9.0.0.1
   pullPolicy: IfNotPresent
 ## Optionally specify an array of imagePullSecrets.
 ## Secrets must be manually created in the namespace.

charts/stable/index.yaml

@@ -1,9 +1,37 @@
 apiVersion: v1
 entries:
   ibm-odm-metering:
+  - apiVersion: v2
+    appVersion: 9.0.0.1
+    created: "2024-11-14T17:19:58.822586+01: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: "2024-06-11T13:37:54.179562+03:00"
+    created: "2024-11-14T17:19:58.821417+01:00"
     description: IBM Operational Decision Manager metering service
     digest: d860ee71da9ec8c8fe2de3f034ad8b21d01be4e62a8aea885486d6d1f15e78f9
     home: https://www.ibm.com/docs/en/odm/9.0.0
@@ -12,6 +40,7 @@ entries:
     - OperationalDecisionManager
     - businessrules
     - Limited
+    - ICP
     - amd64
     - s390x
     - ppc64le
@@ -27,7 +56,7 @@ entries:
     version: 24.0.0
   - apiVersion: v1
     appVersion: 8.12.0.1
-    created: "2024-06-11T13:37:54.178532+02:00"
+    created: "2024-11-14T17:19:58.820262+01:00"
     description: IBM Operational Decision Manager metering service
     digest: 02896c88de2ae97a9b31fa54a65b1c2845fcaae50aad3e25bd49ccbe6eb24a99
     home: https://developer.ibm.com/odm/
@@ -52,7 +81,7 @@ entries:
     version: 23.2.0
   - apiVersion: v1
     appVersion: 8.11.0.0
-    created: "2024-06-11T13:37:54.177038+02:00"
+    created: "2024-11-14T17:19:58.819111+01:00"
     description: IBM Operational Decision Manager metering service
     digest: c201c12f38caeee07efb38c37a06ed4d3cae3568b2ca2ed8cdf4533aa9e084a7
     home: https://developer.ibm.com/odm/
@@ -75,4 +104,4 @@ entries:
     urls:
     - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-21.3.0.tgz
     version: 21.3.0
-generated: "2024-06-11T13:37:54.175185+02:00"
+generated: "2024-11-14T17:19:58.817657+01:00"

download-cv.sh

@@ -4,7 +4,7 @@ set -ex
 
 GH_API=https://github.ibm.com/api/v3
 GH_REPO=${GH_API}/repos/IBMPrivateCloud/content-verification
-GH_LATEST=${GH_REPO}/releases/tags/v2.7.0
+GH_LATEST=${GH_REPO}/releases/tags/v4.8.1
 AUTH="Authorization: token ${GHE_TOKEN}"
 
 response=$(curl --header "${AUTH}" --silent ${GH_LATEST})

service/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.4.RELEASE</version>
+		<version>2.7.18</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.ibm.decision</groupId>
@@ -168,4 +168,4 @@
 		</plugins>
 		<finalName>metering-service-no-dependencies</finalName>
 	</build>
-</project>
+</project>

service/src/main/java/com/ibm/decision/metering/ilmt/service/application/CustomErrorController.java

@@ -33,8 +33,7 @@ public String handleError(HttpServletRequest request) {
     	return GlobalErrorHandler.handleError(request, null);
     }
 
-    @Override
     public String getErrorPath() {
-        return "/error";
+        return null;
     }
-}
+}

service/src/main/java/com/ibm/decision/metering/ilmt/service/registration/repository/RegistrationEntity.java

@@ -20,6 +20,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 import org.slf4j.Logger;
@@ -34,13 +35,15 @@
 public class RegistrationEntity {
 	private final static Logger LOGGER = Environment.getLogger();
 
-	@Id	
+	@Id
 	@Column(name="ID")
 	private String id;
 
+
 	@Column(name="LAST_UPDATE")
 	private long lastUpdate;	
 
+	@Lob
 	@Column(name="DEFINITION")
 	private String definition;
 

service/src/main/java/com/ibm/decision/metering/ilmt/service/usage/repository/UsageEntity.java

@@ -23,6 +23,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 import org.slf4j.Logger;
@@ -46,6 +47,7 @@ public class UsageEntity {
 	@Column(name="TIMESTAMP")
 	private long timestamp;
 
+	@Lob
 	@Column(name="DEFINITION")
 	private String definition;