Oppgradert gradle wrapper og spring dependency management

Endret en del av oppsettet for Brreg #deploy-brreg-stub
navikt · Jan 11, 2024 · 6a9d9cf · 6a9d9cf
1 parent ebb9fb9
commit 6a9d9cf
Show file tree

Hide file tree

Showing 209 changed files with 225 additions and 231 deletions.
diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 

diff --git a/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties b/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 

diff --git a/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 

diff --git a/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties b/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 

diff --git a/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties b/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 

diff --git a/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties b/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -3,8 +3,9 @@ plugins {
     id "org.sonarqube" version "4.0.0.2929"
     id "uk.co.boothen.gradle.wsimport" version "0.21"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
+    id("org.openrewrite.rewrite") version("6.6.4")
 }
 
 test {
@@ -33,6 +34,10 @@ sonarqube {
     }
 }
 
+rewrite {
+    activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2")
+}
+
 
 dependencyManagement {
     applyMavenExclusions = false
@@ -62,6 +67,8 @@ repositories {
 
 dependencies {
 
+    rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0")
+
     implementation("io.dropwizard:dropwizard-jackson:4.0.2") {
         exclude group: "com.google.code.findbugs"
     }
@@ -75,7 +82,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
-    implementation 'org.springframework.vault:spring-vault-core:3.1.0'
     implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -98,6 +104,7 @@ dependencies {
     implementation 'com.h2database:h2'
 
     implementation 'wsdl4j:wsdl4j'
+    jaxWsTools "com.sun.xml.ws:jaxws-rt:2.3.7"
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
     implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
@@ -107,20 +114,21 @@ dependencies {
     implementation 'no.nav.common:cxf:3.2023.10.17_06.55-4e30d96bba05'
 
     implementation 'com.h2database:h2'
+    implementation "com.sun.xml.ws:jaxws-rt:4.0.2"
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
-    implementation 'jakarta.jws:jakarta.jws-api:3.0.0'
-
-    testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5
+    implementation 'jakarta.jws:jakarta.jws-api:3.0.0' //TODO upgrade to JUnit5
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     implementation 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
+
+    testImplementation "org.junit.jupiter:junit-jupiter:5.10.1"
 }
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
diff --git a/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties b/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java
@@ -26,7 +26,7 @@ public ClientAuthentication clientAuthentication() {
         }
         var token = System.getProperty(TOKEN);
         if (StringUtils.isBlank(token)) {
-            throw new IllegalArgumentException(String.format("Påkrevet property '%s' er ikke satt.", TOKEN));
+            throw new IllegalArgumentException("Påkrevet property '%s' er ikke satt.".formatted(TOKEN));
         }
         return new TokenAuthentication(System.getProperty(TOKEN));
     }

diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java
@@ -42,8 +42,8 @@ public ResponseEntity<Map> lagreEllerOppdaterHentRolleStub(@Valid @RequestBody R
     @GetMapping("/{orgnr}")
     public ResponseEntity<RsOrganisasjon> hentGrunndata(@NotNull @PathVariable Integer orgnr) {
         var grunndata = service.hentRolle(orgnr)
-                .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne roller for :%s",
-                        orgnr)));
+                .orElseThrow(() -> new NotFoundException("Kunne ikke finne roller for :%s".formatted(
+                orgnr)));
         return ResponseEntity.status(HttpStatus.OK).body(grunndata);
     }
 

diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java
@@ -39,8 +39,8 @@ public ResponseEntity<RolleoversiktTo> lagreEllerOppdaterRolleoversikt(@Valid @R
     @GetMapping
     public ResponseEntity<RolleoversiktTo> hentRolleoversikt(@NotNull @RequestHeader(name = "Nav-Personident") String ident) {
         var grunndata = service.hentRolleoversiktV1(ident)
-                .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne person med fnr:%s",
-                        ident)));
+                .orElseThrow(() -> new NotFoundException("Kunne ikke finne person med fnr:%s".formatted(
+                ident)));
         return ResponseEntity.status(HttpStatus.OK).body(grunndata);
     }
 

diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java
@@ -40,7 +40,7 @@ public ResponseEntity<RsRolleoversikt> lagreEllerOppdaterRolleoversikt(@Valid @R
     @GetMapping
     public ResponseEntity<RsRolleoversikt> hentRolleoversikt(@NotNull @RequestHeader(name = "Nav-Personident") String ident) {
         var grunndata = service.hentRolleoversiktV2(ident)
-                .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne person med fnr:%s", ident)));
+                .orElseThrow(() -> new NotFoundException("Kunne ikke finne person med fnr:%s".formatted(ident)));
         return ResponseEntity.status(HttpStatus.OK).body(grunndata);
     }
 

diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java
@@ -9,7 +9,6 @@
 import no.nav.brregstub.tjenestekontrakter.ws.HentRolleutskriftResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ws.server.endpoint.annotation.Endpoint;
 import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
@@ -28,7 +27,6 @@ public class BrregEndpoint {
 
     private final BrregService brregService;
 
-    @Autowired
     public BrregEndpoint(BrregService brregService) {
         this.brregService = brregService;
     }

diff --git a/...g-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java b/...g-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java
@@ -9,7 +9,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -20,7 +19,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDate;
 import java.util.Map;
@@ -30,7 +28,6 @@
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class HentRolleoversiktControllerTest {
 

diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java
@@ -6,7 +6,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,7 +15,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDate;
 import java.util.Map;
@@ -26,7 +24,6 @@
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class HentRollerControllerTest {
 
@@ -39,15 +36,15 @@ public class HentRollerControllerTest {
 
     @Test
     @DisplayName("GET rolle returnerer 404 hvis ikke eksisterer")
-    public void skalKasteNotFoundHvisRolleIkkeEksister() {
+    void skalKasteNotFoundHvisRolleIkkeEksister() {
         var response = restTemplate.getForEntity(API_V_1_ROLLER + "0",
                 String.class);
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
     }
 
     @Test
     @DisplayName("GET rolle returnerer 200 hvis ikke eksisterer")
-    public void skalHenteRolleutskriftFraDatabase() {
+    void skalHenteRolleutskriftFraDatabase() {
         var nyRolle = new HentRolle();
         nyRolle.setOrgnr(1);
         nyRolle.setJson("{\"orgnr\": 1}");
@@ -62,7 +59,7 @@ public void skalHenteRolleutskriftFraDatabase() {
 
     @Test
     @DisplayName("DELETE rolle skal slettes fra database")
-    public void skalSletteRolleutskrift() {
+    void skalSletteRolleutskrift() {
         var rolleSomSkalSlettes = new HentRolle();
         rolleSomSkalSlettes.setOrgnr(3);
         rolleSomSkalSlettes.setJson("{}");
@@ -81,7 +78,7 @@ public void skalSletteRolleutskrift() {
 
     @Test
     @DisplayName("POST rolle skal opprette ny databaseinnslag")
-    public void skalLagreRequestIDatabase() {
+    void skalLagreRequestIDatabase() {
         var to = new RsOrganisasjon();
         to.setOrgnr(4);
         to.setRegistreringsdato(LocalDate.now());
@@ -96,7 +93,7 @@ public void skalLagreRequestIDatabase() {
 
     @Test
     @DisplayName("POST rolle returnere bad request ved manglende feilt")
-    public void skalReturnereBadRequestVedValideringsFeil() {
+    void skalReturnereBadRequestVedValideringsFeil() {
         var to = new RsOrganisasjon();
 
         var response =

diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java
@@ -5,21 +5,18 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class KodeControllerTest {
 

diff --git a/...brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java b/...brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java
@@ -13,7 +13,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -24,7 +23,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDate;
 import java.util.Collections;
@@ -35,7 +33,6 @@
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(SpringExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class RolleoversiktControllerTest {
 

diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java
@@ -49,7 +49,7 @@ class BrregServiceTest {
     private BrregService brregService;
 
     @BeforeEach
-    public void onSetup() {
+    void onSetup() {
         rolleoversiktRepositoryMock.deleteAll();
         hentRolleRepositoryMock.deleteAll();
         brregService = new BrregService(rolleoversiktRepositoryMock, hentRolleRepositoryMock, objectMapper);

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }
 

diff --git a/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties b/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
     id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.3"
+    id 'io.spring.dependency-management' version "1.1.4"
     id "jacoco"
 }