Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Oppdatering spring og diverse backend dependencies #3591

Merged
merged 1 commit into from
Aug 27, 2024
Merged

Oppdatering spring og diverse backend dependencies #3591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/app-tilgang-analyse-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies {
implementation 'io.r2dbc:r2dbc-h2'
implementation 'org.postgresql:r2dbc-postgresql'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'

implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
Expand Down
1 change: 1 addition & 0 deletions apps/brreg-stub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ dependencies {
implementation 'com.zaxxer:HikariCP'

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'com.h2database:h2'

implementation 'wsdl4j:wsdl4j'
Expand Down
1 change: 1 addition & 0 deletions apps/bruker-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dependencies {
implementation 'io.r2dbc:r2dbc-h2'
implementation 'org.postgresql:r2dbc-postgresql'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'

runtimeOnly 'org.postgresql:postgresql'
runtimeOnly 'com.h2database:h2'
Expand Down
2 changes: 2 additions & 0 deletions apps/dolly-backend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ dependencies {

implementation 'org.postgresql:postgresql'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'

implementation "ma.glasnost.orika:orika-core:$versions.orika"
implementation 'org.codehaus.jettison:jettison:1.5.4'
implementation "org.apache.poi:poi:$versions.apachePoi"
Expand Down
3 changes: 2 additions & 1 deletion apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;

import java.util.Collection;
import java.util.List;

public interface BestillingElasticRepository extends ElasticsearchRepository<ElasticBestilling, Long> {

List<ElasticBestilling> getAllByIdenterIn(List<String> ident);
List<ElasticBestilling> getAllByIdenterIn(Collection<String> identer);
}
1 change: 1 addition & 0 deletions apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/OpenSearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;

import static java.util.Objects.nonNull;
Expand Down
1 change: 1 addition & 0 deletions apps/generer-organisasjon-populasjon-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
implementation "io.confluent:kafka-avro-serializer:$versions.avro"
implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'com.h2database:h2'
implementation 'com.zaxxer:HikariCP'

Expand Down
1 change: 1 addition & 0 deletions apps/inntektsmelding-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies {
implementation 'org.apache.commons:commons-io:1.3.2'

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'com.h2database:h2'
implementation 'org.postgresql:postgresql'
}
1 change: 1 addition & 0 deletions apps/organisasjon-bestilling-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {
implementation 'com.h2database:h2'
implementation 'com.zaxxer:HikariCP'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'org.postgresql:postgresql'

implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
Expand Down
1 change: 1 addition & 0 deletions apps/organisasjon-faste-data-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies {
implementation "io.confluent:kafka-avro-serializer:$versions.avro"

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'com.zaxxer:HikariCP'
implementation 'com.h2database:h2'
implementation 'org.postgresql:postgresql'
Expand Down
1 change: 1 addition & 0 deletions apps/organisasjon-forvalter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
implementation "org.apache.avro:avro:$versions.apacheAvro"

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'org.postgresql:postgresql'

implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
Expand Down
1 change: 1 addition & 0 deletions apps/organisasjon-tilgang-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependencies {
implementation 'io.r2dbc:r2dbc-h2'
implementation 'org.postgresql:r2dbc-postgresql'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'

implementation "ma.glasnost.orika:orika-core:$versions.orika"

Expand Down
1 change: 1 addition & 0 deletions apps/orgnummer-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies {

implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'com.h2database:h2'
implementation 'com.zaxxer:HikariCP'

Expand Down
1 change: 1 addition & 0 deletions apps/pdl-forvalter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies {

implementation 'org.postgresql:postgresql'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'

implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"

Expand Down
2 changes: 2 additions & 0 deletions apps/person-faste-data-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ dependencies {
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'

implementation 'com.h2database:h2'
implementation 'com.zaxxer:HikariCP'
implementation 'org.postgresql:postgresql'
Expand Down
1 change: 1 addition & 0 deletions apps/testnav-ident-pool/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies {
implementation 'com.h2database:h2'

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'org.postgresql:postgresql'
implementation "ma.glasnost.orika:orika-core:$versions.orika"

Expand Down
1 change: 1 addition & 0 deletions apps/testnorge-statisk-data-forvalter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies {
implementation 'com.zaxxer:HikariCP'

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'

implementation 'com.h2database:h2'

Expand Down
1 change: 1 addition & 0 deletions apps/udi-stub/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dependencies {

implementation 'org.postgresql:postgresql'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'com.zaxxer:HikariCP'

implementation "ma.glasnost.orika:orika-core:$versions.orika"
Expand Down
1 change: 1 addition & 0 deletions apps/varslinger-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies {
implementation 'com.h2database:h2'
implementation 'com.zaxxer:HikariCP'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'org.postgresql:postgresql'

testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
Expand Down
1 change: 1 addition & 0 deletions examples/reactive-rest-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies {
implementation 'io.r2dbc:r2dbc-h2'
implementation 'org.postgresql:r2dbc-postgresql'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'

runtimeOnly 'org.postgresql:postgresql'
runtimeOnly 'com.h2database:h2'
Expand Down
1 change: 1 addition & 0 deletions libs/database/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ dependencies {
implementation 'org.springframework.cloud:spring-cloud-vault-config-databases'
implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
}
18 changes: 9 additions & 9 deletions plugins/java/src/main/groovy/dolly-versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ class DollyVersionCatalog {
String navAltinnInntektsmelding = "1.2019.08.16-13.46-35cbdfd492d4"
String navFellesregister = "2020.08.27-09.53-183ead3d81eb"

String springBoot = "3.2.1"
String springCloud = "2023.0.1"
String springSession = "2021.2.3"
String springBoot = "3.3.2"
String springSession = "3.3.1"
String springCloud = "2023.0.3"

String apacheAvro = "1.11.3"
String apacheKafka = "3.7.0"
String apachePoi = "5.2.5"
String apachePoi = "5.3.0"
String assertj = "3.26.0"
String avro = "7.6.1"
String guava = "33.2.0-jre"
String jackson = "2.17.1"
String jackson = "2.17.2"
String jakartaActivation = "2.1.3"
String jakartaValidation = "3.1.0"
String jakartaXmlBindApi = "4.0.2"
Expand All @@ -24,13 +24,13 @@ class DollyVersionCatalog {
String jaxws = "4.0.2"
String jweaver = "1.9.22"
String jwt = "4.4.0"
String logback = "7.4"
String logback = "8.0"
String mq = "3.2.3"
String okhttp = "4.10.0"
String opensearch = "1.4.0"
String opensearch = "1.5.1"
String orika = "1.5.4"
String reactorSpring = "1.0.1.RELEASE"
String reactorTest = "3.6.5"
String reactorTest = "3.6.8"
String springdoc = "2.5.0"
String swagger = "2.2.21"
String swagger = "2.2.22"
}