Merge pull request #64 from oskariorg/java17

Merge Java 17 changes to develop
oskariorg · Jan 29, 2025 · 0ca9d7c · 0ca9d7c
2 parents 02855bd + 2d79de6
commit 0ca9d7c
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 22 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

diff --git a/app-resources/pom.xml b/app-resources/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.oskari.demo</groupId>
         <artifactId>server-extension</artifactId>
-        <version>1.29.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>app-resources</artifactId>
     <packaging>jar</packaging>

diff --git a/...y/example/V1_0_3__initial_db_content.java → ...lyway/app/V1_0_3__initial_db_content.java b/...y/example/V1_0_3__initial_db_content.java → ...lyway/app/V1_0_3__initial_db_content.java
@@ -1,4 +1,4 @@
-package flyway.example;
+package flyway.app;
 
 import org.oskari.helpers.AppSetupHelper;
 import org.flywaydb.core.api.migration.BaseJavaMigration;

diff --git a/...example/V1_1_1__add_unsd_datasources.java → ...way/app/V1_1_1__add_unsd_datasources.java b/...example/V1_1_1__add_unsd_datasources.java → ...way/app/V1_1_1__add_unsd_datasources.java
@@ -1,4 +1,4 @@
-package flyway.example;
+package flyway.app;
 
 import org.flywaydb.core.api.migration.BaseJavaMigration;
 import org.flywaydb.core.api.migration.Context;

diff --git a/...V1_1_2__add_permission_for_regionset.java → ...V1_1_2__add_permission_for_regionset.java b/...V1_1_2__add_permission_for_regionset.java → ...V1_1_2__add_permission_for_regionset.java
@@ -1,4 +1,4 @@
-package flyway.example;
+package flyway.app;
 
 import fi.nls.oskari.domain.Role;
 import fi.nls.oskari.domain.User;

diff --git a/...xample/V1_1_3__add_stylized_appsetup.java → ...ay/app/V1_1_3__add_stylized_appsetup.java b/...xample/V1_1_3__add_stylized_appsetup.java → ...ay/app/V1_1_3__add_stylized_appsetup.java
@@ -1,4 +1,4 @@
-package flyway.example;
+package flyway.app;
 
 import org.flywaydb.core.api.migration.BaseJavaMigration;
 import org.flywaydb.core.api.migration.Context;

diff --git a/...V1_1_4__add_findbycoordinates_bundle.java → ...V1_1_4__add_findbycoordinates_bundle.java b/...V1_1_4__add_findbycoordinates_bundle.java → ...V1_1_4__add_findbycoordinates_bundle.java
@@ -1,4 +1,4 @@
-package flyway.example;
+package flyway.app;
 
 import fi.nls.oskari.domain.map.view.Bundle;
 import org.flywaydb.core.api.migration.BaseJavaMigration;

diff --git a/...example/V1_0_0__initial_dataproviders.sql → ...way/app/V1_0_0__initial_dataproviders.sql b/...example/V1_0_0__initial_dataproviders.sql → ...way/app/V1_0_0__initial_dataproviders.sql
diff --git a/.../flyway/example/V1_0_1__initial-users.sql → ...rces/flyway/app/V1_0_1__initial-users.sql b/.../flyway/example/V1_0_1__initial-users.sql → ...rces/flyway/app/V1_0_1__initial-users.sql
diff --git a/...e/V1_0_2__register-sample-info-bundle.sql → ...p/V1_0_2__register-sample-info-bundle.sql b/...e/V1_0_2__register-sample-info-bundle.sql → ...p/V1_0_2__register-sample-info-bundle.sql
diff --git a/.../V1_1_0__register-regionset-countries.sql → .../V1_1_0__register-regionset-countries.sql b/.../V1_1_0__register-regionset-countries.sql → .../V1_1_0__register-regionset-countries.sql
diff --git a/app-specific-code/pom.xml b/app-specific-code/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.oskari.demo</groupId>
         <artifactId>server-extension</artifactId>
-        <version>1.29.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>app-specific-code</artifactId>
 
@@ -15,12 +15,5 @@
             <groupId>org.oskari</groupId>
             <artifactId>control-base</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -5,14 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.oskari.demo</groupId>
     <artifactId>server-extension</artifactId>
-    <version>1.29.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>demo.oskari.org</name>
 
     <properties>
-        <oskari.version>2.15.0-SNAPSHOT</oskari.version>
+        <oskari.version>3.0.0-SNAPSHOT</oskari.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
     </properties>
 
     <repositories>
@@ -45,7 +45,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>
@@ -54,15 +54,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>

diff --git a/webapp-map/pom.xml b/webapp-map/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.oskari.demo</groupId>
         <artifactId>server-extension</artifactId>
-        <version>1.29.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>webapp-map</artifactId>