diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy index 9690fe0becf..6c700c8e217 100644 --- a/JenkinsJobs/Builds/I_build.groovy +++ b/JenkinsJobs/Builds/I_build.groovy @@ -428,6 +428,11 @@ spec: } } stage('Trigger publication to Maven snapshots repo') { + when { + environment name: 'COMPARATOR_ERRORS_SUBJECT', value: '' + // On comparator-erros, skip the deployment of snapshot version to the 'eclipse-snapshots' maven repository to prevent that ECJ snapshot + // from being used in verification builds. Similar to how the p2-repository is not added to the I-build composite in that case. + } steps { container('jnlp') { build job: 'CBIaggregator', parameters: [string(name: 'snapshotOrRelease', value: '-snapshot')], wait: false diff --git a/RELEASE.md b/RELEASE.md index 5a78febe98f..eb9c5c10d0a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -58,16 +58,6 @@ - Use the mail template from the promotion build [artifacts](https://ci.eclipse.org/releng/job/eclipse.releng.renameAndPromote/lastSuccessfulBuild/artifact/) in Jenkins to get the download urls. - Make sure to mention that the Master branch is now again open for development. * For **Milestone builds** return the I-builds to the normal schedule. - * **Update ECJ compiler** in the platform build (if it needs to be updated). - * To find the new compiler version: - - Go to the update site for the release candidate - - Click `plugins` - - Find `org.eclipse.jdt.core.complier.batch_${ecjversion}.jar` - * Edit the [copyAndDeployJDTCompiler](https://ci.eclipse.org/jdt/job/copyAndDeployJDTCompiler) job in Jenkins - - Only JDT committers can run the job, but Releng/Platform committers can configure it - - Update the default values of the `versionfolder`, `buildid` and `ecjversion` parameters. - - Update the build triggers to schedule a build for the current date. - * Finally update the `cbi-ecj-version` in [eclipse.platform.releng.aggregator/eclipse-platform-parent/pom.xml](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse-platform-parent/pom.xml) * **After RC1** * Leave the I-builds running on the milestone schedule for RC2. * Comment on EMF, ECF and Orbit issues to ask for final release builds. @@ -157,13 +147,21 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha #### **Maintenance Branches:** * **Maintenance Branch Creation:** - - Create the branch from RC2 using the [create maintenance branch](https://ci.eclipse.org/releng/job/Releng/job/createMaintenanceBranch/) job in the Eclipse Platform Releng jeknins. + - Create the branch from RC2 using the [create maintenance branch](https://ci.eclipse.org/releng/job/Releng/job/createMaintenanceBranch/) job in the Eclipse Platform Releng Jenkins. * **Update maintenance branch with release version** - Once the I-build repo is removed for the previous release the maintenance branch will have to use the release location, i.e. any references to `https://download.eclipse.org/eclipse/updates/4.25-I-builds/` will need to be updated to `https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/` - Functionally this means: - Update the ECLIPSE_RUN_REPO in the [cje-production](cje-production) buildproperties.txt files - Update eclipserun-repo, comparator.repo and eclipse-p2-repo.url in [eclipse-platform-parent/pom.xml](eclipse-platform-parent/pom.xml) - This step can be prepared ahead of time but can't be merged until the release build has been promoted and the update site exists. + * **Update ECJ compiler** in the platform build (if it needs to be updated). + * To find the new *unqualified* compiler version: + - Go to the update site for the release candidate + - Click `plugins` + - Find the *unqualified* version of the artifact `org.eclipse.jdt.core.complier.batch_${ecjversion}.jar`, i.e. the version consisting only of the _major_._minor_._service_ part, but without qualifier. + It's the version of the `org.eclipse.jdt:ecj` artifact at Maven-Central, about to be relased. + * Update the `cbi-ecj-version` in [eclipse.platform.releng.aggregator/eclipse-platform-parent/pom.xml](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse-platform-parent/pom.xml) + to the exact version of the `org.eclipse.jdt.core.complier.batch` bundle, e.g.: `3.40.0` #### **Update the Build Calendar:** - Create an [issue](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/289) and update the [build calendar](https://calendar.google.com/calendar/u/0?cid=cHJmazI2ZmRtcHJ1MW1wdGxiMDZwMGpoNHNAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ) for the next GA release based on the [Simultaneous Release schedule](https://wiki.eclipse.org/Simultaneous_Release). diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh index 24121d03e0b..fecf1e19a8b 100755 --- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh +++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh @@ -286,7 +286,7 @@ then fn-write-property COMPARATOR_ERRORS_BODY "\"Check unanticipated comparator messages:
https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt

\"" else echo -e "DEBUG: comparator logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}" - fn-write-property COMPARATOR_ERRORS_SUBJECT "\" \"" - fn-write-property COMPARATOR_ERRORS_BODY "\" \"" + fn-write-property COMPARATOR_ERRORS_SUBJECT "\"\"" + fn-write-property COMPARATOR_ERRORS_BODY "\"\"" fi diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index f9739af0c8e..8e7a3b7dcc7 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -87,8 +87,8 @@ https://repo.eclipse.org/content/repositories/tycho-snapshots/ - https://repo.eclipse.org/content/repositories/eclipse-staging/ - 3.40.100.v20241127-0801 + https://repo.eclipse.org/content/repositories/eclipse-snapshots/ + [3.39,)