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

Merge remote-tracking branch 'origin/master' into OZG-4589_renaming

# Conflicts:
#	Jenkinsfile
#	ozgcloud-common-dependencies/pom.xml
#	ozgcloud-common-lib/pom.xml
#	ozgcloud-common-license/pom.xml
#	ozgcloud-common-parent/pom.xml
#	ozgcloud-common-pdf/pom.xml
#	ozgcloud-common-test/pom.xml
#	pom.xml
parents 88851f64 9793d626
No related branches found
No related tags found
No related merge requests found
......@@ -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/
}
......
......@@ -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
......
# 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
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment