Allow publishing to SNAPSHOT area

Configure pom and script so that repo.eclipse.org can be used when deploying snapshots
eclipse-platform · Jul 4, 2022 · 5ecb7a4 · 5ecb7a4
1 parent c33b20c
commit 5ecb7a4
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 45 deletions.
diff --git a/publish-to-maven-central/jdt-pom.xml b/publish-to-maven-central/jdt-pom.xml
@@ -11,12 +11,16 @@
   	<gpg.key.id>B414F87E</gpg.key.id>
   </properties>
 
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </snapshotRepository>
-  </distributionManagement>
+	<distributionManagement>
+		<repository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+		<snapshotRepository>
+			<id>repo.eclipse.org</id>
+			<url>https://repo.eclipse.org/content/repositories/eclipse-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
 
   <build>
     <plugins>

diff --git a/publish-to-maven-central/pde-pom.xml b/publish-to-maven-central/pde-pom.xml
@@ -11,12 +11,16 @@
   	<gpg.key.id>86085154</gpg.key.id>
   </properties>
 
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </snapshotRepository>
-  </distributionManagement>
+	<distributionManagement>
+		<repository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+		<snapshotRepository>
+			<id>repo.eclipse.org</id>
+			<url>https://repo.eclipse.org/content/repositories/eclipse-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
 
   <build>
     <plugins>

diff --git a/publish-to-maven-central/platform-pom.xml b/publish-to-maven-central/platform-pom.xml
@@ -11,12 +11,16 @@
   	<gpg.key.id>CC641282</gpg.key.id>
   </properties>
 
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </snapshotRepository>
-  </distributionManagement>
+	<distributionManagement>
+		<repository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+		<snapshotRepository>
+			<id>repo.eclipse.org</id>
+			<url>https://repo.eclipse.org/content/repositories/eclipse-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
 
   <build>
     <plugins>

diff --git a/publish-to-maven-central/publishJDT.sh b/publish-to-maven-central/publishJDT.sh
@@ -42,9 +42,6 @@ cp -r ${REPO}/${JDT}/* ${JDT}/
 
 echo "==== UPLOAD ===="
 
-URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-REPO=ossrh
-SETTINGS=/home/jenkins/.m2/settings-deploy-ossrh-jdt.xml
 MVN=/opt/tools/apache-maven/latest/bin/mvn
 
 /bin/mkdir .log
@@ -76,29 +73,39 @@ function same_as_baseline() {
 
 for pomFile in org/eclipse/jdt/*/*/*.pom
 do
-  if same_as_baseline $pomFile
-  then
+	xmllint --xpath "/*[local-name()='project']/*[local-name()='version']" $file | grep SNAPSHOT
+	snapshot=$?
+	if [ $snapshot == 0 ]; then
+		URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+		REPO=ossrh
+		SETTINGS="-s /home/jenkins/.m2/settings-deploy-ossrh-jdt.xml"
+	else
+		URL=https://repo.eclipse.org/content/repositories/eclipse-snapshots/
+		REPO=repo.eclipse.org
+	fi
+
+  if same_as_baseline $pomFile; then
 	  echo "Skipping file $pomFile which is already present in the baseline"
   else
 	  file=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1.jar|"`
 	  sourcesFile=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1-sources.jar|"`
 	  javadocFile=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1-javadoc.jar|"`
 
-	  echo "${MVN} -f jdt-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file -Durl=${URL} -DrepositoryId=${REPO} -Dfile=${file} -DpomFile=${pomFile}"
+	  echo "${MVN} -f jdt-pom.xml ${SETTINGS} gpg:sign-and-deploy-file -Durl=${URL} -DrepositoryId=${REPO} -Dfile=${file} -DpomFile=${pomFile}"
 
-	  ${MVN} -f jdt-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	  ${MVN} -f jdt-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	     -Durl=${URL} -DrepositoryId=${REPO} \
 	     -Dfile=${file} -DpomFile=${pomFile} \
 	     >> .log/artifact-upload.txt
 
 	  echo -e "\t${sourcesFile}"
-	  ${MVN} -f jdt-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	  ${MVN} -f jdt-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	     -Durl=${URL} -DrepositoryId=${REPO} \
 	     -Dfile=${sourcesFile} -DpomFile=${pomFile} -Dclassifier=sources \
 	     >> .log/sources-upload.txt
 
 	  echo -e "\t${javadocFile}"
-	  ${MVN} -f jdt-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	  ${MVN} -f jdt-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	     -Durl=${URL} -DrepositoryId=${REPO} \
 	     -Dfile=${javadocFile} -DpomFile=${pomFile} -Dclassifier=javadoc \
 	     >> .log/javadoc-upload.txt

diff --git a/publish-to-maven-central/publishPDE.sh b/publish-to-maven-central/publishPDE.sh
@@ -42,9 +42,6 @@ cp -r ${REPO}/${PDE}/* ${PDE}/
 
 echo "==== UPLOAD ===="
 
-URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-REPO=ossrh
-SETTINGS=/home/jenkins/.m2/settings-deploy-ossrh-pde.xml
 MVN=/opt/tools/apache-maven/latest/bin/mvn
 
 /bin/mkdir .log
@@ -76,29 +73,39 @@ function same_as_baseline() {
 
 for pomFile in org/eclipse/pde/*/*/*.pom
 do
-  if same_as_baseline $pomFile
-  then
+	xmllint --xpath "/*[local-name()='project']/*[local-name()='version']" $file | grep SNAPSHOT
+	snapshot=$?
+	if [ $snapshot == 0 ]; then
+		URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+		REPO=ossrh
+		SETTINGS="-s /home/jenkins/.m2/settings-deploy-ossrh-pde.xml"
+	else
+		URL=https://repo.eclipse.org/content/repositories/eclipse-snapshots/
+		REPO=repo.eclipse.org
+	fi
+
+  if same_as_baseline $pomFile; then
 	  echo "Skipping file $pomFile which is already present in the baseline"
   else
 	  file=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1.jar|"`
 	  sourcesFile=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1-sources.jar|"`
 	  javadocFile=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1-javadoc.jar|"`
 
-	  echo "${MVN} -f pde-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file -Durl=${URL} -DrepositoryId=${REPO} -Dfile=${file} -DpomFile=${pomFile}"
+	  echo "${MVN} -f pde-pom.xml ${SETTINGS} gpg:sign-and-deploy-file -Durl=${URL} -DrepositoryId=${REPO} -Dfile=${file} -DpomFile=${pomFile}"
 
-	  ${MVN} -f pde-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	  ${MVN} -f pde-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	     -Durl=${URL} -DrepositoryId=${REPO} \
 	     -Dfile=${file} -DpomFile=${pomFile} \
 	     >> .log/artifact-upload.txt
 
 	  echo -e "\t${sourcesFile}"
-	  ${MVN} -f pde-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	  ${MVN} -f pde-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	     -Durl=${URL} -DrepositoryId=${REPO} \
 	     -Dfile=${sourcesFile} -DpomFile=${pomFile} -Dclassifier=sources \
 	     >> .log/sources-upload.txt
 
 	  echo -e "\t${javadocFile}"
-	  ${MVN} -f pde-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	  ${MVN} -f pde-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	     -Durl=${URL} -DrepositoryId=${REPO} \
 	     -Dfile=${javadocFile} -DpomFile=${pomFile} -Dclassifier=javadoc \
 	     >> .log/javadoc-upload.txt

diff --git a/publish-to-maven-central/publishPlatform.sh b/publish-to-maven-central/publishPlatform.sh
@@ -43,9 +43,6 @@ cp -r ${REPO}/${PLATFORM}/* ${PLATFORM}/
 
 echo "==== UPLOAD ===="
 
-URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-REPO=ossrh
-SETTINGS=/home/jenkins/.m2/settings-deploy-ossrh-releng.xml
 MVN=/opt/tools/apache-maven/latest/bin/mvn
 
 /bin/mkdir .log
@@ -77,29 +74,39 @@ function same_as_baseline() {
 
 for pomFile in org/eclipse/platform/*/*/*.pom
 do
-  if same_as_baseline $pomFile
-  then
+	xmllint --xpath "/*[local-name()='project']/*[local-name()='version']" $file | grep SNAPSHOT
+	snapshot=$?
+	if [ $snapshot == 0 ]; then
+		URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+		REPO=ossrh
+		SETTINGS="-s /home/jenkins/.m2/settings-deploy-ossrh-releng.xml"
+	else
+		URL=https://repo.eclipse.org/content/repositories/eclipse-snapshots/
+		REPO=repo.eclipse.org
+	fi
+
+  if same_as_baseline $pomFile; then
 	echo "Skipping file $pomFile which is already present in the baseline"
   else
 	file=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1.jar|"`
 	sourcesFile=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1-sources.jar|"`
 	javadocFile=`echo $pomFile | sed -e "s|\(.*\)\.pom|\1-javadoc.jar|"`
 
-	echo "${MVN} -f platform-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file -Durl=${URL} -DrepositoryId=${REPO} -Dfile=${file} -DpomFile=${pomFile}"
+	echo "${MVN} -f platform-pom.xml ${SETTINGS} gpg:sign-and-deploy-file -Durl=${URL} -DrepositoryId=${REPO} -Dfile=${file} -DpomFile=${pomFile}"
 
-	${MVN} -e -X -f platform-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	${MVN} -e -X -f platform-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	   -Durl=${URL} -DrepositoryId=${REPO} \
 	   -Dfile=${file} -DpomFile=${pomFile} \
 	   >> .log/artifact-upload.txt
 
 	echo -e "\t${sourcesFile}"
-	${MVN} -e -X -f platform-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	${MVN} -e -X -f platform-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	   -Durl=${URL} -DrepositoryId=${REPO} \
 	   -Dfile=${sourcesFile} -DpomFile=${pomFile} -Dclassifier=sources \
 	   >> .log/sources-upload.txt
 
 	echo -e "\t${javadocFile}"
-	${MVN} -e -X -f platform-pom.xml -s ${SETTINGS} gpg:sign-and-deploy-file \
+	${MVN} -e -X -f platform-pom.xml ${SETTINGS} gpg:sign-and-deploy-file \
 	   -Durl=${URL} -DrepositoryId=${REPO} \
 	   -Dfile=${javadocFile} -DpomFile=${pomFile} -Dclassifier=javadoc \
 	   >> .log/javadoc-upload.txt