#15 Upgraded to SpringBoot 3.5.5

Author: openwms

.github/workflows/branch-build.yml

@@ -1,7 +1,9 @@
 name: 'branch_build'
 on:
   push:
-    branches-ignore: [ master, release ]
+    branches-ignore:
+      - master
+      - gh-pages
 
 env:
   MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

.github/workflows/master-build.yml

@@ -40,7 +40,7 @@ jobs:
           fi
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-      - uses: s4u/maven-settings-action@v2.8.0
+      - uses: s4u/maven-settings-action@v4.0.0
         with:
           servers: |
             [{

pom.xml

@@ -64,7 +64,7 @@
     </ciManagement>
 
     <properties>
-        <error_prone_annotations.version>2.38.0</error_prone_annotations.version>
+        <error_prone_annotations.version>2.40.0</error_prone_annotations.version>
         <hk2-api.version>3.1.1</hk2-api.version>
         <guava.version>33.0.0-jre</guava.version>
         <httpclient.version>4.5.14</httpclient.version>
@@ -200,13 +200,26 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+        </dependency>
 
         <!-- 3rd party dependencies -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.loki4j</groupId>
             <artifactId>loki-logback-appender</artifactId>
@@ -223,7 +236,7 @@
         </dependency>
         <dependency>
             <groupId>org.jolokia</groupId>
-            <artifactId>jolokia-core</artifactId>
+            <artifactId>jolokia-support-spring</artifactId>
             <scope>runtime</scope>
         </dependency>
 

scripts/docker_build_arm64

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --platform linux/arm64 -t interface21/openwms-services:latest .

scripts/docker_build_release

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2005-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openwms.services;
+
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * A ServiceRegistryOtlpConfiguration.
+ *
+ * @author Heiko Scherrer
+ */
+@ConditionalOnClass(name = "io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter")
+@AutoConfiguration
+public class ServiceRegistryOtlpConfiguration {
+
+    @Configuration(proxyBeanMethods = false)
+    @ConditionalOnClass(name = "io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter")
+    public static class OtelConfiguration {
+        @ConditionalOnClass(name = "io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter")
+        public @Bean OtlpGrpcSpanExporter otlpHttpSpanExporter(@Value("${owms.tracing.url}") String url) {
+            return OtlpGrpcSpanExporter.builder().setEndpoint(url).build();
+        }
+    }
+}

scripts/docker_push_release

@@ -27,12 +27,12 @@
 import static org.springframework.security.config.Customizer.withDefaults;
 
 /**
- * A WebSecurityConfig.
+ * A WebSecurityConfiguration.
  *
  * @author Heiko Scherrer
  */
 @Configuration
-public class WebSecurityConfig {
+public class WebSecurityConfiguration {
 
     @Profile("SECURED")
     @Bean

src/main/java/org/openwms/services/ServiceRegistryOtlpConfiguration.java

@@ -1,4 +1,4 @@
-Copyright 2005-2024 the original author or authors.
+Copyright 2005-2025 the original author or authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

…/openwms/services/WebSecurityConfig.java …s/services/WebSecurityConfiguration.javasrc/main/java/org/openwms/services/WebSecurityConfig.java renamed to src/main/java/org/openwms/services/WebSecurityConfiguration.java src/main/java/org/openwms/services/WebSecurityConfig.java renamed to src/main/java/org/openwms/services/WebSecurityConfiguration.java

@@ -13,18 +13,20 @@ owms:
   srv:
     hostname: localhost
     protocol: http
+  tracing:
+    url: http://localhost:4317
 
 server:
   port: ${PORT:8761}
 
 # https://medium.com/@fahimfarookme/the-mystery-of-eureka-self-preservation-c7aa0ed1b799
 eureka:
   client:
-    register-with-eureka: false # default is true
     fetch-registry: false # default is true
     healthcheck:
       enabled: false
     instance-info-replication-interval-seconds: 30 # default is 30
+    register-with-eureka: false # default is true
     service-url:
       defaultZone: ${owms.eureka.zone} # Must be camelCase
   server:
@@ -51,55 +53,54 @@ eureka:
     renewal-percent-threshold: 0.49 # default is 0.85
     peer-node-read-timeout-ms: 1000 # default is 200
   instance:
-    secure-port-enabled: false
-    non-secure-port-enabled: true
     metadata-map:
     # hostname: ${owms.srv.hostname} # to avoid 401 batch update errors
       password: ${spring.security.user.password}
       protocol: ${owms.srv.protocol}
       username: ${spring.security.user.name}
       zone: ${owms.eureka.zone}
+      prometheus.scrape: "true"
+      prometheus.path: "/actuator/prometheus"
+      prometheus.port: ${server.port}
+    non-secure-port-enabled: true
+    secure-port-enabled: false
+
+info:
+  scm-url: "@scm.url@"
+  build-url: "@ciManagement.url@"
 
 management:
   endpoints:
     web:
       exposure:
         include: "prometheus"
+  info:
+    git:
+      mode: simple
+  metrics:
+    distribution:
+      percentiles-histogram:
+        greeting: true
+        http:
+          server:
+            requests: true
+    tags:
+      application: ${spring.application.name}
+  otlp:
+    tracing:
+      endpoint: ${owms.tracing.url}
+  prometheus:
+    metrics:
+      export:
+        enabled: true
   server:
     port: ${MGMTPORT:8990}
+  tracing:
+    sampling:
+      probability: 1.0
 
 ---
 spring:
   config:
     activate:
       on-profile: SECURED
-
----
-spring:
-  config:
-    activate:
-      on-profile: HEROKU
-  main:
-    banner-mode: "OFF"
-
-owms:
-  srv:
-    protocol: https
-    hostname: openwms-services.herokuapp.com
-
-eureka:
-  server:
-    eviction-interval-timer-in-ms: 0
-    wait-time-in-ms-when-sync-empty: 0
-  client:
-    register-with-eureka: false
-    fetch-registry: false
-    service-url:
-      defaultZone: ${owms.eureka.url}/eureka/ # Must be camelCase
-  instance:
-    secure-port-enabled: true
-    non-secure-port-enabled: false
-    status-page-url: ${owms.srv.protocol}://${eureka.instance.hostname}:${server.port}/actuator/info
-    health-check-url: ${owms.srv.protocol}://${eureka.instance.hostname}:${server.port}/actuator/health
-    home-page-url: ${owms.srv.protocol}://${eureka.instance.hostname}:${server.port}/actuator/
-