Merge pull request #1619 from gentics/hotfix-1.10.x-nexus

Hotfix 1.10.x nexus
gentics · Sep 9, 2024 · 42c2870 · 42c2870
2 parents 5e1c59b + c9b932c
commit 42c2870
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 64 deletions.
diff --git a/.jenkins/Dockerfile.nexus b/.jenkins/Dockerfile.nexus
@@ -0,0 +1,6 @@
+FROM docker.gentics.com/jenkinsbuilds/mesh-slave:java11-1.1
+USER root
+
+ADD ./files/settings.xml /opt/maven/conf/settings.xml
+
+USER jenkins
diff --git a/.jenkins/build-deploy-test-env.sh b/.jenkins/build-deploy-test-env.sh
@@ -6,5 +6,5 @@ else
   TAG=$1
 fi
 
-docker build -t gtx-docker-jenkinsbuilds.docker.apa-it.at/gentics/jenkinsbuilds/mesh-slave:$TAG .
-docker push gtx-docker-jenkinsbuilds.docker.apa-it.at/gentics/jenkinsbuilds/mesh-slave:$TAG
+docker build -t push.docker.gentics.com/docker-jenkinsbuilds/jenkinsbuilds/mesh-slave:$TAG .
+docker push push.docker.gentics.com/docker-jenkinsbuilds/jenkinsbuilds/mesh-slave:$TAG
diff --git a/.jenkins/build-env-nexus.sh b/.jenkins/build-env-nexus.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# This will build the build environment image for nexus by extending the old build environment image and copying the new settings.xml file into it
+
+docker build -f Dockerfile.nexus -t push.docker.gentics.com/docker-jenkinsbuilds/jenkinsbuilds/mesh-slave:java11-nexus .
+docker push push.docker.gentics.com/docker-jenkinsbuilds/jenkinsbuilds/mesh-slave:java11-nexus
diff --git a/.jenkins/files/settings.xml b/.jenkins/files/settings.xml
@@ -1,46 +1,30 @@
 <settings>
 	<mirrors>
 		<mirror>
-			<id>lan.mirror</id>
-			<name>Gentics LAN Mirror Repository</name>
-			<url>https://repo.apa-it.at/artifactory/gtx-maven-mirror/</url>
-			<mirrorOf>central,maven2,maven2-repository,oss.sonatype.org,jboss-repository,maven-repository.dev.java.net,repo.jenkins-ci.org</mirrorOf>
-		</mirror>
-		<mirror>
-			<id>lan.internal</id>
-			<name>Gentics LAN Mirror Repository</name>
-			<url>https://repo.apa-it.at/artifactory/gtx-maven-internal/</url>
-			<mirrorOf>maven.gentics.com</mirrorOf>
+			<id>gentics.nexus.maven-central</id>
+			<name>Gentics Nexus Maven Mirror</name>
+			<url>https://repo.gentics.com/repository/maven-central/</url>
+			<mirrorOf>central,maven2</mirrorOf>
 		</mirror>
 	</mirrors>
 	<servers>
 		<server>
-			<id>lan.snapshots</id>
-			<username>${env.repoUsername}</username>
-			<password>${env.repoPassword}</password>
-		</server>
-		<server>
-			<id>lan.thirdparty</id>
-			<username>${env.repoUsername}</username>
-			<password>${env.repoPassword}</password>
-		</server>
-		<server>
-			<id>lan.mirror</id>
+			<id>gentics.nexus.maven-central</id>
 			<username>${env.repoUsername}</username>
 			<password>${env.repoPassword}</password>
 		</server>
 		<server>
-			<id>lan.internal</id>
+			<id>gentics.nexus.releases-oss</id>
 			<username>${env.repoUsername}</username>
 			<password>${env.repoPassword}</password>
 		</server>
 		<server>
-			<id>lan.releases</id>
+			<id>gentics.nexus.releases</id>
 			<username>${env.repoUsername}</username>
 			<password>${env.repoPassword}</password>
 		</server>
 		<server>
-			<id>lan.releases.staging.gcn</id>
+			<id>gentics.nexus.snapshots</id>
 			<username>${env.repoUsername}</username>
 			<password>${env.repoPassword}</password>
 		</server>

diff --git a/.jenkins/run-splits.sh b/.jenkins/run-splits.sh
@@ -12,4 +12,4 @@ fi
 echo "Running tests: $tests"
 jacoco=$2
 echo "Using jacoco: $jacoco"
-time mvn -fae -Dsurefire.excludedGroups=com.gentics.mesh.test.category.FailingTests,com.gentics.mesh.test.category.ClusterTests -Dmaven.javadoc.skip=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.apa-it.at/ -B -e -pl '!demo/default,!doc,!performance-tests' test -Dtest=$tests -DfailIfNoTests=false -Djacoco.skip=$jacoco | ts "$3 [%Y-%m-%d %H:%M:%S]"
+time mvn -fae -Dsurefire.excludedGroups=com.gentics.mesh.test.category.FailingTests,com.gentics.mesh.test.category.ClusterTests -Dmaven.javadoc.skip=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.gentics.com/ -B -e -pl '!demo/default,!doc,!performance-tests' test -Dtest=$tests -DfailIfNoTests=false -Djacoco.skip=$jacoco | ts "$3 [%Y-%m-%d %H:%M:%S]"
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,14 +1,11 @@
 // The GIT repository for this pipeline lib is defined in the global Jenkins setting
-@Library('jenkins-pipeline-library')
+@Library('jenkins-pipeline-library@nexus')
 import com.gentics.*
 
 // Make the helpers aware of this jobs environment
 JobContext.set(this)
 
-final def dockerRegistry       = "gentics-docker-jenkinsbuilds.docker.apa-it.at"
-final def dockerImageName      = dockerRegistry + "/gentics/jenkinsbuilds/mesh-slave-openjdk8"
-
-final def imagePrefix		   = "gtx-docker-releases-staging-mesh.docker.apa-it.at/"
+final def imagePrefix		   = "push.docker.gentics.com/docker-products/"
 
 properties([
 	parameters([
@@ -110,7 +107,7 @@ stage("Setup Build Environment") {
 				if (Boolean.valueOf(params.runMavenBuild)) {
 					sshagent(["git"]) {
 						if (Boolean.valueOf(params.runDeploy)) {
-							withCredentials([usernamePassword(credentialsId: 'repo.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
+							withCredentials([usernamePassword(credentialsId: 'docker.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
 								sh "mvn -U -B -Dgpg.skip=false -DskipTests clean deploy"
 							}
 						} else {
@@ -202,8 +199,8 @@ stage("Setup Build Environment") {
 			stage("Deploy") {
 				if (Boolean.valueOf(params.runDeploy)) {
 					if (Boolean.valueOf(params.runDocker)) {
-						withCredentials([usernamePassword(credentialsId: 'repo.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
-							sh 'docker login -u $repoUsername -p $repoPassword gtx-docker-releases-staging-mesh.docker.apa-it.at'
+						withCredentials([usernamePassword(credentialsId: 'docker.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
+							sh 'docker login -u $repoUsername -p $repoPassword docker.gentics.com'
 							sh 'docker push ' + imagePrefix + 'gentics/mesh-demo:latest'
 							sh 'docker push ' + imagePrefix + 'gentics/mesh-demo:' + version
 							sh 'docker push ' + imagePrefix + 'gentics/mesh:latest'

diff --git a/Jenkinsfile.split b/Jenkinsfile.split
@@ -1,5 +1,5 @@
 // The GIT repository for this pipeline lib is defined in the global Jenkins setting
-@Library('jenkins-pipeline-library')
+@Library('jenkins-pipeline-library@nexus')
 import com.gentics.*
 
 // Make the helpers aware of this jobs environment
@@ -26,7 +26,7 @@ properties([
 final def gitCommitTag         = '[Jenkins | ' + env.JOB_BASE_NAME + ']';
 final def splits = 20;
 final def runs = 20;
-final def imagePrefix		   = "gtx-docker-releases-staging-mesh.docker.apa-it.at/";
+final def imagePrefix		   = "push.docker.gentics.com/docker-products/";
 
 stage("Setup Build Environment") {
 	node("mesh-root-worker-11") {
@@ -67,7 +67,7 @@ stage("Setup Build Environment") {
 					echo "Setup of GPG"
 					sh "gpg --no-tty --batch --import /mnt/credentials/gpg/gpg-public-key.asc"
 					sh "gpg --no-tty --batch --import /mnt/credentials/gpg/gpg-secret-key.asc"
-					withCredentials([usernamePassword(credentialsId: 'repo.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword'),
+					withCredentials([usernamePassword(credentialsId: 'docker.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword'),
 					                 usernamePassword(credentialsId: 'gentics.gpg', usernameVariable: 'gpgKeyName', passwordVariable: 'gpgKeyPass')]) {
 						sh "mvn -ff -B -U -Dmaven.javadoc.skip=true -Dskip.test-plugins=false -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dgpg.skip=false -DskipTests ${extraFlags} clean install"
 					}
@@ -102,8 +102,8 @@ stage("Setup Build Environment") {
 										sshagent(["git"]) {
 											try {
 												def jacoco = Boolean.valueOf(params.runSonar);
-												withCredentials([usernamePassword(credentialsId: 'repo.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
-													sh 'docker login -u $repoUsername -p $repoPassword docker.apa-it.at'
+												withCredentials([usernamePassword(credentialsId: 'docker.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
+													sh 'docker login -u $repoUsername -p $repoPassword docker.gentics.com'
 													withEnv(["TESTCONTAINERS_RYUK_DISABLED=true"]) {
 														sh ".jenkins/run-splits.sh includes-${postfix} ${jacoco} split${current}"
 													}
@@ -128,7 +128,7 @@ stage("Setup Build Environment") {
 						sshagent(["git"]) {
 							try {
 								withEnv(["TESTCONTAINERS_RYUK_DISABLED=true"]) {
-									sh "mvn -fae -Dsurefire.excludedGroups=com.gentics.mesh.test.category.FailingTests,com.gentics.mesh.test.category.ClusterTests -Dmaven.javadoc.skip=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.apa-it.at/ -B -U -e -pl '!ferma,!demo/default,!doc,!performance-tests' clean install"
+									sh "mvn -fae -Dsurefire.excludedGroups=com.gentics.mesh.test.category.FailingTests,com.gentics.mesh.test.category.ClusterTests -Dmaven.javadoc.skip=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.gentics.com/ -B -U -e -pl '!ferma,!demo/default,!doc,!performance-tests' clean install"
 								}
 							} finally {
 								step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/*.xml'])
@@ -145,7 +145,7 @@ stage("Setup Build Environment") {
 					sshagent(["git"]) {
 						try {
 							withEnv(["TESTCONTAINERS_RYUK_DISABLED=true"]) {
-								sh "mvn -fae -Dsurefire.groups=com.gentics.mesh.test.category.FailingTests -Dmaven.javadoc.skip=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.apa-it.at/ -B -e -pl '!ferma,!demo/default,!doc,!performance-tests' test -DfailIfNoTests=false"
+								sh "mvn -fae -Dsurefire.groups=com.gentics.mesh.test.category.FailingTests -Dmaven.javadoc.skip=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.gentics.com/ -B -e -pl '!ferma,!demo/default,!doc,!performance-tests' test -DfailIfNoTests=false"
 							}
 						} finally {
 							step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/*.xml'])
@@ -163,7 +163,7 @@ stage("Setup Build Environment") {
 							echo "Setup of GPG"
 							sh "gpg --no-tty --batch --import /mnt/credentials/gpg/gpg-public-key.asc"
 							sh "gpg --no-tty --batch --import /mnt/credentials/gpg/gpg-secret-key.asc"
-							withCredentials([usernamePassword(credentialsId: 'repo.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword'),usernamePassword(credentialsId: 'gentics.gpg', usernameVariable: 'gpgKeyName', passwordVariable: 'gpgKeyPass')]) {
+							withCredentials([usernamePassword(credentialsId: 'docker.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword'),usernamePassword(credentialsId: 'gentics.gpg', usernameVariable: 'gpgKeyName', passwordVariable: 'gpgKeyPass')]) {
 								sh "mvn -U -B -DskipTests -Dgpg.skip=false clean deploy"
 							}
 						} else if (Boolean.valueOf(params.setBranchAsVersion)) {
@@ -202,7 +202,7 @@ stage("Setup Build Environment") {
 						try {
 							unstash 'project'
 							sh "mvn -B -DskipTests clean install -pl '!demo/default,!doc'"
-							sh "mvn -B -Dsurefire.groups=com.gentics.mesh.test.category.ClusterTests -DfailIfNoTests=false -Dmesh.container.image.prefix=docker.apa-it.at/ test"
+							sh "mvn -B -Dsurefire.groups=com.gentics.mesh.test.category.ClusterTests -DfailIfNoTests=false -Dmesh.container.image.prefix=docker.gentics.com/ test"
 						} finally {
 							step([$class: 'JUnitResultArchiver', testResults: 'distributed/target/surefire-reports/*.xml'])
 							deleteDir()
@@ -235,7 +235,7 @@ stage("Setup Build Environment") {
 					node("mesh-performance-worker-11") {
 						try {
 							unstash 'project'
-							sh "mvn -B -U clean package -pl '!doc,!demo/default,!server' -Dskip.unit.tests=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dskip.performance.tests=false -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.apa-it.at/"
+							sh "mvn -B -U clean package -pl '!doc,!demo/default,!server' -Dskip.unit.tests=true -Dskip.cluster.tests=true -Dskip.vertx-hazelcast=true -Dskip.performance.tests=false -Dmaven.test.failure.ignore=true -Dmesh.container.image.prefix=docker.gentics.com/"
 						} finally {
 							step([$class: 'JUnitResultArchiver', testResults: '**/target/*.performance.xml'])
 							deleteDir()
@@ -259,8 +259,8 @@ stage("Setup Build Environment") {
 			stage("Deploy") {
 				if (Boolean.valueOf(params.runDeploy)) {
 					if (Boolean.valueOf(params.runDocker)) {
-						withCredentials([usernamePassword(credentialsId: 'repo.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
-							sh 'docker login -u $repoUsername -p $repoPassword gtx-docker-releases-staging-mesh.docker.apa-it.at'
+						withCredentials([usernamePassword(credentialsId: 'docker.gentics.com', usernameVariable: 'repoUsername', passwordVariable: 'repoPassword')]) {
+							sh 'docker login -u $repoUsername -p $repoPassword push.docker.gentics.com'
 							sh 'docker push ' + imagePrefix + 'gentics/mesh-demo:latest'
 							sh 'docker push ' + imagePrefix + 'gentics/mesh-demo:' + version
 							sh 'docker push ' + imagePrefix + 'gentics/mesh:latest'

diff --git a/doc/src/main/docs/commercial/long-term-support.asciidoc b/doc/src/main/docs/commercial/long-term-support.asciidoc
@@ -38,9 +38,9 @@ Download access is restricted and can be obtained via a link:/services/[Product
 
 === Maven / Downloads
 
-The releases can be downloaded via the link:https://maven.gentics.com/maven2-commercial/com/gentics/mesh/mesh-server/[commercial maven repository]
+The releases can be downloaded via the link:https://repo.gentics.com/maven2-commercial/com/gentics/mesh/mesh-server/[commercial maven repository]
 
 === Docker Images
 
-* Server: docker.apa-it.at/gentics/mesh:VERSION
-* Demo: docker.apa-it.at/gentics/mesh-demo:VERSION
+* Server: docker.gentics.com/gentics/mesh:VERSION
+* Demo: docker.gentics.com/gentics/mesh-demo:VERSION
diff --git a/pom.xml b/pom.xml
@@ -266,23 +266,23 @@
 
 	<repositories>
 		<repository>
-			<id>maven.gentics.com</id>
-			<name>Gentics Maven Repository</name>
-			<url>https://maven.gentics.com/maven2</url>
+			<id>gentics.nexus.releases-oss</id>
+			<name>Gentics Nexus OSS Maven Repository</name>
+			<url>https://repo.gentics.com/repository/maven-releases-oss/</url>
 			<releases>
 				<enabled>true</enabled>
 			</releases>
 			<snapshots>
-				<enabled>true</enabled>
+				<enabled>false</enabled>
 			</snapshots>
 		</repository>
 	</repositories>
 
 	<pluginRepositories>
 		<pluginRepository>
-			<id>maven.gentics.com</id>
-			<name>Gentics Maven Repository</name>
-			<url>https://maven.gentics.com/maven2</url>
+			<id>gentics.nexus.releases-oss</id>
+			<name>Gentics Nexus OSS Maven Repository</name>
+			<url>https://repo.gentics.com/repository/maven-releases-oss/</url>
 			<releases>
 				<enabled>true</enabled>
 			</releases>
@@ -294,14 +294,14 @@
 
 	<distributionManagement>
 		<repository>
-			<id>lan.releases</id>
-			<name>Gentics Releases Repository</name>
-			<url>https://repo.apa-it.at/artifactory/gtx-maven-releases-staging-mesh</url>
+			<id>gentics.nexus.releases-oss</id>
+			<name>Gentics Nexus OSS Maven Repository</name>
+			<url>https://repo.gentics.com/repository/maven-releases-oss/</url>
 		</repository>
 		<snapshotRepository>
-			<id>lan.snapshots</id>
+			<id>gentics.nexus.snapshots</id>
 			<name>Gentics Snapshots Repository</name>
-			<url>https://repo.apa-it.at/artifactory/gtx-maven-snapshots-mesh</url>
+			<url>https://repo.gentics.com/repository/maven-snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>
diff --git a/tests/common/src/main/java/com/gentics/mesh/test/docker/ElasticsearchContainer.java b/tests/common/src/main/java/com/gentics/mesh/test/docker/ElasticsearchContainer.java
@@ -31,7 +31,7 @@ public ElasticsearchContainer() {
 	}
 
 	public ElasticsearchContainer(String version) {
-		super("docker.apa-it.at/elasticsearch/elasticsearch-oss:" + version);
+		super("docker.gentics.com/elasticsearch/elasticsearch-oss:" + version);
 	}
 
 	@Override

diff --git a/tests/tests-core/src/main/resources/testcontainers.properties b/tests/tests-core/src/main/resources/testcontainers.properties
@@ -1,2 +1,2 @@
-ryuk.container.image = docker.apa-it.at/testcontainers/ryuk:0.3.4
+ryuk.container.image = docker.gentics.com/testcontainers/ryuk:0.3.4
 ryuk.container.timeout = 120