OY-4962 Päivitetty JVM versioon 21

Opetushallitus · Dec 7, 2024 · 909615b · 909615b
1 parent 0f7ecc3
commit 909615b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,10 +29,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-  
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - uses: szenius/[email protected]
@@ -92,7 +92,7 @@ jobs:
           export ARTIFACT_NAME="sijoittelu-service"
           mv sijoittelu-service/target/sijoittelu-service.jar $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar
           cp -vr src/main/resources/oph-configuration $DOCKER_BUILD_DIR/config/
-          export BASE_IMAGE="baseimage-fatjar-openjdk17:master"
+          export BASE_IMAGE="baseimage-fatjar-openjdk21:master"
           ./ci-tools/common/pull-image.sh
           ./ci-tools/github-build/build-fatjar.sh $ARTIFACT_NAME
           ./ci-tools/github-build/upload-image.sh $ARTIFACT_NAME
@@ -118,10 +118,10 @@ jobs:
             main/sijoittelu-tulos-service/target
           key: ${{ github.sha }}
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Deploy jar library

diff --git a/pom.xml b/pom.xml
@@ -235,9 +235,14 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>5.4.0</version>
+        <version>5.14.2</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+          <groupId>net.bytebuddy</groupId>
+          <artifactId>byte-buddy</artifactId>
+          <version>1.15.10</version>
+      </dependency>
       <dependency>
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>
@@ -246,7 +251,7 @@
       <dependency>
         <groupId>org.modelmapper</groupId>
         <artifactId>modelmapper</artifactId>
-        <version>3.1.1</version>
+        <version>3.2.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -638,7 +643,7 @@ buildTtime=${maven.build.timestamp}
             <version>3.11.0</version>
             <inherited>true</inherited>
             <configuration>
-              <release>17</release>
+              <release>21</release>
               <debug>false</debug>
             </configuration>
         </plugin>
@@ -655,7 +660,7 @@ buildTtime=${maven.build.timestamp}
                 <configuration>
                   <rules>
                     <requireJavaVersion>
-                      <version>17</version>
+                      <version>21</version>
                     </requireJavaVersion>
                     <dependencyConvergence />
                   </rules>