diff --git a/jenkins/jenkins-build-agent/Dockerfile b/jenkins/jenkins-build-agent/Dockerfile index 330d30ac2abefb8a56543cf90dba3db5994eb7c5..0daa5ad27a9d69a50dd126a64c80d82da46bd643 100644 --- a/jenkins/jenkins-build-agent/Dockerfile +++ b/jenkins/jenkins-build-agent/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 ARG MAVEN_VERSION=3.8.8 ARG OPENJDK_VERSION=17 -ARG NODEJS_VERSION=v14.15.1 +ARG NODEJS_VERSION=v16.18.1 ARG KUBECTL_VERSION=v1.25.0 ARG HELM_VERSION=3 ARG HELM_UNITTEST_VERSION=0.2.11 @@ -32,7 +32,8 @@ RUN apt update \ libxtst6 \ xauth \ xvfb \ - unzip + unzip \ + jq RUN mkdir -p /usr/share/maven \ && wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz -O /tmp/maven.tar.gz \ diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md index 8dff04761b2c717608b1ec4b316253334a35faa9..069b183ab038ab345f3ac36b61ca43ebde485e09 100644 --- a/jenkins/jenkins-build-agent/readme.md +++ b/jenkins/jenkins-build-agent/readme.md @@ -1,9 +1,9 @@ # Image bauen - docker build -t docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 . + docker build -t docker.ozg-sh.de/jenkins-build-agent:node-16-18-1 . # push - docker push docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 + docker push docker.ozg-sh.de/jenkins-build-agent:node-16-18-1 \ No newline at end of file diff --git a/kop-common-dependencies/pom.xml b/kop-common-dependencies/pom.xml index cd6898f1dd7f0b4feeab4167ed9253a21f4bf007..599adb31c1345ce11b160b1722567e196ab4432a 100644 --- a/kop-common-dependencies/pom.xml +++ b/kop-common-dependencies/pom.xml @@ -57,8 +57,8 @@ <protobuf.version>3.21.12</protobuf.version> <protoc-gen.version>1.51.1</protoc-gen.version> - <mapstruct.version>1.5.4.Final</mapstruct.version> - <commons-io.version>2.11.0</commons-io.version> + <mapstruct.version>1.5.5.Final</mapstruct.version> + <commons-io.version>2.12.0</commons-io.version> <commons-beanutils.version>1.9.4</commons-beanutils.version> <commons-lang3.version>3.12.0</commons-lang3.version> <commons-collections.version>4.4</commons-collections.version> diff --git a/kop-common-parent/pom.xml b/kop-common-parent/pom.xml index 9f111b76d597532dab3090c5e20b05ca273e664b..72b4fbaf131df0d410f2844cf1819fcadd96764e 100644 --- a/kop-common-parent/pom.xml +++ b/kop-common-parent/pom.xml @@ -51,12 +51,12 @@ <kop-common.version>2.2.0-SNAPSHOT</kop-common.version> <kop.license.version>1.6.0</kop.license.version> - <mapstruct.version>1.5.4.Final</mapstruct.version> + <mapstruct.version>1.5.5.Final</mapstruct.version> <spring-boot.version>3.1.0</spring-boot.version> <!-- plugins --> - <maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version> - <maven-failsafe-plugin.version>3.1.0</maven-failsafe-plugin.version> + <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version> <jacoco.plugin.version>0.8.10</jacoco.plugin.version> <sonarqube.version>3.9.1.2184</sonarqube.version>