From b82fb27ea8c6961ed609d899095e6fd50da4c4cc Mon Sep 17 00:00:00 2001 From: Igor Shuliakov Date: Thu, 2 Feb 2023 11:46:59 +0100 Subject: [PATCH 1/6] Nye versjoner --- build.gradle.kts | 30 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4200414d..aaa54a9c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,28 +3,28 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransf import org.gradle.api.tasks.testing.logging.TestExceptionFormat val cxfVersion = "3.5.4" -val flywayVersion = "9.8.1" +val flywayVersion = "9.14.1" val h2Version = "2.1.214" -val jacksonVersion = "2.14.0" +val jacksonVersion = "2.14.2" val javaxActivationVersion = "1.1.1" val javaxAnnotationApiVersion = "1.3.2" val jaxbApiVersion = "2.4.0-b180830.0359" val jaxbRuntimeVersion = "4.0.1" val jaxwsApiVersion = "2.3.1" val jaxwsToolsVersion = "2.3.5" // Senere versjoner har ikke javax.jws.WebService -val kotlinLoggerVersion = "3.0.4" -val ktorVersion = "2.1.2" -val logbackVersion = "1.4.4" +val kotlinLoggerVersion = "3.0.5" +val ktorVersion = "2.2.3" +val logbackVersion = "1.4.5" val logstashVersion = "7.2" -val micrometerVersion = "1.10.1" -val mockOauthVersion = "0.5.6" -val mockkVersion = "1.13.2" +val micrometerVersion = "1.10.3" +val mockOauthVersion = "0.5.7" +val mockkVersion = "1.13.4" val navCommonCacheVersion = "2.2020.03.18_12.19-ac82e907ebc9" -val navCommonVersion = "2.2022.11.16_15.18-421ec713e2a0" +val navCommonVersion = "2.2023.01.10_13.49-81ddc732df3a" val ojdbc8Version = "19.3.0.0" -val postgresVersion = "42.5.0" +val postgresVersion = "42.5.2" val swaggerVersion = "4.15.5" // Husk å endre versjonen også i SwaggerUi.kt -val tjenestespecVersion = "2606.1f6354e" +val tjenestespecVersion = "2610.9b6de22" val tokenValidationVersion = "2.1.6" val vaultJdbcVersion = "1.3.10" val vaultVersion = "5.1.0" @@ -42,16 +42,16 @@ plugins { id("com.github.ManifestClasspath") version "0.1.0-RELEASE" - id("org.jetbrains.kotlin.jvm") version "1.7.10" - id("org.jetbrains.kotlin.plugin.allopen") version "1.7.10" + id("org.jetbrains.kotlin.jvm") version "1.8.0" + id("org.jetbrains.kotlin.plugin.allopen") version "1.8.0" id("com.github.johnrengelman.shadow") version "7.1.2" - id("org.flywaydb.flyway") version ("9.8.1") + id("org.flywaydb.flyway") version ("9.14.1") id("org.sonarqube") version "3.5.0.2730" - id("com.github.ben-manes.versions") version "0.44.0" + id("com.github.ben-manes.versions") version "0.45.0" jacoco diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0fdc607e..48696d6a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip From be665931771d1a973972d8a34c6d497b4c92253e Mon Sep 17 00:00:00 2001 From: Igor Shuliakov Date: Thu, 2 Feb 2023 11:52:05 +0100 Subject: [PATCH 2/6] Nye versjoner --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index aaa54a9c..416144c5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ val ojdbc8Version = "19.3.0.0" val postgresVersion = "42.5.2" val swaggerVersion = "4.15.5" // Husk å endre versjonen også i SwaggerUi.kt val tjenestespecVersion = "2610.9b6de22" -val tokenValidationVersion = "2.1.6" +val tokenValidationVersion = "3.0.2" val vaultJdbcVersion = "1.3.10" val vaultVersion = "5.1.0" From 3f1500c0afb53d8e7e4748dfc8b5d8bdc779a80b Mon Sep 17 00:00:00 2001 From: Igor Shuliakov Date: Thu, 2 Feb 2023 12:31:24 +0100 Subject: [PATCH 3/6] Uten JaxB --- build.gradle.kts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 416144c5..bcfc8e43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,10 +8,6 @@ val h2Version = "2.1.214" val jacksonVersion = "2.14.2" val javaxActivationVersion = "1.1.1" val javaxAnnotationApiVersion = "1.3.2" -val jaxbApiVersion = "2.4.0-b180830.0359" -val jaxbRuntimeVersion = "4.0.1" -val jaxwsApiVersion = "2.3.1" -val jaxwsToolsVersion = "2.3.5" // Senere versjoner har ikke javax.jws.WebService val kotlinLoggerVersion = "3.0.5" val ktorVersion = "2.2.3" val logbackVersion = "1.4.5" @@ -77,9 +73,6 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") implementation("com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion") implementation("com.oracle.ojdbc:ojdbc8:$ojdbc8Version") - implementation("com.sun.xml.ws:jaxws-tools:$jaxwsToolsVersion") { - exclude(group = "com.sun.xml.ws", module = "policy") - } implementation("io.github.microutils:kotlin-logging:$kotlinLoggerVersion") implementation("io.ktor:ktor-client-apache:$ktorVersion") implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") @@ -100,15 +93,12 @@ dependencies { implementation("io.micrometer:micrometer-registry-prometheus:$micrometerVersion") implementation("javax.activation:activation:$javaxActivationVersion") implementation("javax.annotation:javax.annotation-api:$javaxAnnotationApiVersion") - implementation("javax.xml.bind:jaxb-api:$jaxbApiVersion") - implementation("javax.xml.ws:jaxws-api:$jaxwsApiVersion") implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") implementation("no.nav.common:cache:$navCommonCacheVersion") implementation("no.nav.common:cxf:$navCommonVersion") implementation("no.nav.security:token-validation-ktor-v2:$tokenValidationVersion") implementation("com.github.navikt.tjenestespesifikasjoner:arena-sakogaktivitet_v1:$tjenestespecVersion") implementation("org.flywaydb:flyway-core:$flywayVersion") - implementation("org.glassfish.jaxb:jaxb-runtime:$jaxbRuntimeVersion") implementation("org.postgresql:postgresql:$postgresVersion") implementation("org.webjars:swagger-ui:$swaggerVersion") implementation("no.nav:vault-jdbc:$vaultJdbcVersion") From 2d922000587756102375b44cfeb9e38474eac125 Mon Sep 17 00:00:00 2001 From: Igor Shuliakov Date: Thu, 2 Feb 2023 12:45:17 +0100 Subject: [PATCH 4/6] Slette bindings.xml --- src/main/resources/xjb/bindings.xml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/main/resources/xjb/bindings.xml diff --git a/src/main/resources/xjb/bindings.xml b/src/main/resources/xjb/bindings.xml deleted file mode 100644 index 9f346023..00000000 --- a/src/main/resources/xjb/bindings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - false - \ No newline at end of file From e6ebf22464300cdbe9220fb786406b921fb3823e Mon Sep 17 00:00:00 2001 From: Igor Shuliakov Date: Thu, 2 Feb 2023 12:58:20 +0100 Subject: [PATCH 5/6] Revert "Slette bindings.xml" This reverts commit 2d922000587756102375b44cfeb9e38474eac125. --- src/main/resources/xjb/bindings.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/main/resources/xjb/bindings.xml diff --git a/src/main/resources/xjb/bindings.xml b/src/main/resources/xjb/bindings.xml new file mode 100644 index 00000000..9f346023 --- /dev/null +++ b/src/main/resources/xjb/bindings.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + false + \ No newline at end of file From f7d537a89b04dddebffa1f71f8778163f764faf0 Mon Sep 17 00:00:00 2001 From: Igor Shuliakov Date: Thu, 2 Feb 2023 13:12:45 +0100 Subject: [PATCH 6/6] Slettet binding.xml og fjernet noen avhengigheter --- build.gradle.kts | 5 ----- src/main/resources/xjb/bindings.xml | 17 ----------------- 2 files changed, 22 deletions(-) delete mode 100644 src/main/resources/xjb/bindings.xml diff --git a/build.gradle.kts b/build.gradle.kts index bcfc8e43..69ca957c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,12 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer import org.gradle.api.tasks.testing.logging.TestExceptionFormat -val cxfVersion = "3.5.4" val flywayVersion = "9.14.1" val h2Version = "2.1.214" val jacksonVersion = "2.14.2" -val javaxActivationVersion = "1.1.1" -val javaxAnnotationApiVersion = "1.3.2" val kotlinLoggerVersion = "3.0.5" val ktorVersion = "2.2.3" val logbackVersion = "1.4.5" @@ -91,8 +88,6 @@ dependencies { implementation("io.ktor:ktor-server-metrics-micrometer:$ktorVersion") implementation("io.ktor:ktor-server-netty:$ktorVersion") implementation("io.micrometer:micrometer-registry-prometheus:$micrometerVersion") - implementation("javax.activation:activation:$javaxActivationVersion") - implementation("javax.annotation:javax.annotation-api:$javaxAnnotationApiVersion") implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") implementation("no.nav.common:cache:$navCommonCacheVersion") implementation("no.nav.common:cxf:$navCommonVersion") diff --git a/src/main/resources/xjb/bindings.xml b/src/main/resources/xjb/bindings.xml deleted file mode 100644 index 9f346023..00000000 --- a/src/main/resources/xjb/bindings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - false - \ No newline at end of file