Merge pull request #925 from terrestris/parent-fix

Fix(deps): Use correct parent and required flyway10 module for postgres
terrestris · Sep 26, 2024 · b327d71 · b327d71
2 parents 7cf09c1 + 0921b29
commit b327d71
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/.java-version b/.java-version
@@ -1,2 +1 @@
 21
-
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.2.5</version>
+    <version>3.3.4</version>
   </parent>
 
   <groupId>de.terrestris</groupId>
@@ -81,10 +81,10 @@
   </distributionManagement>
 
   <modules>
-    <module>shogun-lib</module>
     <module>shogun-boot</module>
-    <module>shogun-gs-interceptor</module>
     <module>shogun-config</module>
+    <module>shogun-gs-interceptor</module>
+    <module>shogun-lib</module>
     <module>shogun-manager</module>
     <module>shogun-proxy</module>
   </modules>
@@ -102,7 +102,6 @@
     <jacoco-plugin.version>0.8.12</jacoco-plugin.version>
     <maven-project-info-reports-plugin.version>3.7.0</maven-project-info-reports-plugin.version>
     <jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
-    <git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
 
     <!-- Spring -->
     <spring-boot.version>3.3.4</spring-boot.version>
@@ -114,7 +113,7 @@
     <!-- Hibernate, Jackson, JAXB etc. -->
     <jaxb-api.version>2.3.1</jaxb-api.version>
     <!-- Please note: This must be compatible with ${jackson-bom.version}. -->
-    <jackson-datatype-jts.version>2.15.3</jackson-datatype-jts.version>
+    <jackson-datatype-jts.version>2.17.2</jackson-datatype-jts.version>
 
     <!-- Security -->
     <keycloak.version>25.0.6</keycloak.version>
@@ -141,14 +140,7 @@
     <reflections.version>0.10.2</reflections.version>
     <evo-inflector.version>1.3</evo-inflector.version>
 
-    <!-- Logging -->
-    <log4j2.version>2.24.0</log4j2.version>
-
     <!-- Testing -->
-    <testcontainers.version>1.20.1</testcontainers.version>
-    <junit.jupiter.version>5.7.1</junit.jupiter.version>
-    <mockito.version>5.13.0</mockito.version>
-    <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>
     <maven-project-info-reports-plugin.version>3.7.0</maven-project-info-reports-plugin.version>
     <archunit.version>1.3.0</archunit.version>
     <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
@@ -175,7 +167,6 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven-compiler-plugin.version}</version>
           <configuration>
-            <compilerVersion>${java.version}</compilerVersion>
             <source>${java.version}</source>
             <target>${java.version}</target>
             <showWarnings>true</showWarnings>
@@ -450,7 +441,13 @@
       <dependency>
         <groupId>org.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>3.10.8</version>
+        <version>${ehcache3.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.flywaydb</groupId>
+        <artifactId>flyway-database-postgresql</artifactId>
+        <version>${flyway.version}</version>
       </dependency>
 
       <dependency>

diff --git a/shogun-boot/pom.xml b/shogun-boot/pom.xml
@@ -99,6 +99,11 @@
       <artifactId>flyway-core</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-database-postgresql</artifactId>
+    </dependency>
+
     <!-- Hibernate -->
     <dependency>
       <groupId>io.hypersistence</groupId>

diff --git a/shogun-boot/src/test/java/de/terrestris/shogun/boot/config/JdbcConfiguration.java b/shogun-boot/src/test/java/de/terrestris/shogun/boot/config/JdbcConfiguration.java
@@ -59,7 +59,7 @@ public PostgreSQLContainer postgreSQLContainer() {
         if (postgreSQLContainer != null) {
             return postgreSQLContainer;
         }
-        DockerImageName postgis = DockerImageName.parse("postgis/postgis:13-3.1-alpine").asCompatibleSubstituteFor("postgres");
+        DockerImageName postgis = DockerImageName.parse("postgis/postgis:16-3.4-alpine").asCompatibleSubstituteFor("postgres");
         postgreSQLContainer = new PostgreSQLContainer(postgis);
         postgreSQLContainer.start();
         return postgreSQLContainer;

diff --git a/...un-boot/src/test/java/de/terrestris/shogun/boot/controller/ApplicationControllerTest.java b/...un-boot/src/test/java/de/terrestris/shogun/boot/controller/ApplicationControllerTest.java
@@ -48,9 +48,7 @@ public void insertTestData() {
         entities.add(entity2);
         entities.add(entity3);
 
-        List<Application> persistedEntities = (List<Application>) repository.saveAll(entities);
-
-        testData = persistedEntities;
+        testData = (List<Application>) repository.saveAll(entities);
     }
 
 }
diff --git a/shogun-gs-interceptor/pom.xml b/shogun-gs-interceptor/pom.xml
@@ -75,6 +75,11 @@
       <artifactId>flyway-core</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-database-postgresql</artifactId>
+    </dependency>
+
     <!-- Hibernate -->
     <dependency>
       <groupId>io.hypersistence</groupId>