Skip to content

Commit

Permalink
Oppgrader avhengigheter (#450)
Browse files Browse the repository at this point in the history
  • Loading branch information
ugur93 committed Jan 19, 2024
1 parent f0d311c commit 608b929
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy_feature.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
- '**'
- '!main'
- '!dependabot/**'
-
jobs:
build-deploy:
name: "Build and deploy to feature"
Expand Down
18 changes: 10 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand All @@ -23,26 +23,26 @@

<!-- language -->
<java.version>21</java.version>
<kotlin.version>1.9.20</kotlin.version>
<kotlin.version>1.9.22</kotlin.version>

<!-- dependent versions other than from spring-boot -->
<apache-avro-version>1.11.3</apache-avro-version>
<bidrag-commons.version>20231103132440_edabbf8</bidrag-commons.version>
<bidrag-commons-test.version>1.20230503150725_3c2c77b</bidrag-commons-test.version>
<bidrag-transport.version>20231113102624_1040a39</bidrag-transport.version>
<commons-codec.version>1.16.0</commons-codec.version>
<graphq-dgs-client.version>6.0.5</graphq-dgs-client.version>
<graphq-dgs-client.version>8.2.1</graphq-dgs-client.version>
<joark-hendelse.version>67a9be4476b63b7247cfacfaf821ab656bd2a952</joark-hendelse.version>
<kafka-avro-serializer.version>7.3.3</kafka-avro-serializer.version>
<logback-encoder.version>7.3</logback-encoder.version>
<kafka-avro-serializer.version>7.5.3</kafka-avro-serializer.version>
<logback-encoder.version>7.4</logback-encoder.version>
<nimbus-jose-jwt.version>9.15.2</nimbus-jose-jwt.version>
<springdoc-openapi-ui.version>2.1.0</springdoc-openapi-ui.version>
<springframework-cloud.version>4.0.4</springframework-cloud.version>
<squareup.version>4.11.0</squareup.version>
<squareup.version>4.12.0</squareup.version>
<token-support.version>3.2.0</token-support.version>

<!-- build -->
<build-helper-maven.version>3.3.0</build-helper-maven.version>
<build-helper-maven.version>3.5.0</build-helper-maven.version>
<maven.compiler.version>3.8.0</maven.compiler.version>
<maven.surefire.version>2.22.2</maven.surefire.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
Expand Down Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-datetime-jvm</artifactId>
<version>0.4.0</version>
<version>0.5.0</version>
</dependency>
<!-- joark hendelser med avro avhengighet -->
<dependency>
Expand Down Expand Up @@ -216,11 +216,13 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.4.12</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.12</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import com.netflix.graphql.dgs.client.GraphQLError
import com.netflix.graphql.dgs.client.GraphQLResponse
import com.netflix.graphql.dgs.client.HttpResponse
import no.nav.bidrag.commons.web.HttpHeaderRestTemplate
import no.nav.bidrag.dokument.arkiv.consumer.SafConsumer.NotFoundException
import no.nav.bidrag.dokument.arkiv.dto.DistribusjonsInfo
import no.nav.bidrag.dokument.arkiv.dto.Journalpost
import no.nav.bidrag.dokument.arkiv.dto.TilknyttetJournalpost
Expand Down Expand Up @@ -71,7 +70,7 @@ open class SafConsumer(private val restTemplate: RestTemplate) {
val queryString = query.getQuery()
val graphQLClient = CustomGraphQLClient("") { _: String, _: Map<String, List<String>>, body: String ->
val exchange = restTemplate.exchange("/graphql", HttpMethod.POST, HttpEntity(body), String::class.java)
HttpResponse(exchange.statusCodeValue, exchange.body)
HttpResponse(exchange.statusCode.value(), exchange.body)
}
val response = graphQLClient.executeQuery(queryString, query.getVariables())
if (response.hasErrors()) {
Expand Down

0 comments on commit 608b929

Please sign in to comment.