EP-4336

Opetushallitus · Nov 18, 2024 · eb57890 · eb57890
1 parent 0c49b7a
commit eb57890
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,10 +70,10 @@ jobs:
           name: eperusteet-ui
           path: eperusteet/eperusteet-service/src/main/resources/static/ui
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           cache: 'maven'
 
@@ -119,7 +119,7 @@ jobs:
         run: |       
           git clone https://github.com/Opetushallitus/ci-tools.git
           source ci-tools/common/setup-tools.sh
-          export BASE_IMAGE="baseimage-fatjar-openjdk11:master"
+          export BASE_IMAGE="baseimage-fatjar-openjdk17:master"
           cp eperusteet-service.jar $DOCKER_BUILD_DIR/artifact/eperusteet.jar
           cp -vr $ARTIFACT_NAME/src/main/resources/oph-configuration $DOCKER_BUILD_DIR/config/
           ./ci-tools/common/pull-image.sh

diff --git a/eperusteet/eperusteet-service/pom.xml b/eperusteet/eperusteet-service/pom.xml
@@ -33,11 +33,10 @@
         <hibernate.export.type>CREATE</hibernate.export.type>
         <hibernate.jpamodel.version>5.3.6.Final</hibernate.jpamodel.version>
         <jsoup.version>1.15.3</jsoup.version>
-        <lombok.version>1.18.4</lombok.version>
+        <lombok.version>1.18.34</lombok.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <lombok.version>1.18.30</lombok.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <org.apache.tomcat.version>9.0.90</org.apache.tomcat.version>
         <pdfbox.version>2.0.29</pdfbox.version>
         <postgresql.version>42.5.5</postgresql.version>
@@ -297,7 +296,7 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjtools</artifactId>
-            <version>1.9.19</version>
+            <version>1.9.22.1</version>
         </dependency>
         <dependency>
             <groupId>org.jasig.cas.client</groupId>
@@ -474,7 +473,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <jvmArguments>-Dfile.encoding=UTF8</jvmArguments>
+                    <jvmArguments>
+                        -Dfile.encoding=UTF8
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
+                    </jvmArguments>
                 </configuration>
             </plugin>
             <!-- Maven rikkoo muuten ttf fontit -->
@@ -537,6 +539,9 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <argLine>
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
+                    </argLine>
                     <forkCount>3</forkCount>
                     <reuseForks>true</reuseForks>
                     <reportFormat>plain</reportFormat>
@@ -556,6 +561,9 @@
                         <exclude>**/service/test/*.java</exclude>
                         <exclude>**/*IT.java</exclude>
                     </excludes>
+                    <argLine>
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
+                    </argLine>
                 </configuration>
             </plugin>
             <plugin>