Merge pull request #236 from nls-oskari/java17

Java17
nls-oskari · Jan 29, 2025 · 5a34d26 · 5a34d26
2 parents e4f2266 + 9c4b078
commit 5a34d26
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        java: ['8', '11']
+        java: ['17']
 
     steps:
       - uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
           distribution: 'adopt'
           architecture: x64
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/pom.xml b/pom.xml
@@ -10,13 +10,14 @@
     <name>kartta.paikkatietoikkuna.fi</name>
 
     <properties>
-        <oskari.version>2.15.0-SNAPSHOT</oskari.version>
-        <nls.search.version>4.2</nls.search.version>
-        <nls.proj.version>1.2</nls.proj.version>
-        <nls.terrain-profile.version>1.3</nls.terrain-profile.version>
+        <oskari.version>3.0.0-SNAPSHOT</oskari.version>
+        <nls.search.version>5.0-SNAPSHOT</nls.search.version>
+        <nls.proj.version>1.3-SNAPSHOT</nls.proj.version>
+        <nls.terrain-profile.version>2.0-SNAPSHOT</nls.terrain-profile.version>
+        <junit.version>4.13.2</junit.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
 
         <geojson-jackson.version>1.14</geojson-jackson.version>
         <commons-fileupload.version>1.3.2</commons-fileupload.version>
@@ -31,6 +32,12 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!-- Add for now since Oskari moved from Junit 4 to 5 -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -57,7 +64,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -66,15 +73,15 @@
 
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.cyclonedx</groupId>
                 <artifactId>cyclonedx-maven-plugin</artifactId>
-                <version>2.7.11</version>
+                <version>2.9.1</version>
                 <configuration>
                     <projectType>application</projectType>
                     <schemaVersion>1.4</schemaVersion>