Skip to content

Commit f3c8cdf

Browse files
fedejeannefedejeanne
authored
Merge branch 'eclipse-platform:master' into master
2 parents 84d6fa3 + 09f28fb commit f3c8cdf

11 files changed

Lines changed: 98 additions & 64 deletions

File tree

‎JenkinsJobs/Releng/newStreamRepos.groovy‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,42 @@ pipeline {
159159
commitAllChangesExcludingSubmodules("Move previous version to ${PREVIOUS_RELEASE_CANDIDATE_TAG} in build scripts")
160160
}
161161
}
162+
stage ('Create New Stream Repos') {
163+
environment {
164+
ECLIPSE_EXE = installEclipsePlatformProduct("${PREVIOUS_RELEASE_CANDIDATE_ID}", "${PREVIOUS_RELEASE_CANDIDATE_TAG}")
165+
}
166+
steps {
167+
dir("${WORKSPACE}/target/repositories") {
168+
sshagent(['projects-storage.eclipse.org-bot-ssh']) {
169+
sh '''#!/bin/bash -xe
170+
epUpdatesDir='/home/data/httpd/download.eclipse.org/eclipse/updates'
171+
templateRepo="${epUpdatesDir}/template_repo"
172+
173+
releaseRepoName="${NEXT_RELEASE_VERSION}"
174+
iBuildRepoName="${NEXT_RELEASE_VERSION}-I-builds"
175+
yBuildRepoName="${NEXT_RELEASE_VERSION}-Y-builds"
176+
previousRCRepo="https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_VERSION}-I-builds/${PREVIOUS_RELEASE_CANDIDATE_I_BUILD}/"
177+
178+
# Copy the repo-template to this workspace to create the new I-build repo from it,
179+
# then add the previous release RC as only child and copy the resulting repo back to the download-server
180+
curl -o addToComposite.xml https://download.eclipse.org/eclipse/relengScripts/cje-production/scripts/addToComposite.xml
181+
scp -r genie.releng@projects-storage.eclipse.org:${templateRepo} template_repo/
182+
cp -r template_repo ${iBuildRepoName}
183+
184+
taskName='addToComposite'
185+
${ECLIPSE_EXE} -nosplash -consolelog -debug -data ./eclipse-ws \
186+
-application org.eclipse.ant.core.antRunner -file ${taskName}.xml \
187+
${taskName} -Drepodir=$(pwd)/${iBuildRepoName} -Dcomplocation=${previousRCRepo}
188+
if [[ ${DRY_RUN} == 'false' ]]; then
189+
scp -r ${iBuildRepoName} genie.releng@projects-storage.eclipse.org:${epUpdatesDir}/${iBuildRepoName}
190+
ssh genie.releng@projects-storage.eclipse.org cp -r ${templateRepo} ${epUpdatesDir}/${yBuildRepoName}
191+
ssh genie.releng@projects-storage.eclipse.org cp -r ${templateRepo} ${epUpdatesDir}/${releaseRepoName}
192+
fi
193+
'''
194+
}
195+
}
196+
}
197+
}
162198
stage('Deploy parent-pom and SDK-target') {
163199
// Deploy new parent first to ensure it's available when PRs for submodule updates are created.
164200
environment {
@@ -174,7 +210,7 @@ pipeline {
174210
stage('Push preparation branches') {
175211
steps {
176212
sshagent (['github-bot-ssh']) {
177-
sh '''
213+
sh '''#!/bin/bash -x
178214
function pushNewCommitsToPreparationBranch() {
179215
pushURL=$(git config remote.origin.url)
180216
# Switch to SSH, if the configured URL uses HTTPS (we can only push with SSH)
@@ -264,8 +300,17 @@ pipeline {
264300
}
265301
}
266302
}
303+
post {
304+
always {
305+
archiveArtifacts allowEmptyArchive: true, artifacts: '\
306+
target/repositories/**,\
307+
'
308+
}
309+
}
267310
}
268311

312+
// --- utility methods
313+
269314
@NonCPS
270315
def parseDate(String dateString) {
271316
return java.time.LocalDate.parse(dateString.trim()) // expects format 'yyyy-MM-dd'
@@ -294,6 +339,22 @@ def commitAllChangesExcludingSubmodules(String commitMessage) {
294339
}
295340
}
296341

342+
// build tools
343+
344+
def installEclipsePlatformProduct(String releaseID, String releaseVersion){
345+
def eclipseURL = "https://download.eclipse.org/eclipse/downloads/drops4/${releaseID}/eclipse-platform-${releaseVersion}-linux-gtk-x86_64.tar.gz"
346+
return install('eclipse-platform', eclipseURL) + '/eclipse'
347+
}
348+
349+
def install(String toolType, String url) {
350+
dir("${WORKSPACE}/target/tools/${toolType}") {
351+
sh "curl -L ${url} | tar -xzf -"
352+
return "${pwd()}/" + sh(script: 'ls', returnStdout: true).trim()
353+
}
354+
}
355+
356+
// Github API interactions
357+
297358
def listReposOfOrganization(String orga) {
298359
def response = queryGithubAPI('', "orgs/${orga}/repos", null)
299360
if (!(response instanceof List) && (response.errors || (response.status && response.status != 201))) {

‎RELEASE.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha
187187
This should move the current I-builds to run on the maintenance branch and create new I-builds for the next release.
188188
Performance and Unit tests should also be generated for the new release automatically.
189189

190-
#### **Create new Stream Repos:**
191-
- Run the [Create New Stream Repos](https://ci.eclipse.org/releng/job/Releng/job/newStreamRepos/) job to make an I-builds repo for the next release.
192-
193190
#### **Create Git Milestones for the next Release:**
194191

195192
Milestones are already created by running [`Prepare Next Development Cycle`](https://ci.eclipse.org/releng/job/Releng/job/prepareNextDevCycle/) job.

‎eclipse.jdt.core‎

Submodule eclipse.jdt.core updated 36 files

‎eclipse.jdt.ui‎

‎eclipse.pde‎

‎eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,24 @@
1818
<!-- needed because org.eclipse.jdt.feature.group includes it, but it should include org.hamcrest (direct-from-maven) instead -->
1919
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
2020

21-
<unit id="org.apache.lucene.core" version="10.2.1.v20250501-1000"/>
22-
<unit id="org.apache.lucene.analysis-smartcn" version="10.2.1.v20250501-1000"/>
23-
<unit id="org.apache.lucene.analysis-common" version="10.2.1.v20250501-1000"/>
21+
<unit id="org.apache.lucene.core" version="10.2.2.v20250621-0700"/>
22+
<unit id="org.apache.lucene.analysis-smartcn" version="10.2.2.v20250621-0700"/>
23+
<unit id="org.apache.lucene.analysis-common" version="10.2.2.v20250621-0700"/>
2424

2525
<!-- This version contains with notarized *.jnilib -->
2626
<unit id="com.sun.jna" version="5.17.0.v20250316-1700"/>
2727

2828
<!-- Batik dependencies -->
2929
<unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20240917-0534"/>
3030

31-
<!-- Markdown support for JEP 467 -->
32-
<unit id="org.commonmark" version="0.24.0.v20241021-1700"/>
33-
<unit id="org.commonmark-gfm-tables" version="0.24.0.v20241021-1700"/>
34-
3531
<!-- ECF -->
3632
<unit id="org.apache.httpcomponents.client5.httpclient5" version="5.5.0.v20250522-2300"/>
3733
<unit id="org.apache.httpcomponents.client5.httpclient5-win" version="5.2.3.v20231203-1619"/>
3834
<unit id="org.apache.httpcomponents.core5.httpcore5" version="5.3.4.v20250320-1400"/>
3935
<unit id="org.apache.httpcomponents.core5.httpcore5-h2" version="5.3.4.v20250320-1400"/>
4036

4137
<!-- This is the "normal" Orbit repository is expected to be updated on milestones and releases based on Orbit deliveries. -->
42-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.36.0"/>
38+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202506211357"/>
4339
</location>
4440

4541
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -75,15 +71,15 @@
7571
-->
7672
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
7773
<repository location="https://download.eclipse.org/tools/cdt/releases/12.1/cdt-12.1.0"/>
78-
<unit id="org.eclipse.cdt.core.native" version="6.4.0.202505200054" />
79-
<unit id="org.eclipse.cdt.core.linux" version="6.1.100.202402230238" />
80-
<unit id="org.eclipse.cdt.core.linux.x86_64" version="12.1.0.202506041907" />
81-
<unit id="org.eclipse.cdt.core.linux.ppc64le" version="12.1.0.202506041907" />
82-
<unit id="org.eclipse.cdt.core.linux.aarch64" version="12.1.0.202506041907" />
83-
<unit id="org.eclipse.cdt.core.macosx" version="12.1.0.202506041907" />
84-
<unit id="org.eclipse.cdt.core.win32" version="6.1.200.202505191828" />
85-
<unit id="org.eclipse.cdt.core.win32.x86_64" version="12.1.0.202506041907" />
86-
<unit id="org.eclipse.cdt.core.win32.aarch64" version="12.1.0.202506041907" />
74+
<unit id="org.eclipse.cdt.core.native" version="6.4.0.202505200054"/>
75+
<unit id="org.eclipse.cdt.core.linux" version="6.1.100.202402230238"/>
76+
<unit id="org.eclipse.cdt.core.linux.x86_64" version="12.1.0.202506041907"/>
77+
<unit id="org.eclipse.cdt.core.linux.ppc64le" version="12.1.0.202506041907"/>
78+
<unit id="org.eclipse.cdt.core.linux.aarch64" version="12.1.0.202506041907"/>
79+
<unit id="org.eclipse.cdt.core.macosx" version="12.1.0.202506041907"/>
80+
<unit id="org.eclipse.cdt.core.win32" version="6.1.200.202505191828"/>
81+
<unit id="org.eclipse.cdt.core.win32.x86_64" version="12.1.0.202506041907"/>
82+
<unit id="org.eclipse.cdt.core.win32.aarch64" version="12.1.0.202506041907"/>
8783
</location>
8884

8985
<!-- uncomment 'eclipse_home' location, with text editor, for use in Eclipse IDE
@@ -180,7 +176,7 @@
180176
<dependency>
181177
<groupId>org.jsoup</groupId>
182178
<artifactId>jsoup</artifactId>
183-
<version>1.20.1</version>
179+
<version>1.21.1</version>
184180
<type>jar</type>
185181
</dependency>
186182
<dependency>
@@ -887,6 +883,23 @@
887883
</dependency>
888884
</dependencies>
889885
</location>
886+
<!-- Markdown support for JEP 467 -->
887+
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="commonmark" missingManifest="error" type="Maven">
888+
<dependencies>
889+
<dependency>
890+
<groupId>org.commonmark</groupId>
891+
<artifactId>commonmark</artifactId>
892+
<version>0.25.0</version>
893+
<type>jar</type>
894+
</dependency>
895+
<dependency>
896+
<groupId>org.commonmark</groupId>
897+
<artifactId>commonmark-ext-gfm-tables</artifactId>
898+
<version>0.25.0</version>
899+
<type>jar</type>
900+
</dependency>
901+
</dependencies>
902+
</location>
890903
</locations>
891904
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
892905
</target>

‎eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
<mavenMappings namePattern="(org\.eclipse\.pde)(.*)" groupId="$1" artifactId="$1$2" snapshot="false"/>
3333
<mavenMappings namePattern="(org\.eclipse)((?!(\.emf|\.jetty|\.ecf|\.orbit)).*)$" groupId="$1.platform" artifactId="$1$2" snapshot="false"/>
3434
<mavenMappings namePattern="(com\.jcraft)\.(.*)" groupId="$1" artifactId="$2"/>
35-
<mavenMappings namePattern="(org\.(commonmark))" groupId="$1" artifactId="$2"/>
36-
<mavenMappings namePattern="(org\.(commonmark))(.*)" groupId="$1" artifactId="$2-ext$3"/>
3735
<mavenMappings namePattern="javax\.annotation" groupId="jakarta.annotation" artifactId="jakarta.annotation-api"/>
3836
<mavenMappings namePattern="(javax.inject)" groupId="$1" artifactId="$1" versionPattern="([^.]+)\.0(?:\..*)?" versionTemplate="$1"/>
3937
<mavenMappings namePattern="org\.apache\.lucene\.(.*)" groupId="org.apache.lucene" artifactId="lucene-$1"/>

‎eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggran‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
xmlns:analyzer="https://www.eclipse.org/cbi/p2repo/2021/aggregator/analyzer"
66
exclusion="org.eclipse.test.performance.*|eclipse-junit-tests|tooling.*|.*\.feature\.group|.*\.feature\.jar|.*.\.tests?(.source)?|.*\.tests\..*|org.eclipse.equinox.executable.*|org.eclipse.*.unittest.junit(.source)?|org.eclipse.platform.ide.executable.*|org.eclipse.platform.sdk.executable.*|org.eclipse.unittest.ui|org.eclipse.rcp\..*|org.eclipse.platform.ide|org.eclipse.platform.sdk|org.eclipse.sdk.ide.*|.*_root|(?!.*(org\.eclipse\.)).*|org.eclipse.emf.*|org.eclipse.jetty.*|org.eclipse.ecf.*|org.eclipse.orbit.*"
77
aggregation="SDK4Mvn.aggr#/">
8-
<contribution
9-
contribution="SDK4Mvn.aggr#//@validationSets[label='main']/@contributions[label='sdk']"/>
108
<contribution
119
contribution="SDK4Mvn.aggr#//@validationSets[label='main']/@contributions[label='sdk_http']"/>
1210
</analyzer:Analysis>

‎eclipse.platform.swt‎

0 commit comments

Comments
 (0)