MODCAMUNDA-21: Prepare for spring-boot 3.3.5 support.

Switch to JDK21 which has better spring-boot 3.3.x support as well as better GraalVM support. The `com.jcraft` has migrated to `com.github.mwiede`, so update that and the version. Update the graalvm related dependencies. Add the polyglot dependencies. The `org.jacoco` `jacoco-maven-plugin` must be upgraded or it will fail with the new spring-boot 3.3.x changes. Fix some warnings and change the default `springframework.test` setting.
folio-org · Jan 6, 2025 · 6079ca7 · 6079ca7
1 parent 72b9d0b
commit 6079ca7
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM folioci/alpine-jre-openjdk17:latest
+FROM folioci/alpine-jre-openjdk21:latest
 
 # Install latest patch versions of packages: https://pythonspeed.com/articles/security-updates-in-docker/
 USER root

diff --git a/pom.xml b/pom.xml
@@ -29,9 +29,10 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spring-module-core.version>2.1.0-SNAPSHOT</spring-module-core.version>
     <workflow-components.version>1.2.0-SNAPSHOT</workflow-components.version>
-    <camunda.version>7.21.0-alpha2</camunda.version>
+    <camunda.version>7.21.0</camunda.version>
     <openapi.server.port>9000</openapi.server.port>
     <maven.javadoc.skip>true</maven.javadoc.skip>
+    <graalvm.polyglot.version>24.1.1</graalvm.polyglot.version>
   </properties>
 
   <packaging>jar</packaging>
@@ -186,9 +187,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.jcraft</groupId>
+      <groupId>com.github.mwiede</groupId>
       <artifactId>jsch</artifactId>
-      <version>0.1.55</version>
+      <version>0.1.72</version>
     </dependency>
 
     <dependency>
@@ -200,7 +201,7 @@
     <dependency>
       <groupId>org.python</groupId>
       <artifactId>jython-standalone</artifactId>
-      <version>2.7.3</version>
+      <version>2.7.4</version>
     </dependency>
 
     <dependency>
@@ -244,50 +245,99 @@
 
     <dependency>
       <groupId>org.graalvm.js</groupId>
-      <artifactId>js</artifactId>
-      <version>23.0.4</version>
+      <artifactId>js-scriptengine</artifactId>
+      <version>${graalvm.polyglot.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.graalvm.python</groupId>
       <artifactId>python-language</artifactId>
-      <version>23.1.3</version>
+      <version>${graalvm.polyglot.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.graalvm.python</groupId>
       <artifactId>python-resources</artifactId>
-      <version>23.1.3</version>
+      <version>${graalvm.polyglot.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.graalvm.ruby</groupId>
       <artifactId>ruby-language</artifactId>
-      <version>23.1.3</version>
+      <version>${graalvm.polyglot.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.graalvm.ruby</groupId>
       <artifactId>ruby-resources</artifactId>
-      <version>23.1.3</version>
+      <version>${graalvm.polyglot.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.4.7.0</version>
+      <version>9.4.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>org.graalvm.js</groupId>
       <artifactId>js-scriptengine</artifactId>
-      <version>23.1.2</version>
+      <version>${graalvm.polyglot.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.graalvm.polyglot</groupId>
       <artifactId>polyglot</artifactId>
-      <version>23.1.3</version>
+      <version>${graalvm.polyglot.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.graalvm.polyglot</groupId>
+      <artifactId>java</artifactId>
+      <version>${graalvm.polyglot.version}</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.graalvm.polyglot</groupId>
+      <artifactId>js</artifactId>
+      <version>${graalvm.polyglot.version}</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.graalvm.polyglot</groupId>
+      <artifactId>llvm</artifactId>
+      <version>${graalvm.polyglot.version}</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.graalvm.polyglot</groupId>
+      <artifactId>lsp</artifactId>
+      <version>${graalvm.polyglot.version}</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.graalvm.polyglot</groupId>
+      <artifactId>python</artifactId>
+      <version>${graalvm.polyglot.version}</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.graalvm.polyglot</groupId>
+      <artifactId>ruby</artifactId>
+      <version>${graalvm.polyglot.version}</version>
+      <type>pom</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.graalvm.polyglot</groupId>
+      <artifactId>wasm</artifactId>
+      <version>${graalvm.polyglot.version}</version>
+      <type>pom</type>
     </dependency>
 
     <dependency>

diff --git a/src/test/java/org/folio/rest/camunda/delegate/FileDelegateTest.java b/src/test/java/org/folio/rest/camunda/delegate/FileDelegateTest.java
@@ -10,6 +10,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,10 +22,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang.StringUtils;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
@@ -82,6 +81,7 @@ class FileDelegateTest {
   @InjectMocks
   FileDelegate delegate;
 
+  @SuppressWarnings("serial")
   private final Map<String, Object> mockData = new HashMap<>() {{
     put("data", new ArrayList<>() {{
       add("Hello, World!");

diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml
@@ -11,7 +11,7 @@ logging:
       folio: WARN
       hibernate: WARN
       springframework: WARN
-      springframework.test: INFO
+      springframework.test: WARN
 
       # Uncomment to enable MockMvc unit test logging.
       #springframework.test.web.servlet.result: DEBUG

diff --git a/src/test/resources/scripts/utils.js b/src/test/resources/scripts/utils.js