MODSENDER-61 : Update to Java 17 mod-sender (folio-org#53)

* MODSENDER-61 : Update to Java 17 mod-sender * MODSENDER-61 : added apk upgrade
indexdata · Oct 11, 2023 · 1edc1a4 · 1edc1a4
1 parent c5ce9c2
commit 1edc1a4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,9 @@
-FROM folioci/alpine-jre-openjdk11:latest
+FROM folioci/alpine-jre-openjdk17:latest
+
+# Install latest patch versions of packages: https://pythonspeed.com/articles/security-updates-in-docker/
+USER root
+RUN apk upgrade --no-cache
+USER folio
 
 ENV VERTICLE_FILE mod-sender-fat.jar
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,13 +2,13 @@ buildMvn {
   publishModDescriptor = 'yes'
   mvnDeploy = 'yes'
   doKubeDeploy = true
-  buildNode = 'jenkins-agent-java11'
+  buildNode = 'jenkins-agent-java17'
 
   doDocker = {
     buildJavaDocker {
       publishMaster = 'yes'
       healthChk = 'yes'
-      healthChkCmd = 'curl -sS --fail -o /dev/null  http://localhost:8081/apidocs/ || exit 1'
+      healthChkCmd = 'wget --no-verbose --tries=1 --spider http://localhost:8081/admin/health || exit 1'
     }
   }
 }

diff --git a/pom.xml b/pom.xml
@@ -14,6 +14,8 @@
   </licenses>
 
   <properties>
+    <java.version>17</java.version>
+    <aspectj.version>1.9.19</aspectj.version>
     <raml-module-builder.version>35.0.0</raml-module-builder.version>
     <vertx.version>4.3.3</vertx.version>
     <junit.version>4.13.1</junit.version>
@@ -114,7 +116,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <release>11</release>
+          <release>${java.version}</release>
           <encoding>UTF-8</encoding>
           <annotationProcessors>
             <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
@@ -158,12 +160,12 @@
       </plugin>
 
       <plugin>
-        <groupId>com.nickwongdev</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <version>1.12.6</version>
+        <version>1.13.1</version>
         <configuration>
           <verbose>true</verbose>
-          <complianceLevel>11</complianceLevel>
+          <release>${java.version}</release>
           <includes>
             <include>**/impl/*.java</include>
             <include>**/*.aj</include>
@@ -189,12 +191,12 @@
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.9.6</version>
+            <version>${aspectj.version}</version>
           </dependency>
           <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjtools</artifactId>
-            <version>1.9.6</version>
+            <version>${aspectj.version}</version>
           </dependency>
         </dependencies>
       </plugin>