Skip to content

Commit 206b2b6

Browse files
fedejeannefedejeanne
authored
Merge branch 'eclipse-platform:master' into master
2 parents 327616e + b7dc3cb commit 206b2b6

12 files changed

Lines changed: 12 additions & 57 deletions

File tree

‎JenkinsJobs/Releng/publishToMaven.jenkinsfile‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
pipeline {
32
options {
43
timestamps()
54
timeout(time: 120, unit: 'MINUTES')
6-
buildDiscarder(logRotator(numToKeepStr:'10'))
5+
buildDiscarder(logRotator(numToKeepStr:'10', artifactNumToKeepStr:'2'))
76
checkoutToSubdirectory('git-repo')
87
}
98
agent {
@@ -12,10 +11,10 @@ pipeline {
1211
tools {
1312
jdk 'temurin-jdk21-latest'
1413
maven 'apache-maven-latest'
14+
maven 'maven-daemon'
1515
}
1616
environment {
1717
REPO = "${WORKSPACE}/repo"
18-
PATH = "${installMavenDaemon('1.0.2')}/bin:${PATH}"
1918
CBI_AGGR = "${installLatestCbiAggr()}"
2019
// Folder ~/.m2 is not writable for builds, ensure mvnd metadata are written within the workspace.
2120
// prevent jline warning about inability to create a system terminal and increase keep-alive timeouts to increase stability in concurrent usage
@@ -168,20 +167,14 @@ pipeline {
168167
repo/**, \
169168
coordinates*.txt, artifacts*.txt'
170169
}
171-
unsuccessful {
170+
failure {
172171
emailext subject: "Publication of Maven artifacts failed",
173172
body: "Please go to ${BUILD_URL}console and check the build failure.", mimeType: 'text/plain',
174173
to: 'platform-releng-dev@eclipse.org', from:'genie.releng@eclipse.org'
175174
}
176175
}
177176
}
178177

179-
def installMavenDaemon(String version) {
180-
// Temporary workaround, until https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/6241#note_4109878 is really resolved
181-
return install('mvnd', 'https://download.eclipse.org/oomph/archive/maven-mvnd-1.0.2-linux-amd64.tar.gz')
182-
}
183-
184-
185178
def installLatestCbiAggr(){
186179
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'
187180
}

‎eclipse-platform-parent/pom.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
<artifactId>eclipse-platform-parent</artifactId>
2222
<version>4.37.0-SNAPSHOT</version>
2323
<packaging>pom</packaging>
24-
<!--
25-
See maven-enforcer-plugin configuration to actually break the build if
26-
run with older maven.
27-
prerequisites section is kept for now as even if it doesn't break the build, it
28-
is used by other plugins like versions-maven-plugin which check and warn
29-
for using plugins with older than they require Maven version.
30-
If version number changed in one place, be sure to change in the other.
31-
-->
3224
<prerequisites>
3325
<maven>3.9.9</maven>
3426
</prerequisites>
@@ -313,34 +305,6 @@
313305
</execution>
314306
</executions>
315307
</plugin>
316-
<plugin>
317-
<!--
318-
This maven-enforcer-plugin configuration to actually break the build if
319-
run with older maven.
320-
prerequisites section is kept for now as even if it doesn't break the build, it
321-
is used by other plugins like versions-maven-plugin which check and warn
322-
for using plugins with older than they require Maven version.
323-
If version number changed in one place, be sure to change in the other.
324-
-->
325-
<groupId>org.apache.maven.plugins</groupId>
326-
<artifactId>maven-enforcer-plugin</artifactId>
327-
<version>3.6.0</version>
328-
<executions>
329-
<execution>
330-
<id>enforce-maven</id>
331-
<goals>
332-
<goal>enforce</goal>
333-
</goals>
334-
<configuration>
335-
<rules>
336-
<requireMavenVersion>
337-
<version>3.9.0</version>
338-
</requireMavenVersion>
339-
</rules>
340-
</configuration>
341-
</execution>
342-
</executions>
343-
</plugin>
344308
<plugin>
345309
<groupId>org.eclipse.tycho.extras</groupId>
346310
<artifactId>tycho-p2-extras-plugin</artifactId>

‎eclipse.jdt.core‎

Submodule eclipse.jdt.core updated 46 files

‎eclipse.jdt.debug‎

‎eclipse.jdt.ui‎

Submodule eclipse.jdt.ui updated 19 files

‎eclipse.pde‎

Submodule eclipse.pde updated 29 files

‎eclipse.platform‎

Submodule eclipse.platform updated 136 files

‎eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<feature id="org.eclipse.sdk.tests" version="0.0.0"/>
44
<feature id="org.eclipse.equinox.p2.sdk" version="0.0.0"/>
55
<feature id="org.eclipse.equinox.p2.discovery.feature" version="0.0.0"/>
6-
<feature id="org.eclipse.equinox.p2.discovery.feature.source" version="0.0.0"/>
76
<feature id="org.eclipse.core.runtime.feature" version="0.0.0"/>
87
<feature id="org.eclipse.equinox.sdk" version="0.0.0"/>
98
<feature id="org.eclipse.sdk.examples.source" version="0.0.0"/>
@@ -14,7 +13,6 @@
1413
<feature id="org.eclipse.e4.tools.persistence.feature" version="0.0.0"/>
1514
<feature id="org.eclipse.pde.unittest.junit" version="0.0.0"/>
1615
<feature id="org.eclipse.tips.feature" version="0.0.0"/>
17-
<feature id="org.eclipse.tips.feature.source" version="0.0.0"/>
1816
<feature id="org.eclipse.jdt.ui.unittest.junit.feature" version="0.0.0"/>
1917
<feature id="org.eclipse.terminal.feature"/>
2018
<bundle id="jakarta.annotation-api" version="1.3.5"/>

‎eclipse.platform.swt‎

Submodule eclipse.platform.swt updated 12 files

‎eclipse.platform.ui‎

0 commit comments

Comments
 (0)