Caboose 32: Small refactoring and alignment in version

development/docker-compose/.env

@@ -1,3 +1,2 @@
-BB_VERSION=2025.09-LTS
-BOOTSTRAP_JOB_VERSION=2025.04
-EXTRA_JAVA_OPTS="-XX:UseSVE=0"
+BB_VERSION=2025.09.17-LTS
+BOOTSTRAP_JOB_VERSION=2025.04

development/docker-compose/docker-compose.yaml

@@ -1,8 +1,7 @@
 # https://docs.docker.com/compose/compose-file/
 
 x-common-variables: &common-variables
-  JAVA_TOOL_OPTIONS: -XX:MaxRAMPercentage=60.0 ${EXTRA_JAVA_OPTS}
-  JAVA_OPTS: ${EXTRA_JAVA_OPTS}
+  JAVA_TOOL_OPTIONS: -XX:MaxRAMPercentage=60.0
   USERCTX_KEY: JWTSecretKeyDontUseInProduction!
   sso.jwt.internal.signature.key.type: VALUE
   sso.jwt.internal.signature.key.value: JWTSecretKeyDontUseInProduction!
@@ -42,12 +41,6 @@ x-common-variables: &common-variables
   spring.autoconfigure.exclude: org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration
   management.otlp.tracing.endpoint: http://otel-collector:4318/v1/traces
 
-# Silicon specific variables for services which do not use common variables and still need to run on M4 chips
-x-silicon-specific-variables: &silicon-specific-variables
-  JAVA_OPTS: ${EXTRA_JAVA_OPTS}
-  JAVA_OPTS_APPEND: ${EXTRA_JAVA_OPTS}
-  JAVA_TOOL_OPTIONS: ${EXTRA_JAVA_OPTS}
-
 x-database-variables: &database-variables
   logging.level.liquibase: INFO
   spring.liquibase.enabled: true
@@ -84,17 +77,17 @@ x-gc-http-config: &gc-http-config
   "backbase.gc.http.backoff": "1000"
 
 x-gc-credentials: &gc-credentials
-  backbase.gc.party-base-url: "http://caboose:8080"
-  backbase.gc.payment-base-url: "http://caboose:8080"
-  backbase.gc.deposit-base-url: "http://caboose:8080"
-  backbase.gc.loan-base-url: "http://caboose:8080"
+  backbase.gc.party-base-url: "http://caboose:8080/api"
+  backbase.gc.payment-base-url: "http://caboose:8080/api"
+  backbase.gc.deposit-base-url: "http://caboose:8080/api"
+  backbase.gc.loan-base-url: "http://caboose:8080/api"
   backbase.gc.subscriptionKey: ""
 
 x-mambu-creds: &mambu-creds
   mambu.basePath: "http://caboose:8080/api/mambu/v2"
   mambu.baseUrl: "http://caboose:8080/api/mambu/v2"
   mambu.branchId: ""
-  mambu.branchKey: ""
+  mambu.branchKey: "mock"
   mambu.username: "mock"
   mambu.password: "mock"
   mambu.ghostAccountId: "ZQGS770"
@@ -146,6 +139,7 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+
   zipkin:
     image: openzipkin/zipkin
     container_name: zipkin
@@ -155,6 +149,7 @@ services:
       - STORAGE_TYPE=mem
     ports:
       - "9411:9411"
+
   otel-collector:
     image: otel/opentelemetry-collector-contrib:0.82.0
     restart: always
@@ -174,12 +169,12 @@ services:
       - "55679:55679" # zpages extension
     depends_on:
       - zipkin
+
   registry:
     image: repo.backbase.com/backbase-docker-releases/registry:${BB_VERSION}
     ports:
       - "8761:8080"
     environment:
-      <<: *silicon-specific-variables
       management.tracing.enabled: false
     volumes:
       - ./exe/HealthCheck.jar:/tmp/HealthCheck.jar
@@ -232,7 +227,7 @@ services:
     ports:
       - '8180:8080'
     environment:
-      <<: [ *common-variables, *message-broker-variables, *gc-credentials, *gc-api-config, *gc-http-config, *silicon-specific-variables]
+      <<: [ *common-variables, *message-broker-variables, *gc-credentials, *gc-api-config, *gc-http-config]
       KEYCLOAK_ADMIN: "admin"
       KEYCLOAK_ADMIN_PASSWORD: "admin"
       BACKBASE_HTTP_CORS: "true"
@@ -254,11 +249,10 @@ services:
       keycloak.backbase.event-listeners.audit.endpoint: "http://audit-service:8080"
       KC_SPI_EVENTS_LISTENER_AUDIT_INTEGRATION_SERVICE_URL: "http://audit-service:8080"
       KC_SPI_EVENTS_LISTENER_EVENT_BRIDGE_AUDIT_NO_AUTH_LOCALHOST: "false"
-      KC_SPI_EVENTS_LISTENER_EVENT_BRIDGE_AUDIT_URL: "http://event-bridge:8090"
+      KC_SPI_EVENTS_LISTENER_EVENT_BRIDGE_AUDIT_URL: "http://event-bridge:8080"
     #  KC_SPI_MOBILE_AUTHENTICATION_CLIENT_DEFAULT_URL: "http://mobile-authentication:8080"
       JAVA_TOOL_OPTIONS: "-Dquarkus.log.category.'\"com.backbase\"'.level=DEBUG \
-                          -Dquarkus.log.category.'\"org.keycloak.protocol.oidc\"'.level=TRACE \
-                          ${EXTRA_JAVA_OPTS}"
+                          -Dquarkus.log.category.'\"org.keycloak.protocol.oidc\"'.level=TRACE"
     volumes:
       - ./identity:/opt/keycloak/data/import
       - ./exe/HealthCheck.jar:/tmp/HealthCheck.jar
@@ -270,7 +264,7 @@ services:
         condition: service_healthy
 
   access-control:
-    image: repo.backbase.com/backbase-docker-releases/access-control:2025.09-LTS
+    image: repo.backbase.com/backbase-docker-releases/access-control:${BB_VERSION}
     ports:
       - "8040:8080"
     environment:
@@ -420,7 +414,7 @@ services:
       - registry
 
   transaction-manager:
-    image: repo.backbase.com/backbase-docker-releases/transaction-manager:2025.08.5
+    image: repo.backbase.com/backbase-docker-releases/transaction-manager:${BB_VERSION}
     ports:
       - "8052:8080"
     environment:
@@ -461,7 +455,6 @@ services:
       "backbase.transaction.export.qbo.supportedProductTypes": "current-account,savings-account,loan,debit-card,credit-card"
       "backbase.transaction.export.qfx.supportedProductTypes": "current-account,savings-account,loan,debit-card,credit-card"
       "backbase.transaction.partition.bookingDateSearchMaxDateRange": "91"
-
     volumes:
       - ./exe/HealthCheck.jar:/tmp/HealthCheck.jar
     healthcheck:
@@ -475,7 +468,7 @@ services:
       - registry
 
   transaction-integration:
-    image: repo.backbase.com/backbase-docker-releases/transaction-integration:2025.08.5
+    image: repo.backbase.com/backbase-docker-releases/transaction-integration:${BB_VERSION}
     ports:
       - "9051:8080"
     environment:
@@ -608,7 +601,7 @@ services:
       backbase.bootstrap.ingestions.approvals.enabled: false
       backbase.bootstrap.ingestions.regions.enabled: false
       backbase.bootstrap.ingestions.cards: false
-      caboose.baseUrl: "http://caboose-spring:8080"
+      caboose.baseUrl: "http://caboose:8080/api"
       backbase.communication.services.access-control.directUri: http://access-control:8080
       backbase.communication.services.limit.directUri: http://limits-service:8080
       backbase.communication.services.usermanager.directUri: http://user-manager:8080
@@ -667,14 +660,13 @@ services:
         condition: service_healthy
 
   caboose:
-    image: crreference914.azurecr.io/development/caboose-spring:2.1.0-SNAPSHOT-20251104164312
+    image: crreference914.azurecr.io/staging/caboose:2.1.0-SNAPSHOT-20251111125607
     ports:
       - "9001:8080"
       #- "5005:5005"
     environment:
-      <<: [*common-variables]
-      SPRING_PROFILES_ACTIVE: local
-      server.port: 8080
+      <<: [*common-variables, *database-variables]
+      spring.datasource.url: jdbc:mysql://mysql:3306/caboose?useSSL=false&allowPublicKeyRetrieval=true&cacheServerConfiguration=true&createDatabaseIfNotExist=true
       #JAVA_TOOL_OPTIONS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
     volumes:
       - ./exe/HealthCheck.jar:/tmp/HealthCheck.jar
@@ -703,7 +695,7 @@ services:
     image: crreference914.azurecr.io/event-listener-service:1.10.0
     ports:
       - "9082:8080"
-      - "5005:5005"
+#     - "5005:5005"
     environment:
       <<: [ *common-variables, *message-broker-variables, *database-variables ]
       BACKBASE_SECURITY_CSRF_ENABLED: "false"
@@ -715,7 +707,7 @@ services:
       SPRING_PROFILES_INCLUDE: "json-logging"
       backbase.events.enabled: "true"
       logging.level.com.backbase.buildingblocks.backend.security.auth.config.MtlsAuthenticationFilter: "WARN"
-      JAVA_TOOL_OPTIONS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
+#      JAVA_TOOL_OPTIONS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
     volumes:
       - ./exe/HealthCheck.jar:/tmp/HealthCheck.jar
     healthcheck:
@@ -844,7 +836,8 @@ services:
         condition: service_healthy
 
   retail-app:
-    image: crreference914.azurecr.io/retail-usa:2025.07
+    image: crreference914.azurecr.io/retail-usa:2025.07.3
+#    image: backbaseregistry.azurecr.io/docker/retail-usa:2025.10-rc.0-20251107T0855Z-10d7a5e
     environment:
       AUTH_REALM: "retail"
       AUTH_URL: http://localhost:8180/auth/
@@ -879,21 +872,23 @@ services:
       - backbase-identity
 
   event-bridge:
-    image: repo.backbase.com/backbase-docker-releases/event-bridge:2025.09.7-LTS
+    image: repo.backbase.com/backbase-docker-releases/event-bridge:${BB_VERSION}
     ports:
-      - "8090:8090"
+      - "8090:8080"
     environment:
       <<: [ *common-variables, *message-broker-variables, *gc-credentials, *gc-api-config, *gc-http-config]
       backbase.enable-no-auth-localhost-endpoints: false
       "BACKBASE_EVENTS_ENABLED": "true"
-      SERVER_PORT: 8090
+      SERVER_PORT: 8080
       BUILDINGBLOCKS_SECURITY_CSRF_ENABLED: "false"
       "backbase.security.csrf.enabled": "false"
       "backbase.security.mtls.enabled": "false"
-
     volumes:
       - ./exe/HealthCheck.jar:/tmp/HealthCheck.jar
       # - ./jwt/keystore_pub.p12:/jwt/public/keystore_pub.p12:ro # Uncomment if needed
+    healthcheck:
+      <<: *healthcheck-defaults
+      test: [ "CMD", "java", "-jar", "-Xms5M", "-Xmx10M", "/tmp/HealthCheck.jar", "http://localhost:8080/actuator/serviceregistry" ]
     links:
       - activemq
       - registry