Upgrade Spring Boot 3.3 (#457)

entur · Nov 7, 2024 · 30c8f7f · 30c8f7f
1 parent 56f7dc1
commit 30c8f7f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -23,7 +23,7 @@ jobs:
           wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings.xml -O .github/workflows/settings.xml
       - uses: actions/setup-java@v4
         with:
-          java-version: 21.0.1+12
+          java-version: 21.0.5+11
           distribution: liberica
       - name: Cache Maven dependencies
         uses: actions/cache@v4
@@ -56,12 +56,12 @@ jobs:
                   -Dsonar.token=${SONAR_TOKEN}
 
   docker-build:
+    if: github.repository_owner == 'entur' && github.event_name == 'push' && github.ref == 'refs/heads/master'
     needs: [maven-verify]
     uses: entur/gha-docker/.github/workflows/build.yml@v1
     with:
       build_artifact_name: artifact
       build_artifact_path: target
   docker-push:
-    if: github.repository_owner == 'entur' && github.event_name == 'push'
     needs: [docker-build]
     uses: entur/gha-docker/.github/workflows/push.yml@v1
diff --git a/helm/nabu/templates/configmap.yaml b/helm/nabu/templates/configmap.yaml
@@ -28,7 +28,7 @@ data:
     spring.jpa.database=POSTGRESQL
     spring.jpa.open-in-view=false
     spring.jpa.show-sql=false
-    spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
+    spring.jpa.properties.hibernate.boot.allow_jdbc_metadata_access=false
     spring.flyway.table=schema_version
 
     # Provider and Organisation APIs

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.entur.ror</groupId>
         <artifactId>superpom</artifactId>
-        <version>2.17</version>
+        <version>3.0</version>
     </parent>
 
     <groupId>no.rutebanken</groupId>
@@ -47,7 +47,7 @@
 
     <properties>
         <java.version>21</java.version>
-        <entur.helpers.version>2.34</entur.helpers.version>
+        <entur.helpers.version>3.0</entur.helpers.version>
         <spring-cloud-gcp-dependencies.version>5.8.0</spring-cloud-gcp-dependencies.version>
         <postgis-jdbc.version>2024.1.0</postgis-jdbc.version>
         <wololo.version>0.18.1</wololo.version>
@@ -148,7 +148,8 @@
         <!-- Misc -->
         <dependency>
             <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
+            <artifactId>flyway-database-postgresql</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>