Skip to content

Remove remaining vulnerabilities #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tilen1976 merged 15 commits into from
Oct 22, 2025
Merged

Remove remaining vulnerabilities #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e40707a
update snake yaml
tilen1976 Oct 21, 2025
592f18c
not deploy on every push
tilen1976 Oct 21, 2025
24c7711
update apache commons lang
tilen1976 Oct 21, 2025
07a4a82
update google guava
tilen1976 Oct 21, 2025
7a5a19a
update google guava for both root and shared
tilen1976 Oct 22, 2025
ce6642b
update commons-lang3
tilen1976 Oct 22, 2025
fafb234
changes to sections has been made and we will now assume result shoul…
tilen1976 Oct 22, 2025
a9512a8
update zonky from 2.1.0 to 2.1.1 to remove transitive vulnerability
tilen1976 Oct 22, 2025
7993a30
update rest-assured from 5.4.0 to 5.5.6 and commons-io from 2.15.1 to…
tilen1976 Oct 22, 2025
8be55d4
remove apacheds-server-jndi-version - unused dependency
tilen1976 Oct 22, 2025
eb74785
use google distroless image
tilen1976 Oct 22, 2025
36a1d03
exclude duplicated transitive dependencies with vulnerabilities
tilen1976 Oct 22, 2025
94c0f51
re add exclusions - testcontainers failed
tilen1976 Oct 22, 2025
64bc172
try to run just on ubuntu - dont trigger build new instance
tilen1976 Oct 22, 2025
1f33341
use dependency management to ensure safe version of commons-lang3
tilen1976 Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
strategy:
matrix:
os: [ 'ubuntu-latest', 'macos-latest' ]
os: [ 'ubuntu-latest']
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion klass-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion klass-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<dependency>
<groupId>io.zonky.test</groupId>
<artifactId>embedded-postgres</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion klass-api/src/test/java/no/ssb/klass/api/migration/MigrationTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ else if (pathName.endsWith(HREF)) {
}
}


public static void validateFilteredClassifications(Response sourceResponse, Response targetResponse) {
List<Map<String, Object>> sourceList = sourceResponse.path(CLASSIFICATIONS);
List<Map<String, Object>> targetList = targetResponse.path(CLASSIFICATIONS);
Expand All @@ -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());
}

/**
Expand Down
17 changes: 2 additions & 15 deletions klass-shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@
<checkstyle-version>3.3.0</checkstyle-version>
<spring.version>4.3.7.RELEASE</spring.version>
<objenesis-version>3.3</objenesis-version>
<guava-version>19.0</guava-version>
<guava-version>32.0.1-jre</guava-version>
<woodstox-version>4.4.1</woodstox-version>
<commons-lang3-version>3.12.0</commons-lang3-version>
<apacheds-server-jndi-version>2.0.0.AM27</apacheds-server-jndi-version>
<commons-lang3-version>3.19.0</commons-lang3-version>
<asciidoctor-version>1.6.0</asciidoctor-version>
<maven-jaxb2-plugin-version>2.5.0</maven-jaxb2-plugin-version>
<tomcat7-maven-plugin-version>2.2</tomcat7-maven-plugin-version>
Expand Down Expand Up @@ -104,18 +103,6 @@
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<!--java based ldap server for testing-->
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
<version>${apacheds-server-jndi-version}</version>
<exclusions>
<exclusion>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
Expand Down
16 changes: 10 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,18 @@
<checkstyle-version>2.17</checkstyle-version>
<solr-version>8.5.2</solr-version>
<objenesis-version>2.4</objenesis-version>
<guava-version>19.0</guava-version>
<guava-version>32.0.1-jre</guava-version>
<woodstox-version>4.4.1</woodstox-version>
<commons-lang3-version>3.4</commons-lang3-version>
<rest-assured-version>5.4.0</rest-assured-version>
<apacheds-server-jndi-version>1.5.5</apacheds-server-jndi-version>
<commons-lang3-version>3.19.0</commons-lang3-version>
<rest-assured-version>5.5.6</rest-assured-version>
<asciidoctor-version>2.2.4</asciidoctor-version>
<maven-jaxb2-plugin-version>0.15.3</maven-jaxb2-plugin-version>
<tomcat7-maven-plugin-version>2.2</tomcat7-maven-plugin-version>
<jaxb-api-version>4.0.0</jaxb-api-version>
<commons-io-version>2.15.1</commons-io-version>
<commons-io-version>2.20.0</commons-io-version>
<jakarta-rs-api-version>3.1.0</jakarta-rs-api-version>
<spring-restdocs-version>3.0.1</spring-restdocs-version>
<snakeyaml.version>1.31</snakeyaml.version>
<snakeyaml.version>2.5</snakeyaml.version>
<zonky.version>2.1.0</zonky.version>
<zonky.pg.version>2.5.1</zonky.pg.version>
<testcontainers.version>1.20.1</testcontainers.version>
Expand All @@ -74,6 +73,11 @@
<version>${zonky.pg.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3-version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down