From b8e1987f0bb5066b83a3fc9989916e06670fe7cf Mon Sep 17 00:00:00 2001
From: Angelica Ochoa <15623749+ao508@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:17:26 -0400
Subject: [PATCH] Update to java21

Signed-off-by: Angelica Ochoa <15623749+ao508@users.noreply.github.com>
---
 .circleci/config.yml |  2 +-
 Dockerfile           |  4 ++--
 jitpack.yml          |  9 +++++++++
 pom.xml              | 39 +++++++++++++--------------------------
 4 files changed, 25 insertions(+), 29 deletions(-)
 create mode 100644 jitpack.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ffb6b4..4fb924d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 defaults: &defaults
     docker:
-        - image: cimg/openjdk:8.0.275
+        - image: cimg/openjdk:21.0
 
 version: 2.1
 
diff --git a/Dockerfile b/Dockerfile
index 50ef394..4cf3bb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.6.1-jdk-11-slim
+FROM maven:3.8.8
 # create working directory and set
 RUN mkdir /label-generator
 ADD . /label-generator
@@ -6,6 +6,6 @@ WORKDIR /label-generator
 RUN mvn clean install
 
 # copy jar and set entrypoint
-FROM openjdk:11-slim
+FROM openjdk:21
 COPY --from=0 /label-generator/target/smile_label_generator.jar /label-generator/smile_label_generator.jar
 ENTRYPOINT ["java"]
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000..9d14120
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,9 @@
+jdk:
+  - openjdk21
+
+before_install:
+   - sdk install maven 3.8.8
+   - sdk use maven 3.8.8
+   - sdk install java 21.0.2-open
+   - sdk use java 21.0.2-open
+   - sdk update
diff --git a/pom.xml b/pom.xml
index 93103a7..f6bcf27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.3.3.RELEASE</version>
+    <version>3.3.3</version>
   </parent>
 
   <repositories>
@@ -29,21 +29,20 @@
   </pluginRepositories>
 
   <properties>
-    <java.version>1.8</java.version>
-    <maven.compiler.version>1.8</maven.compiler.version>
-    <spring.version>5.2.6.RELEASE</spring.version>
-    <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
-    <slf4j.version>1.7.30</slf4j.version>
-    <jackson.version>2.11.2</jackson.version>
+    <java.version>21</java.version>
+    <maven.compiler.version>3.11.0</maven.compiler.version>
+    <spring.version>6.1.12</spring.version>
+    <spring.boot.version>3.3.3</spring.boot.version>
+    <jackson.version>2.17.2</jackson.version>
     <!-- smile messaging and shared entities dependency versions -->
     <smile_messaging_java.group>com.github.mskcc</smile_messaging_java.group>
-    <smile_messaging_java.version>1.4.1.RELEASE</smile_messaging_java.version>
+    <smile_messaging_java.version>java-v21-beta-2</smile_messaging_java.version>
     <!-- smile commons centralized config properties -->
     <smile_commons.group>com.github.mskcc</smile_commons.group>
-    <smile_commons.version>1.4.1.RELEASE</smile_commons.version>
+    <smile_commons.version>java-v21-beta-2</smile_commons.version>
     <!-- smile server model module -->
     <smile_server.group>com.github.mskcc.smile-server</smile_server.group>
-    <smile_server.version>1.6.0.RELEASE</smile_server.version>
+    <smile_server.version>java-v21-beta-2</smile_server.version>
   </properties>
 
   <dependencies>
@@ -99,19 +98,7 @@
     <dependency>
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>
-      <version>1.5.0</version>
-    </dependency>
-    <!-- string utils -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>19.0</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.11</version>
+      <version>1.5.3</version>
     </dependency>
   </dependencies>
 
@@ -144,10 +131,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>${maven.compiler.version}</version>
         <configuration>
-          <source>${maven.compiler.version}</source>
-          <target>${maven.compiler.version}</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
           <compilerArgument>-Xlint:deprecation</compilerArgument>
         </configuration>
       </plugin>