Skip to content
Snippets Groups Projects
Commit a24b762a authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into Version-2

# Conflicts:
#	kop-common-parent/pom.xml
parents 83cf293b 02b7f015
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ FROM ubuntu:22.04 ...@@ -2,7 +2,7 @@ FROM ubuntu:22.04
ARG MAVEN_VERSION=3.8.8 ARG MAVEN_VERSION=3.8.8
ARG OPENJDK_VERSION=17 ARG OPENJDK_VERSION=17
ARG NODEJS_VERSION=v14.15.1 ARG NODEJS_VERSION=v16.18.1
ARG KUBECTL_VERSION=v1.25.0 ARG KUBECTL_VERSION=v1.25.0
ARG HELM_VERSION=3 ARG HELM_VERSION=3
ARG HELM_UNITTEST_VERSION=0.2.11 ARG HELM_UNITTEST_VERSION=0.2.11
...@@ -32,7 +32,8 @@ RUN apt update \ ...@@ -32,7 +32,8 @@ RUN apt update \
libxtst6 \ libxtst6 \
xauth \ xauth \
xvfb \ xvfb \
unzip unzip \
jq
RUN mkdir -p /usr/share/maven \ 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 \ && wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz -O /tmp/maven.tar.gz \
......
# Image bauen # 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 # 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
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
<protobuf.version>3.21.12</protobuf.version> <protobuf.version>3.21.12</protobuf.version>
<protoc-gen.version>1.51.1</protoc-gen.version> <protoc-gen.version>1.51.1</protoc-gen.version>
<mapstruct.version>1.5.4.Final</mapstruct.version> <mapstruct.version>1.5.5.Final</mapstruct.version>
<commons-io.version>2.11.0</commons-io.version> <commons-io.version>2.12.0</commons-io.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version> <commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-lang3.version>3.12.0</commons-lang3.version> <commons-lang3.version>3.12.0</commons-lang3.version>
<commons-collections.version>4.4</commons-collections.version> <commons-collections.version>4.4</commons-collections.version>
......
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
<kop-common.version>2.2.0-SNAPSHOT</kop-common.version> <kop-common.version>2.2.0-SNAPSHOT</kop-common.version>
<kop.license.version>1.6.0</kop.license.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> <spring-boot.version>3.1.0</spring-boot.version>
<!-- plugins --> <!-- plugins -->
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version> <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.1.0</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
<jacoco.plugin.version>0.8.10</jacoco.plugin.version> <jacoco.plugin.version>0.8.10</jacoco.plugin.version>
<sonarqube.version>3.9.1.2184</sonarqube.version> <sonarqube.version>3.9.1.2184</sonarqube.version>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment