#13 Upgrade to Java 21

.github/workflows/branch-build.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Cache Maven packages
         uses: actions/cache@v1
         with:

.github/workflows/master-build.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Cache Maven packages
         uses: actions/cache@v1
         with:

Dockerfile

@@ -1,10 +1,10 @@
-FROM openjdk:17.0.1-oracle as builder
+FROM amazoncorretto:21-alpine as builder
 WORKDIR application
 ARG JAR_FILE=target/openwms-configuration-exec.jar
 COPY ${JAR_FILE} application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
-FROM openjdk:17.0.1-oracle
+FROM amazoncorretto:21-alpine
 ARG JAVA_OPTS="-Xss512k"
 WORKDIR application
 COPY --from=builder application/dependencies/ ./

pom.xml

@@ -4,12 +4,13 @@
     <parent>
         <groupId>org.openwms</groupId>
         <artifactId>org.openwms.parent</artifactId>
-        <version>24</version>
+        <version>25</version>
         <relativePath />
     </parent>
     <artifactId>org.openwms.configuration</artifactId>
     <version>2.1.0-SNAPSHOT</version>
     <name>OpenWMS.org CORE: Configuration Service</name>
+    <description>A configuration service that provides arbitrary configuration parameters for microservices at a central place</description>
     <url>https://github.com/spring-labs/${project.artifactId}</url>
 
     <issueManagement>
@@ -65,7 +66,7 @@
     <properties>
         <guava.version>30.0-jre</guava.version>
         <servo-core.version>0.12.21</servo-core.version>
-        <spring-cloud-dependencies.version>2021.0.7</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2021.0.8</spring-cloud-dependencies.version>
     </properties>
 
     <reporting>
@@ -125,7 +126,7 @@
                 <version>${guava.version}</version>
             </dependency>
             <dependency>
-                <!-- com.netflix.eureka:eureka has an internal clash -->
+                <!-- Clash in org.springframework.cloud:spring-cloud-starter-netflix-eureka-client -->
                 <groupId>com.netflix.servo</groupId>
                 <artifactId>servo-core</artifactId>
                 <version>${servo-core.version}</version>
@@ -172,7 +173,6 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
             <scope>runtime</scope>
-            <optional>true</optional>
         </dependency>
 
         <!-- 3rd party dependencies -->
@@ -185,6 +185,11 @@
             <groupId>io.interface21</groupId>
             <artifactId>ameba-lib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-core</artifactId>
@@ -222,6 +227,9 @@
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
         </repository>
         <repository>
             <id>spring-milestones</id>
@@ -230,6 +238,9 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
         </repository>
     </repositories>
     <pluginRepositories>
@@ -240,11 +251,17 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
         </pluginRepository>
         <pluginRepository>
             <id>sonatype-nexus-snapshots</id>
             <name>Snapshot Repository</name>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
             <releases>
                 <enabled>false</enabled>
             </releases>

src/main/resources/application.yml

@@ -56,36 +56,6 @@ logging:
     name: BOOT-CORE-Config.log
     path: "/tmp/owms"
 
----
-spring:
-  config:
-    activate:
-      on-profile: HEROKU
-  main:
-    banner-mode: "OFF"
-  security:
-    user:
-      password: '{cipher}AQAVmwzi/JEKNgFSPOXYSabqxPGBQFao1cIy2w53OKrAgNB/1fJp1U4rVlASQ1BNO8uhswXhy7PwtsAEWECGY6+cVNMnU9Q9P9xnvJxP7gdjhIzqLkGXm6bU8pSHTkcq8nAvFE4O/4ttQzhQRjdVOaUV/j5hGuS7yhHuvtxGPvc8w7A8eytJZVTGoWupDPq+cUSQbno72ceVenijeD2/IPJAbXdrATcFODnU79DVJSww47tF61P5Z5F87XxM4VAciYATJJyt8Y2XEtdvRvyQhECPy9+MSbMLqH8bop5DYYZaVZMfEqweYs9AqtTNop5GYbVU+OMTXcxl6+Uq/iSSfeVJX2XQRGlLLF/tRrrrQx5w6StThQVEMmZFlh2i9A5jxms='
-
-owms:
-  srv:
-    protocol: https
-    hostname: openwms-configuration.herokuapp.com
-
-encrypt:
-  keyStore:
-    location: classpath:/server.jks
-    alias: livekey
-# set encrypt.keyStore.secret (not encrypt.key-store.secret) and encrypt.keyStore.password as command line parameter or in the cloud environment props!
-
-eureka:
-  instance:
-    secure-port-enabled: true
-    non-secure-port-enabled: false
-    status-page-url: ${owms.srv.protocol}://${owms.srv.hostname}:${server.port}/actuator/info
-    health-check-url: ${owms.srv.protocol}://${owms.srv.hostname}:${server.port}/actuator/health
-    home-page-url: ${owms.srv.protocol}://${owms.srv.hostname}:${server.port}/actuator/
-
 ---
 spring:
   config:

src/main/resources/logback.xml

@@ -15,16 +15,56 @@
     <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
 
     <logger name="com.github.dozermapper" level="ERROR" />
+    <logger name="com.netflix.discovery" level="OFF" />
+    <logger name="org.ameba" level="WARN"/>
+    <logger name="org.hibernate.boot.internal.InFlightMetadataCollectorImpl" level="ERROR"/>
     <logger name="org.hibernate.SQL" level="OFF" />
+    <logger name="org.hibernate.SQL_SLOW" level="OFF"/>
     <logger name="org.hibernate.type" level="OFF" />
-    <logger name="com.netflix.discovery" level="OFF" />
-    <logger name="org.springframework.security" level="WARN" />
-
+    <logger name="org.springframework" level="WARN" />
     <logger name="org.openwms" level="DEBUG" />
-    <logger name="CORE_INTEGRATION_MESSAGING" level="DEBUG" />
 
+    <logger name="CORE_INTEGRATION_MESSAGING" level="INFO" />
+
+    <springProfile name="ELK">
+        <appender name="ELK" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+            <destination>elk:5000</destination>
+            <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+        </appender>
+        <logger name="PRESENTATION_LAYER_EXCEPTION" level="ERROR"/>
+        <logger name="SERVICE_LAYER_EXCEPTION" level="ERROR"/>
+        <logger name="INTEGRATION_LAYER_EXCEPTION" level="ERROR"/>
+        <logger name="CALLCONTEXT" level="OFF"/>
+        <logger name="MEASURED" level="INFO"/>
     <root level="INFO">
         <appender-ref ref="STDOUT" />
+            <appender-ref ref="ELK"/>
     </root>
-
+    </springProfile>
+    <springProfile name="!ELK">
+    <logger name="PRESENTATION_LAYER_EXCEPTION" level="ERROR" additivity="false">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="EXCFILE"/>
+        <appender-ref ref="LOGFILE"/>
+    </logger>
+    <logger name="SERVICE_LAYER_EXCEPTION" level="ERROR" additivity="false">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="EXCFILE"/>
+        <appender-ref ref="LOGFILE"/>
+    </logger>
+    <logger name="INTEGRATION_LAYER_EXCEPTION" level="ERROR" additivity="false">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="EXCFILE"/>
+        <appender-ref ref="LOGFILE"/>
+    </logger>
+        <logger name="CALLCONTEXT" level="DEBUG"/>
+        <logger name="MEASURED" level="INFO">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="TSL"/>
+    </logger>
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="LOGFILE"/>
+    </root>
+    </springProfile>
 </configuration>