[dependency] Bump com.google.cloud:spring-cloud-gcp-dependencies from…

… 4.8.4 to 5.0.0 (#640)

* [dependency] Bump com.google.cloud:spring-cloud-gcp-dependencies

Bumps [com.google.cloud:spring-cloud-gcp-dependencies](https://github.com/GoogleCloudPlatform/spring-cloud-gcp) from 4.8.4 to 5.0.0.
- [Release notes](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/releases)
- [Changelog](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/blob/main/CHANGELOG.md)
- [Commits](GoogleCloudPlatform/spring-cloud-gcp@v4.8.4...v5.0.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:spring-cloud-gcp-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* deploy@v1 => v2

* Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0

* Bump org.springframework.cloud:spring-cloud-contract-wiremock from 4.0.4 to 4.1.0

* Update api-ci.yml

* Spring-boot 3.2.0

* deploy@v1

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: s148719 <[email protected]>

.github/workflows/api-alerts-dev-deploy.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: deploy alerts to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp

.github/workflows/api-alerts-prod-deploy.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: deploy to prod-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp

.github/workflows/api-ci.yml

@@ -45,6 +45,7 @@ jobs:
       - name: Maven clean install
         run: mvn -B -e --no-transfer-progress package --settings .m2/maven-settings.xml --file pom.xml clean install
       - uses: nais/docker-build-push@v0
+        if: ${{ github.actor != 'dependabot[bot]' }}
         id: docker-push
         with:
           team: farskapsportal

apps/api/pom.xml

@@ -15,7 +15,7 @@
         <!-- build -->
         <flyway-maven-plugin.version>9.22.3</flyway-maven-plugin.version>
         <maven.surefire.version>3.2.1</maven.surefire.version>
-        <build-helper-maven.version>3.4.0</build-helper-maven.version>
+        <build-helper-maven.version>3.5.0</build-helper-maven.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

libs/felles/src/main/java/no/nav/farskapsportal/backend/libs/felles/persistence/dao/FarskapserklaeringDao.java

@@ -94,7 +94,7 @@ Set<Integer> henteIdTilFarskapserklaeringerDetSkalOpprettesOppgaverFor(
       "select fe.id from Farskapserklaering fe "
           + "where fe.deaktivert is not null "
           + "and fe.deaktivert < :deaktivertFoer "
-          + "and (fe.dokument.blobIdGcp != null or fe.dokument.signeringsinformasjonFar.blobIdGcp != null or fe.dokument.signeringsinformasjonMor.blobIdGcp != null)"
+          + "and (fe.dokument.blobIdGcp is not null or fe.dokument.signeringsinformasjonFar.blobIdGcp is not null or fe.dokument.signeringsinformasjonMor.blobIdGcp is not null) "
           + "order by fe.dokument.signeringsinformasjonFar.signeringstidspunkt asc")
   Set<Integer> henteIdTilFarskapserklaeringerDokumenterSkalSlettesFor(LocalDateTime deaktivertFoer);
 }

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.0</version>
     </parent>
     <groupId>no.nav.farskapsportal.backend</groupId>
     <artifactId>farskapsportal-backend</artifactId>
@@ -44,12 +44,12 @@
         <osgi.core.version>6.0.0</osgi.core.version>
         <scala.version>2.13.12</scala.version>
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
-        <google-spring-cloud-gcp.version>4.8.4</google-spring-cloud-gcp.version>
-        <spring-cloud-starter.version>4.0.4</spring-cloud-starter.version>
+        <google-spring-cloud-gcp.version>5.0.0</google-spring-cloud-gcp.version>
+        <spring-cloud-starter.version>4.1.0</spring-cloud-starter.version>
         <google-oauth-client.version>1.34.1</google-oauth-client.version>
         <okhttp3.version>4.12.0</okhttp3.version>
         <wiremock-jre8-standalone.version>2.35.1</wiremock-jre8-standalone.version>
-        <spring-cloud-contract-wiremock.version>4.0.4</spring-cloud-contract-wiremock.version>
+        <spring-cloud-contract-wiremock.version>4.1.0</spring-cloud-contract-wiremock.version>
         <httpclient5.version>5.2.1</httpclient5.version>
         <hibernate-validator.parent>8.0.0.Final</hibernate-validator.parent>
         <shedlock.version>5.10.0</shedlock.version>
@@ -113,9 +113,11 @@
                 <version>${apache.commons-io.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
                 <version>${jackson-core.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.google.oauth-client</groupId>