Skip to content

Commit

Permalink
oppgraderer spring boot, tokensupport og fellesbiblioteker (#672)
Browse files Browse the repository at this point in the history
* oppgraderer spring boot, tokensupport og fellesbiblioteker

* tester å kompilere med parameters satt

* oppgraderer shedlock

* legger til java-parameters på compileren

* rydder i dependencies og fjerner java-parameters igjen

* endrer config for compiler-plugin

* legger til dependency

* øker tid for liveness og readyness

* skrur initial delay litt ned igjen
  • Loading branch information
tiafiring authored Dec 11, 2023
1 parent 5ca44ba commit 21793f6
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .nais/nais-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ spec:
path: /internal/prometheus
readiness:
path: /internal/health/readiness
initialDelay: 20
initialDelay: 40
liveness:
path: /internal/health/liveness
initialDelay: 20
initialDelay: 40
replicas:
min: 1
max: 2
Expand Down
4 changes: 2 additions & 2 deletions .nais/nais-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ spec:
path: /internal/prometheus
readiness:
path: /internal/health/readiness
initialDelay: 20
initialDelay: 40
liveness:
path: /internal/health/liveness
initialDelay: 20
initialDelay: 40
replicas:
min: 2
max: 3
Expand Down
4 changes: 2 additions & 2 deletions data-publisher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>no.nav.amt-tiltak</groupId>
<artifactId>core</artifactId>
<groupId>no.nav.common</groupId>
<artifactId>kafka</artifactId>
</dependency>
<dependency>
<groupId>no.nav.amt-tiltak</groupId>
Expand Down
4 changes: 0 additions & 4 deletions kafka/ansatt-ingestor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,5 @@
<groupId>no.nav.amt-tiltak</groupId>
<artifactId>amt-arrangor-client</artifactId>
</dependency>
<dependency>
<groupId>no.nav.amt-tiltak</groupId>
<artifactId>core</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 0 additions & 4 deletions kafka/arrangor-ingestor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,5 @@
<groupId>no.nav.amt-tiltak</groupId>
<artifactId>amt-arrangor-client</artifactId>
</dependency>
<dependency>
<groupId>no.nav.amt-tiltak</groupId>
<artifactId>core</artifactId>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import no.nav.common.kafka.util.KafkaPropertiesBuilder
import no.nav.common.kafka.util.KafkaPropertiesPreset
import org.apache.kafka.common.serialization.ByteArrayDeserializer
import org.apache.kafka.common.serialization.ByteArraySerializer
import org.apache.kafka.common.serialization.Serializer
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Profile
Expand Down
10 changes: 4 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<parent>
<artifactId>spring-boot-starter-parent</artifactId>
<groupId>org.springframework.boot</groupId>
<version>3.1.5</version>
<version>3.2.0</version>
</parent>

<properties>
Expand All @@ -53,13 +53,11 @@
<mockk.version>1.13.8</mockk.version>
<kotest.version>5.6.1</kotest.version>
<okhttp.version>4.12.0</okhttp.version>
<token-support.version>3.1.9</token-support.version>
<token-support.version>3.2.0</token-support.version>
<mock-oauth2-server.version>2.0.1</mock-oauth2-server.version>
<common.version>3.2023.10.18_13.28-58db82ecb1a5</common.version>
<common.version>3.2023.11.16_08.57-4fe62b8f9658</common.version>
<logstash.version>7.4</logstash.version>
<unleash.version>9.2.0</unleash.version>
<!-- overstyrer sårbar dependency-->
<snakeyaml.version>2.2</snakeyaml.version>
</properties>

<repositories>
Expand Down Expand Up @@ -356,7 +354,7 @@
<dependency>
<groupId>no.nav.poao-tilgang</groupId>
<artifactId>client</artifactId>
<version>2023.11.08_09.13-468338e2e7f8</version>
<version>2023.11.29_08.41-860e116fe2a2</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 21793f6

Please sign in to comment.