From 9ae72e463c1281ce1b82ddaa7c9430be8f6ebbee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20M=C3=A4kinen?= <sami.makinen@nls.fi>
Date: Thu, 9 Jan 2025 17:41:11 +0200
Subject: [PATCH 1/4] Bump version for testing oskari-server 3.0.0-SNAPSHOT

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac1b19f..0fd9844 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,13 @@
     <name>kartta.paikkatietoikkuna.fi</name>
 
     <properties>
-        <oskari.version>2.15.0-SNAPSHOT</oskari.version>
+        <oskari.version>3.0.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>
 
         <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>

From b0cd520ddd4c87bab8ffe013a2fb6f999190bd7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20M=C3=A4kinen?= <sami.makinen@nls.fi>
Date: Thu, 9 Jan 2025 17:45:25 +0200
Subject: [PATCH 2/4] Update plugin versions to match oskari-server

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0fd9844..b392f15 100755
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,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,7 +66,7 @@
 
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
@@ -74,7 +74,7 @@
             <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>

From 6253cb58aa9d911f862decb0fedd00c91f7ec451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20M=C3=A4kinen?= <sami.makinen@nls.fi>
Date: Wed, 22 Jan 2025 18:41:35 +0200
Subject: [PATCH 3/4] Bump nls deps, handle junit

---
 pom.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b392f15..a18fcd1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,10 @@
 
     <properties>
         <oskari.version>3.0.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>
+        <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>17</java.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>
 

From 9c4b0785855b6f9b94e25babd927ed2680a7a639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20M=C3=A4kinen?= <sami.makinen@nls.fi>
Date: Wed, 29 Jan 2025 17:46:53 +0200
Subject: [PATCH 4/4] Update to Java17 and new cache version

---
 .github/workflows/run_tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index f96ae03..69fae4b 100644
--- 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') }}