Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

JenkinsJobs/Builds/build.jenkinsfile

@@ -298,10 +298,12 @@ spec:
 			steps {
 				script {
 					for (c in BUILD.testConfigurations) {
-						build job: "${BUILD.testJobFolder}/${BUILD.testPrefix}-${c.os}-${c.arch}-java${c.javaVersion}", parameters: [string(name: 'buildId', value: "${BUILD_IID}")], wait: false
+						build job: "${BUILD.testJobFolder}/${BUILD.testPrefix}-${c.os}-${c.arch}-java${c.javaVersion}", wait: false, parameters: [
+							string(name: 'buildId', value: "${BUILD_IID}")
+						]
 					}
 				}
-				build job: 'SmokeTests/Start-smoke-tests', parameters: [string(name: 'buildId', value: "${BUILD_IID}")], wait: false
+				build job: 'SmokeTests/Start-smoke-tests', wait: false, parameters: [string(name: 'buildId', value: "${BUILD_IID}")]
 			}
 		}
 		stage('Trigger publication to Maven snapshots repo') {
@@ -314,7 +316,9 @@ spec:
 				}
 			}
 			steps {
-				build job: 'Releng/PublishToMaven', parameters: [string(name: 'snapshotOrRelease', value: '-snapshot')], wait: false
+				build job: 'Releng/deployToMaven', wait: false, parameters: [
+					string(name: 'sourceRepository', value: "https://download.eclipse.org/eclipse/updates/${RELEASE_VER}-${BUILD_TYPE}-builds/${BUILD_IID}")
+				]
 			}
 		}
 	}

JenkinsJobs/Releng/FOLDER.groovy

@@ -2,50 +2,36 @@ folder('Releng') {
 	description('Jobs related to routine releng tasks. Some are periodic, some are "manual" jobs ran only when needed.')
 }
 
-pipelineJob('Releng/PublishToMaven'){
-	displayName('Publish to Maven')
+pipelineJob('Releng/deployToMaven'){
+	displayName('Deploy to Maven')
 	description('''\
 <p>
 This job uses the <a href="https://github.com/eclipse-cbi/p2repo-aggregator">CBI aggregator</a> to produce a Maven-compatible repository 
-with contents as specified by the <a href="https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr">SDK4Mvn.aggr</a> and
-then publishes the artifacts for <code>Eclipse-Platform</code>, <code>JDT</code> and <code>PDE</code> from the output:
+with contents as specified by the <a href="https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse.platform.releng/deploy-to-maven/SDK4Mvn.aggr">SDK4Mvn.aggr</a> and
+then deploys the artifacts for <code>Eclipse-Platform</code>, <code>JDT</code>, <code>Equinox</code> and <code>PDE</code> from the output:
 </p>
 <ul>
 <li>
-Snapshots are published to <a href="https://repo.eclipse.org/content/repositories/eclipse-snapshots/">https://repo.eclipse.org/content/repositories/eclipse-snapshots/</a>.
+Snapshots are deployed to <a href="https://repo.eclipse.org/content/repositories/eclipse-snapshots/">https://repo.eclipse.org/content/repositories/eclipse-snapshots/</a>.
 </li>
 <li>
-Releases are published to <a href="https://repo1.maven.org/maven2/org/eclipse/">Maven central</a> by publishing to a <a href="https://oss.sonatype.org/#stagingRepositories">staging repository</a>.
+Releases are deployed to <a href="https://repo1.maven.org/maven2/org/eclipse/">Maven central</a> by deploying to a <a href="https://oss.sonatype.org/#stagingRepositories">staging repository</a>.
 </li>
 </ul>
 <p>
-The source repository to be published is specified via the
-<a href="https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/b6c45b1b38b74ad1fa7955e996976da4c259f926/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr#L5">local</a> and 
-<a href="https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/b6c45b1b38b74ad1fa7955e996976da4c259f926/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr#L8">remote</a> repository locations.
-<b>
-For a release build, these should specify the release repository location.
-After the release, these should specify the current 4.x-I-Builds.
-</b>
-</p>
 ''')
 	parameters { // Define parameters in job configuration to make them available even for the very first build after this job was (re)created.
-		choiceParam('snapshotOrRelease', ['-snapshot' /*default*/, '-release'], '''\
-<p>
-The source repository to be published is specified via the
-<a href="https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/b6c45b1b38b74ad1fa7955e996976da4c259f926/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr#L5">local</a> and 
-<a href="https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/b6c45b1b38b74ad1fa7955e996976da4c259f926/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr#L8">remote</a> repository locations 
-the <a href="https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr">SDK4Mvn.aggr</a>.
-<b>
-For a release build, these should specify the release repository location.
-After the release, these should specify the current 4.x-I-Builds.
-</b>
-</p>
+		stringParam('sourceRepository', null, '''\
+The URL of the source P2 repository to be deployed.<br>
+To deploy a snapshot, the 4.x-I-Builds child repository of the specific build should be specified, e.g. 'https://download.eclipse.org/eclipse/updates/4.37-I-builds/I20250710-1800/'<br>
+<b>To deploy a <em>Release</em>, the corresponding release repository should be specified</b>, e.g. 'https://download.eclipse.org/eclipse/updates/4.36/R-4.36-202505281830/'<br>
+If left blank (not recommended), the latest I-build is deployed.
 <ul>
 <li>
-Snapshots are published to <a href="https://repo.eclipse.org/content/repositories/eclipse-snapshots/">https://repo.eclipse.org/content/repositories/eclipse-snapshots/</a>.
+Snapshots are deployed to <a href="https://repo.eclipse.org/content/repositories/eclipse-snapshots/">https://repo.eclipse.org/content/repositories/eclipse-snapshots/</a>.
 </li>
 <li>
-Releases are published to <a href="https://repo1.maven.org/maven2/org/eclipse/">Maven central</a> by publishing to a <a href="https://oss.sonatype.org/#stagingRepositories">staging repository</a>.
+Releases are deployed to <a href="https://repo1.maven.org/maven2/org/eclipse/">Maven central</a> by deploying to a <a href="https://oss.sonatype.org/#stagingRepositories">staging repository</a>.
 </li>
 </ul>
 ''')
@@ -56,7 +42,7 @@ Releases are published to <a href="https://repo1.maven.org/maven2/org/eclipse/">
 			scm {
 				github('eclipse-platform/eclipse.platform.releng.aggregator', 'master')
 			}
-			scriptPath('JenkinsJobs/Releng/publishToMaven.jenkinsfile')
+			scriptPath('JenkinsJobs/Releng/deployToMaven.jenkinsfile')
 		}
 	}
 }

…nsJobs/Releng/publishToMaven.jenkinsfile …insJobs/Releng/deployToMaven.jenkinsfileJenkinsJobs/Releng/publishToMaven.jenkinsfile renamed to JenkinsJobs/Releng/deployToMaven.jenkinsfile JenkinsJobs/Releng/publishToMaven.jenkinsfile renamed to JenkinsJobs/Releng/deployToMaven.jenkinsfile

@@ -14,6 +14,7 @@ pipeline {
 		maven 'maven-daemon'
 	}
 	environment {
+		DEPLOYMENT_TYPE = determineDeploymentType()
 		REPO = "${WORKSPACE}/repo"
 		CBI_AGGR = "${installLatestCbiAggr()}"
 		// Folder ~/.m2 is not writable for builds, ensure mvnd metadata are written within the workspace.
@@ -24,11 +25,15 @@ pipeline {
 	stages {
 		stage('Aggregate Maven repository') {
 			steps {
-				sh '''#!/bin/bash -e
-					FILE_SDK_AGGR="${WORKSPACE}/git-repo/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr"
+				sh '''#!/bin/bash -xe
+					FILE_SDK_AGGR="${WORKSPACE}/git-repo/eclipse.platform.releng/deploy-to-maven/SDK4Mvn.aggr"
 
+					# Set the specified source repository
+					if [ -n "${sourceRepository}" ]; then
+						sed -e "s|<repositories location=\\".*\\">|<repositories location=\\"${sourceRepository}\\">|" -i ${FILE_SDK_AGGR}
+					fi
 					# Set whether this is a snapshot build or not
-					if [ "${snapshotOrRelease}" = "-snapshot" ]; then
+					if [ "${DEPLOYMENT_TYPE}" != 'release' ]; then
 						sed -e 's/snapshot=".*"/snapshot="true"/g' -i ${FILE_SDK_AGGR}
 					fi
 
@@ -45,6 +50,7 @@ pipeline {
 
 					pushd ${REPO}
 
+					set +x
 					echo "========== Repo aggregation completed ========="
 
 					# Find all the artifact folders for all projects
@@ -65,7 +71,7 @@ pipeline {
 			}
 		}
 		stage('Validate repository') {
-			// Tests that each to-be-published artifact can transitively resolve all its dependencies.
+			// Tests that each to-be deployed artifact can transitively resolve all its dependencies.
 			steps {
 				dir('repo-validation') { // Do the work in a clean folder without a pom.xml
 					sh '''#!/bin/bash -xe
@@ -77,7 +83,7 @@ pipeline {
 				}
 			}
 		}
-		stage('Publish artifacts to Maven-Central') {
+		stage('Deploy artifacts') {
 			matrix {
 				axes {
 					axis { // environment variable is also used by called scripts!
@@ -86,7 +92,7 @@ pipeline {
 					}
 				}
 				stages {
-					stage('Publish project to Maven'){
+					stage('Deploy project to Maven'){
 						environment {
 							SETTINGS = "/home/jenkins/.m2/settings-deploy-ossrh-${PROJECT == 'platform' ? 'releng': PROJECT}.xml"
 							// The location of the temporarily file that contains the secret file content
@@ -95,7 +101,7 @@ pipeline {
 							MAVEN_GPG_PASSPHRASE = credentials("secret-subkeys-${PROJECT == 'platform' ? 'releng': PROJECT}.asc-passphrase")
 						}
 						steps {
-							dir("publish-${PROJECT}"){
+							dir("deploy-${PROJECT}"){
 								sh '''#!/bin/sh -xe
 									# Copy configuration pom into clean directory to stop maven from finding the .mvn folder of this git-repository
 									cp "${WORKSPACE}/git-repo/eclipse-platform-parent/pom.xml" eclipse-parent-pom.xml
@@ -134,15 +140,15 @@ pipeline {
 											SOURCES_ARG="-Dsources=${sourcesFile}"
 										else
 											SOURCES_ARG=""
-											echo "No ${sourcesFile}."
+											echo "Missing sources file ${sourcesFile}."
 										fi
 
 										if [ -f "${javadocFile}" ]; then
 											echo "${javadocFile}"
 											JAVADOC_ARG="-Djavadoc=${javadocFile}"
 										else
 											JAVADOC_ARG=""
-											echo "No ${javadocFile}."
+											echo "Missing JavaDoc file ${javadocFile}."
 										fi
 										set -x
 
@@ -175,6 +181,15 @@ pipeline {
 	}
 }
 
+def determineDeploymentType() {
+	if ("${sourceRepository}".trim() =~ /\/(?<version>\d+\.\d+)\/R-\k<version>(\.\d+)?-\d{12}(\/)?$/) {
+		input message: 'The specified P2 repository is a release and will be deployed to Maven-Central.', ok : 'Proceed deploying to Maven-Central'
+		return 'release'
+	} else {
+		return 'snapshot'
+	}
+}
+
 def installLatestCbiAggr(){
 	return install('cbiAggr', "https://download.eclipse.org/cbi/updates/p2-aggregator/products/nightly/latest/org.eclipse.cbi.p2repo.cli.product-linux.gtk.x86_64.tar.gz") + '/cbiAggr'
 }

RELEASE.md

@@ -108,12 +108,11 @@ The actual steps to release
       - Change the DL_TYPE from S to R.  
       - TAG will be set to R as well, for example `R4_27` 
     - You can subscribe to [cross-project-issues](https://accounts.eclipse.org/mailing-list/cross-project-issues-dev) to get the notifications on Simrel releases.
-  * #### **Publish to Maven central**
-    - Publishing to maven should happen by at least Tuesday before the release since there is up to a 24 hour delay for the maven mirrors.
-    - Update [SDK4Mvn.aggr](https://github.com/eclipse-platform/eclipse.platform.releng/blob/master/publish-to-maven-central/SDK4Mvn.aggr) to the release build.
-      - SDK4Mvn.aggr determines what is being published to Maven
-    - Run the [Publish to Maven](https://ci.eclipse.org/releng/job/Releng/job/PublishToMaven/) job in jenkins with the `-release` parameter.
-    - Once that publish job has completed successfully, log into https://oss.sonatype.org/#stagingRepositories and close the Platform, JDT and PDE repositories.
+  * #### **Deploy to Maven central**
+    - Deploying to maven should happen by at least Tuesday before the release since there is up to a 24 hour delay for the maven mirrors.
+    - Run the [Deploy to Maven](https://ci.eclipse.org/releng/job/Releng/job/deployToMaven/) job in Jenkins with the release build as `sourceRepository`.
+      - About a minute after triggering the job, Jenkins will ask for confirmation on the console, if the specified build should really be deployed to Maven-Central staging.
+    - Once that deploy-job has completed successfully, log into https://oss.sonatype.org/#stagingRepositories and close the Platform, JDT and PDE repositories.
       - If you do not have an account on oss.sonatype.org for performing the rest of the release request one by creating an issue like https://issues.sonatype.org/browse/OSSRH-43870 to get permissions for platform, JDT and PDE projects and tag an existing release engineer to give approval.
   * **Contribute to SimRel**
     - If SimRel is not updated before the I-builds are cleaned up (specifically the build for RC2/GA) it will break. 
@@ -136,8 +135,6 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha
     - For the Y and P build parameters it's important to know whether or not Y and P builds were run during the release. Since they correspond to java releases on a 6 month cycle, typically they are built in odd-numbered releases.  
     The existing builds are kept for one release, then cleaned up before the next stream that will have Y and P builds. it's convoluted and I dont want to type it out. Remove Y builds on even releases. 
     - If something doesn't get cleaned up properly you can use  Use the [list artifacts](https://ci.eclipse.org/releng/view/Cleanup/job/list_artifacts_from_download_server/) job to generate ta list of what's on the download server and either create a new job to clean it up or update and rerun the cleanup job as appropriate.
-  * **Set Maven to Publish to I-builds**
-    - Update [SDK4Mvn.aggr](https://github.com/eclipse-platform/eclipse.platform.releng/blob/master/publish-to-maven-central/SDK4Mvn.aggr) and point it to the new streams I-builds.
   * **Set Previous Release to GA** 
     - Everything that was updated to RC2 (see below) should now use the released build.
 

RELENG.md

@@ -29,7 +29,7 @@ Adding a job to Jenkins should be as easy as adding a new groovy file to git, bu
 
 * **No dashes in filenames**, it breaks JobDSL. If there was a `-` in the job name I changed it to `_` in the file name.
 * **Job Names**
-  - No spaces, this is just for the good of scripts etc. The job NAME is used in the url, but you can always add a `displayName` field if you want the job to appear with a more natural looking name on the page. See (Releng/PublishToMaven)[JenkinsJobs/Releng/FOLDER.groovy] as an example.
+  - No spaces, this is just for the good of scripts etc. The job NAME is used in the url, but you can always add a `displayName` field if you want the job to appear with a more natural looking name on the page. See (Releng/deployToMaven)[JenkinsJobs/Releng/FOLDER.groovy] as an example.
   - The folder needs to be part of the job name, otherwise Jenkins will just create the job at the dashboard level.
 * **job vs pipelineJob**
   - Anything that can build on a regular jenkins node or via an available lable uses the (job)[https://jenkinsci.github.io/job-dsl-plugin/#path/job] template.

eclipse-platform-parent/pom.xml

@@ -553,13 +553,23 @@
                         <cleanup.remove_unnecessary_array_creation>true</cleanup.remove_unnecessary_array_creation>
                         <!-- Remove unnecessary suppress warning tokens -->
                         <cleanup.remove_unnecessary_suppress_warnings>true</cleanup.remove_unnecessary_suppress_warnings>
-						<!-- Remove unnecessary whitespace-->
+                        <!-- Remove unnecessary whitespace-->
                         <cleanup.remove_trailing_whitespaces>true</cleanup.remove_trailing_whitespaces>
                         <cleanup.remove_trailing_whitespaces_all>true</cleanup.remove_trailing_whitespaces_all>
                         <cleanup.remove_trailing_whitespaces_ignore_empty>false</cleanup.remove_trailing_whitespaces_ignore_empty>
                         <!-- Removes unused imports -->
                         <cleanup.remove_unused_imports>true</cleanup.remove_unused_imports>
                         <cleanup.organize_imports>false</cleanup.organize_imports>
+                        <!-- Remove unused private members -->
+                        <cleanup.remove_unused_private_members>true</cleanup.remove_unused_private_members>
+                        <!-- Remove unused private types -->
+                        <cleanup.remove_unused_private_types>true</cleanup.remove_unused_private_types>
+                        <!-- Remove unused private constructors -->
+                        <cleanup.remove_private_constructors>true</cleanup.remove_private_constructors>
+                        <!-- Remove unused private fields -->
+                        <cleanup.remove_unused_private_fields>true</cleanup.remove_unused_private_fields>
+                        <!-- Remove unused private methods -->
+                        <cleanup.remove_unused_private_methods>true</cleanup.remove_unused_private_methods>
                     </cleanUpProfile>
                 </configuration>
             </execution>

eclipse.jdt.core

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>publish-to-maven-central</name>
+	<name>deploy-to-maven</name>
 	<comment></comment>
 	<projects>
 	</projects>