diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 981035fc..fd632da2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: build: strategy: matrix: - os: [ 'ubuntu-latest', 'macos-latest' ] + os: [ 'ubuntu-latest'] runs-on: ${{ matrix.os }} steps: diff --git a/klass-api/Dockerfile b/klass-api/Dockerfile index bf9f7e1d..b3441fe4 100644 --- a/klass-api/Dockerfile +++ b/klass-api/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jre +FROM gcr.io/distroless/java17 ENV TZ="Europe/Oslo" WORKDIR /app COPY target/*.war app.war diff --git a/klass-api/pom.xml b/klass-api/pom.xml index 9588dd2e..f1e74fea 100644 --- a/klass-api/pom.xml +++ b/klass-api/pom.xml @@ -137,7 +137,7 @@ io.zonky.test embedded-postgres - 2.1.0 + 2.1.1 test diff --git a/klass-api/src/test/java/no/ssb/klass/api/migration/MigrationTestUtils.java b/klass-api/src/test/java/no/ssb/klass/api/migration/MigrationTestUtils.java index f9e65d15..e1a26a54 100644 --- a/klass-api/src/test/java/no/ssb/klass/api/migration/MigrationTestUtils.java +++ b/klass-api/src/test/java/no/ssb/klass/api/migration/MigrationTestUtils.java @@ -359,6 +359,7 @@ else if (pathName.endsWith(HREF)) { } } + public static void validateFilteredClassifications(Response sourceResponse, Response targetResponse) { List> sourceList = sourceResponse.path(CLASSIFICATIONS); List> targetList = targetResponse.path(CLASSIFICATIONS); @@ -379,7 +380,7 @@ public static void validateFilteredClassifications(Response sourceResponse, Resp assertThat(sourceList.size()) .withFailMessage("Expected size to be <%d> but was <%d>", targetList.size(), sourceList.size()) - .isNotEqualTo(targetList.size()); + .isEqualTo(targetList.size()); } /** diff --git a/klass-shared/pom.xml b/klass-shared/pom.xml index d0e63092..795d5dae 100644 --- a/klass-shared/pom.xml +++ b/klass-shared/pom.xml @@ -30,10 +30,9 @@ 3.3.0 4.3.7.RELEASE 3.3 - 19.0 + 32.0.1-jre 4.4.1 - 3.12.0 - 2.0.0.AM27 + 3.19.0 1.6.0 2.5.0 2.2 @@ -104,18 +103,6 @@ postgresql ${postgresql.version} - - - org.apache.directory.server - apacheds-server-jndi - ${apacheds-server-jndi-version} - - - antlr - antlr - - - com.fasterxml.jackson.dataformat jackson-dataformat-csv diff --git a/pom.xml b/pom.xml index 383d71da..a8365d73 100644 --- a/pom.xml +++ b/pom.xml @@ -36,19 +36,18 @@ 2.17 8.5.2 2.4 - 19.0 + 32.0.1-jre 4.4.1 - 3.4 - 5.4.0 - 1.5.5 + 3.19.0 + 5.5.6 2.2.4 0.15.3 2.2 4.0.0 - 2.15.1 + 2.20.0 3.1.0 3.0.1 - 1.31 + 2.5 2.1.0 2.5.1 1.20.1 @@ -74,6 +73,11 @@ ${zonky.pg.version} test + + org.apache.commons + commons-lang3 + ${commons-lang3-version} +