eclipse-platform · HannesWell · Dec 10, 2025 · Dec 3, 2025 · Dec 3, 2025
diff --git a/.project b/.project
@@ -15,7 +15,7 @@
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|eclipse.platform.releng.tychoeclipsebuilder|oomph|products|sites)/.*</arguments>
+				<arguments>1.0-projectRelativePath-matches-true-true-(eclipse.platform.releng.prereqs.sdk|eclipse.platform.releng.tychoeclipsebuilder|oomph|products|scripts|sites)/.*</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile
@@ -211,8 +211,8 @@ pipeline {
 						$BASE_BUILDER_ECLIPSE_EXE \
 							-debug -consolelog -data $CJE_ROOT/$TMP_DIR/workspace-toolsinstall \
 							-application org.eclipse.equinox.p2.director \
-							-repository ${ECLIPSE_RUN_REPO},${BUILDTOOLS_REPO},https://download.eclipse.org/cbi/updates/p2-analyzers/products/nightly/latest \
-							-installIU org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.cbi.p2repo.analyzers \
+							-repository ${ECLIPSE_RUN_REPO},https://download.eclipse.org/cbi/updates/p2-analyzers/products/nightly/latest \
+							-installIU org.eclipse.pde.api.tools,org.eclipse.cbi.p2repo.analyzers \
 							-profile SDKProfile
 					'''
 				}
@@ -251,6 +251,7 @@ pipeline {
 
 					# Gather maven properties
 					cp ${AGG_DIR}/eclipse-platform-parent/target/mavenproperties.properties ${DROP_DIR}/$BUILD_ID/mavenproperties.properties
+					comparatorRepo=$(grep '^comparator.repo=' ${DROP_DIR}/${BUILD_ID}/mavenproperties.properties | cut -d'=' -f2-)
 
 					# Gather artifactcomparisons
 					pushd ${AGG_DIR}
@@ -260,23 +261,14 @@ pipeline {
 					popd
 
 					# Verify comparatorlogs
-					#
-					# Note: copy mb220_buildSdkPatch.sh.log as mb060_run-maven-build_output.txt for now to avoid changing eclipse_compare.xml
-					# ToDo: Modify org.eclipse.releng.build.tools.comparator.Extractor to be configurable:
-					# https://github.com/eclipse-platform/eclipse.platform.releng.buildtools/blob/c5f7ecf1951d44311e24ce7bd6b505189aabb4da/bundles/org.eclipse.releng.build.tools.comparator/src/org/eclipse/releng/build/tools/comparator/Extractor.java#L27
 					#TODO: Generally try to avoid the need to capture the build log in a file/for teeing
-					cp ${logDir}/mb220_buildSdkPatch.sh.log ${DROP_DIR}/$BUILD_ID/buildlogs/mb060_run-maven-build_output.txt
+					cp ${logDir}/mb220_buildSdkPatch.sh.log ${DROP_DIR}/$BUILD_ID/buildlogs/
 
-					pushd ${DROP_DIR}/$BUILD_ID
-					$BASE_BUILDER_ECLIPSE_EXE \
-						-application org.eclipse.ant.core.antRunner \
-						-buildfile $ECLIPSE_BUILDER_DIR/eclipse/buildScripts/eclipse_compare.xml \
-						-data $CJE_ROOT/$TMP_DIR/workspace-comparatorLogs \
+					java \
 						-DbuildDirectory=${DROP_DIR}/$BUILD_ID \
+						-DcomparatorRepo=${comparatorRepo} \
 						-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-						-v \
-						compare
-					popd
+						${WORKSPACE}/scripts/releng/ComparatorSummaryExtractor.java
 
 					comparatorLogMinimumSize=350
 					comparatorLog=${comparatorlogsDir}/buildtimeComparatorUnanticipated.log.txt
@@ -297,6 +289,9 @@ pipeline {
 				stage('Eclipse') {
 					stages {
 						stage('Gather Eclipse parts') {
+							tools {
+								jdk 'temurin-jdk25-latest'
+							}						
 							environment {
 								KEYRING = credentials('secret-subkeys-releng.asc')
 								KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.asc-passphrase')
@@ -402,19 +397,9 @@ pipeline {
 									popd
 
 									# Verify compilelog
-									pushd ${DROP_DIR}/${BUILD_ID}
-									$BASE_BUILDER_ECLIPSE_EXE \
-										-application org.eclipse.ant.core.antRunner \
-										-buildfile $ECLIPSE_BUILDER_DIR/eclipse/helper.xml \
-										-data $CJE_ROOT/$TMP_DIR/workspace-verifyCompile \
-										-DcjeDir=$CJE_ROOT \
-										-DEBuilderDir=$ECLIPSE_BUILDER_DIR \
-										-DbuildDirectory=${DROP_DIR}/${BUILD_ID} \
-										-DbuildLabel=$BUILD_ID \
-										-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-										-v \
-										verifyCompile
-									popd
+									java \
+										-Dinput=${DROP_DIR}/${BUILD_ID}/compilelogs/plugins \
+										${WORKSPACE}/scripts/releng/CompileLogConverter.java
 
 									# Generate repository reports
 									$BASE_BUILDER_ECLIPSE_EXE \
@@ -451,25 +436,25 @@ pipeline {
 									done
 
 									# Publish Eclipse
-									pushd $CJE_ROOT
-									$BASE_BUILDER_ECLIPSE_EXE \
-										-application org.eclipse.ant.core.antRunner \
-										-buildfile $ECLIPSE_BUILDER_DIR/eclipse/helper.xml \
-										-data $CJE_ROOT/$TMP_DIR/workspace-publish \
-										-DAGGR_DIR=${AGG_DIR} \
-										-DcjeDir=$CJE_ROOT \
-										-DEBuilderDir=$ECLIPSE_BUILDER_DIR \
-										-DbuildDirectory=${DROP_DIR}/${BUILD_ID} \
-										-DbuildLabel=$BUILD_ID \
-										-DbuildDir=$BUILD_ID \
-										-DbuildRepo=$PLATFORM_REPO_DIR \
-										-DbuildType=$BUILD_TYPE \
-										-DpublishingContent=$ECLIPSE_BUILDER_DIR/eclipse/publishingFiles \
-										-DindexFileName=index.php \
-										-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-										-v \
-										publish
+
+									pushd ${DROP_DIR}/${BUILD_ID}
+										bash ${CJE_ROOT}/scripts/produceChecksum.sh eclipse
 									popd
+
+									cp -r ${ECLIPSE_BUILDER_DIR}/eclipse/publishingFiles/staticDropFiles/. ${DROP_DIR}/${BUILD_ID}
+
+									java \
+										-DisBuildTested=true \
+										-DbuildType=${BUILD_TYPE} \
+										-DdropTokenList='%repository%,%sdk%,%tests%,%runtime%,%jdtc%,%swt%' \
+										-DdropHtmlFileName=index.php \
+										-DxmlDirectoryName=${DROP_DIR}/${BUILD_ID}/testresults/xml \
+										-DdropDirectoryName=${DROP_DIR}/${BUILD_ID} \
+										-DdropTemplateFileName=${ECLIPSE_BUILDER_DIR}/eclipse/publishingFiles/templateFiles/index.template.php \
+										-DcompileLogsDirectoryName=${DROP_DIR}/${BUILD_ID}/compilelogs/plugins \
+										-DtestManifestFileName=${ECLIPSE_BUILDER_DIR}/eclipse/publishingFiles/testManifest.xml \
+										-DtestsConfigExpected=${TEST_CONFIGURATIONS_EXPECTED} \
+										${WORKSPACE}/scripts/releng/TestResultsGenerator.java
 								'''
 							}
 						}
@@ -492,6 +477,9 @@ pipeline {
 				stage('Equinox') {
 					stages {
 						stage('Gather Equinox parts') {
+							tools {
+								jdk 'temurin-jdk25-latest'
+							}						
 							environment {
 								KEYRING = credentials('secret-subkeys-releng.asc')
 								KEYRING_PASSPHRASE = credentials('secret-subkeys-releng.asc-passphrase')
@@ -533,25 +521,40 @@ pipeline {
 									# Publish Equinox
 									pushd $CJE_ROOT
 									mkdir -p $ECLIPSE_BUILDER_DIR/equinox/$TMP_DIR
+									mkdir -p $CJE_ROOT/$TMP_DIR
 									$BASE_BUILDER_ECLIPSE_EXE \
 										-application org.eclipse.ant.core.antRunner \
 										-buildfile $ECLIPSE_BUILDER_DIR/equinox/helper.xml \
 										-data $CJE_ROOT/$TMP_DIR/workspace-publishEquinox \
 										-DEBuilderDir=$ECLIPSE_BUILDER_DIR \
 										-DbuildDir=$BUILD_ID \
-										-DbuildDirectory=${EQUINOX_DROP_DIR} \
 										-DbuildId=$BUILD_ID \
 										-DbuildRepo=$PLATFORM_REPO_DIR \
-										-DbuildType=$BUILD_TYPE \
-										-DpostingDirectory=${DROP_DIR}/$BUILD_ID \
 										-DequinoxPostingDirectory=${EQUINOX_DROP_DIR} \
 										-DeqpublishingContent=$ECLIPSE_BUILDER_DIR/equinox/publishingFiles \
-										-DindexFileName=index.php \
 										-Dequinox.build.configs=$ECLIPSE_BUILDER_DIR/equinox/buildConfigs \
 										-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
 										-v \
 										publish
 									popd
+
+									pushd ${EQUINOX_DROP_DIR}/${BUILD_ID}
+										bash ${CJE_ROOT}/scripts/produceChecksum.sh equinox
+									popd
+
+									cp -r ${ECLIPSE_BUILDER_DIR}/equinox/publishingFiles/staticDropFiles/. ${EQUINOX_DROP_DIR}/${BUILD_ID}
+
+									java \
+										-DisBuildTested=false \
+										-DbuildType=${BUILD_TYPE} \
+										-DdropTokenList='%equinox%,%framework%,%extrabundles%,%other%,%launchers%,%osgistarterkits%' \
+										-DdropHtmlFileName=index.php \
+										-DxmlDirectoryName=${DROP_DIR}/$BUILD_ID/testresults/xml \
+										-DdropDirectoryName=${EQUINOX_DROP_DIR}/${BUILD_ID} \
+										-DdropTemplateFileName=${ECLIPSE_BUILDER_DIR}/equinox/publishingFiles/templateFiles/index.template.php \
+										-DcompileLogsDirectoryName=${EQUINOX_DROP_DIR}/${BUILD_ID}/compilelogs/plugins \
+										-DtestManifestFileName=${ECLIPSE_BUILDER_DIR}/equinox/publishingFiles/testManifest.xml \
+										${WORKSPACE}/scripts/releng/TestResultsGenerator.java
 								'''
 							}
 						}

diff --git a/JenkinsJobs/Releng/updateTestResultIndex.jenkinsfile b/JenkinsJobs/Releng/updateTestResultIndex.jenkinsfile
@@ -16,17 +16,16 @@ pipeline {
 		label 'basic'
 	}
 	tools {
-		jdk 'temurin-jdk21-latest'
+		jdk 'temurin-jdk25-latest'
 	}
 	stages {
 		stage('Checkout SCM') {
 			steps {
 				dir("${WORKSPACE}/git-repo") {
 					checkout scmGit(userRemoteConfigs: [[url: "${scm.userRemoteConfigs[0].url}"]], branches: [[name: "${scm.branches[0].name}"]],
 						extensions: [cloneOption(depth: 1, shallow: true, noTags: true), sparseCheckout([
-						[path: 'cje-production/'],
+						[path: 'scripts/releng/'],
 						[path: 'eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml'],
-						[path: 'JenkinsJobs/shared/utilities.groovy'],
 					])])
 				}
 			}
@@ -35,7 +34,6 @@ pipeline {
 			environment {
 				// Download Server locations (seldomly change)
 				EP_ECLIPSE_DROPS = '/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4'
-				ECLIPSE = installLatestEclipse()
 			}
 			steps {
 				sshagent(['projects-storage.eclipse.org-bot-ssh']) {
@@ -44,26 +42,21 @@ pipeline {
 						curl -L -o "${WORKSPACE}/buildproperties.shsource" http://download.eclipse.org/eclipse/downloads/drops4/${buildID}/buildproperties.shsource
 						source "${WORKSPACE}/buildproperties.shsource"
 
-						$ECLIPSE -data workspace-toolsinstall \
-							-application org.eclipse.equinox.p2.director \
-							-repository ${ECLIPSE_RUN_REPO},${BUILDTOOLS_REPO} \
-							-installIU org.eclipse.releng.build.tools.feature.feature.group
-
 						buildDirectory="${WORKSPACE}/postingDir/${buildID}"
 						testResultsDir="${buildDirectory}/testresults"
 						mkdir -p "${testResultsDir}"
 
 						# Fetch previously collected test results of all completed runs
 						rsync -avzh [email protected]:${EP_ECLIPSE_DROPS}/${buildID}/testresults/xml ${testResultsDir}
 
-						#triggering ant runner
-						$ECLIPSE -debug -data ${WORKSPACE}/workspace-updateTestResults \
-							-application org.eclipse.ant.core.antRunner \
-							-file "${WORKSPACE}/git-repo/cje-production/scripts/publish.xml" \
-							-DbuildDirectory=${buildDirectory} \
+						java \
+							-DisBuildTested=true \
 							-DbuildType=${BUILD_TYPE} \
-							"-DtestsConfigExpected=${TEST_CONFIGURATIONS_EXPECTED}" \
-							"-DmanifestFile=${WORKSPACE}/git-repo/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml"
+							-DdropDirectoryName=${buildDirectory} \
+							-DxmlDirectoryName=${buildDirectory}/testresults/xml \
+							-DtestManifestFileName=${WORKSPACE}/git-repo/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml \
+							-DtestsConfigExpected=${TEST_CONFIGURATIONS_EXPECTED} \
+							${WORKSPACE}/git-repo/scripts/releng/TestResultsGenerator.java
 
 						rsync -avzh ${buildDirectory} [email protected]:${EP_ECLIPSE_DROPS}
 					'''
@@ -73,13 +66,3 @@ pipeline {
 		}
 	}
 }
-
-def installLatestEclipse(){
-	def props = readProperties(file: "${WORKSPACE}/git-repo/cje-production/buildproperties.txt").collectEntries{n, v ->
-			v = v.trim();
-			return [n, (v.startsWith('"') && v.endsWith('"') ? v.substring(1, v.length() - 1) : v)]
-		}
-	def utilities = load "${WORKSPACE}/git-repo/JenkinsJobs/shared/utilities.groovy"
-	def eclipseURL = "https://download.eclipse.org/eclipse/downloads/drops4/${props.PREVIOUS_RELEASE_ID}/eclipse-platform-${props.PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz"
-	return utilities.installDownloadableTool('eclipse', eclipseURL) + '/eclipse --launcher.suppressErrors -nosplash -consolelog'
-}
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
@@ -38,5 +38,4 @@ BASEBUILD_ID="R-4.38-202512010920"
 #release id for downloading eclipse
 PREVIOUS_RELEASE_ID="R-4.38-202512010920"
 
-BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools"
 ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.39-I-builds/"
diff --git a/...builder/eclipse/extras/produceChecksum.sh → cje-production/scripts/produceChecksum.sh b/...builder/eclipse/extras/produceChecksum.sh → cje-production/scripts/produceChecksum.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #*******************************************************************************
 # Copyright (c) 2017, 2025 IBM Corporation and others.
 #
@@ -12,10 +12,18 @@
 # Contributors:
 #     David Williams - initial API and implementation
 #*******************************************************************************
-#
+
+if [ $# -ne 1 ]; then
+  echo USAGE: $0 client
+  exit 1
+fi
+client=$1
+
 echo "[DEBUG] Producing checksums starting"
 echo "[DEBUG] current directory: ${PWD}"
 
+mkdir checksum
+
 allCheckSumsSHA512=checksum/${client}-${BUILD_ID}-SUMSSHA512
 fileExtensionsToHash='zip dmg gz tar.xz jar'
 

diff --git a/cje-production/scripts/publish.xml b/cje-production/scripts/publish.xml