diff --git a/Jenkinsfile b/Jenkinsfile index b9aa6c85133d05e1f5989ba90c52ab7be1200eec..eb71dcd5841ca8084d4d91e58ce0188110fbd7f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } environment { - BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/job/ozgcloud-common/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" + BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/ozgcloud-common/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" RELEASE_REGEX = /\d+.\d+.\d+/ SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/ } diff --git a/jenkins/jenkins-build-agent/Dockerfile b/jenkins/jenkins-build-agent/Dockerfile index 0daa5ad27a9d69a50dd126a64c80d82da46bd643..fa93c03807b3a7732fd45cdcf9fe23d4c68cda9c 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=v16.18.1 +ARG NODEJS_VERSION=v18.18.2 ARG KUBECTL_VERSION=v1.25.0 ARG HELM_VERSION=3 ARG HELM_UNITTEST_VERSION=0.2.11 diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md index 069b183ab038ab345f3ac36b61ca43ebde485e09..e30ca9e2519cac0238b5af4e74e553bff3a8af6e 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-16-18-1 . + docker build -t docker.ozg-sh.de/jenkins-build-agent:node-18-18-2 . # push - docker push docker.ozg-sh.de/jenkins-build-agent:node-16-18-1 + docker push docker.ozg-sh.de/jenkins-build-agent:node-18-18-2 \ No newline at end of file diff --git a/ozgcloud-common-license/pom.xml b/ozgcloud-common-license/pom.xml index d8b3ceeac4d24a60fa1a7731377d0ad15192847d..64d9236ef6a57ebed91f7dd79a24db054cb5f1b9 100644 --- a/ozgcloud-common-license/pom.xml +++ b/ozgcloud-common-license/pom.xml @@ -28,13 +28,13 @@ <modelVersion>4.0.0</modelVersion> - <groupId>de.itvsh.kop.common</groupId> - <artifactId>kop-common-license</artifactId> + <groupId>de.ozgcloud.common</groupId> + <artifactId>ozgcloud-common-license</artifactId> <version>1.6.0</version> <packaging>jar</packaging> - <name>Kop Common - OS license provider</name> - <description>A Maven project for providing the license to all KOP Projects</description> + <name>OzgCloud Common - OS license provider</name> + <description>A Maven project for providing the license to all OzgCloud Projects</description> <properties> <java.version>17</java.version> diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml index a8894c2cb7871900e3334d170506c35464cb24bb..cf228d733e1accf066b038ae45a2b36122cb125d 100644 --- a/ozgcloud-common-parent/pom.xml +++ b/ozgcloud-common-parent/pom.xml @@ -49,7 +49,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <ozgcloud-common.version>3.0.0-SNAPSHOT</ozgcloud-common.version> - <ozgcloud.license.version>1.3.0</ozgcloud.license.version> + <ozgcloud.license.version>1.6.0</ozgcloud.license.version> <mapstruct.version>1.5.5.Final</mapstruct.version> <spring-boot.version>3.1.6</spring-boot.version> diff --git a/pom.xml b/pom.xml index 802b922d27ef1360b99443d52821a338253db9de..0fd48ee185b70787a9ba7bb49e4591599325fa5e 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <ozgcloud-common.version>3.0.0-SNAPSHOT</ozgcloud-common.version> - <ozgcloud.license.version>1.3.0</ozgcloud.license.version> + <ozgcloud.license.version>1.6.0</ozgcloud.license.version> <java.version>17</java.version> <maven.compiler.target>17</maven.compiler.target>