Skip to content

Commit

Permalink
Merge pull request #101 from navikt/nye_versjoner
Browse files Browse the repository at this point in the history
Nye versjoner + slettet ubrukte avhengigheter
  • Loading branch information
igorweber authored Feb 2, 2023
2 parents 7cd58a1 + f7d537a commit 254ec6e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 49 deletions.
47 changes: 16 additions & 31 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,23 @@ 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.8.1"
val flywayVersion = "9.14.1"
val h2Version = "2.1.214"
val jacksonVersion = "2.14.0"
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 jacksonVersion = "2.14.2"
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 tokenValidationVersion = "2.1.6"
val tjenestespecVersion = "2610.9b6de22"
val tokenValidationVersion = "3.0.2"
val vaultJdbcVersion = "1.3.10"
val vaultVersion = "5.1.0"

Expand All @@ -42,16 +35,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

Expand All @@ -77,9 +70,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")
Expand All @@ -98,17 +88,12 @@ 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("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")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 0 additions & 17 deletions src/main/resources/xjb/bindings.xml

This file was deleted.

0 comments on commit 254ec6e

Please sign in to comment.