Skip to content

Commit fe50f3f

Browse files
committed
releng: Update e4.36 and eStaging targets for 2025-06 M2
Signed-off-by: Patrick Tasse <[email protected]>
1 parent 5757c76 commit fe50f3f

File tree

3 files changed

+21
-39
lines changed

3 files changed

+21
-39
lines changed

rcp/org.eclipse.tracecompass.rcp/staging/feature.xml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@
237237
id="org.apache.felix.scr"
238238
version="0.0.0"/>
239239

240-
<plugin
241-
id="org.apache.commons.jxpath"
242-
version="0.0.0"/>
243-
244240
<plugin
245241
id="com.sun.jna"
246242
version="0.0.0"/>
@@ -287,14 +283,14 @@
287283

288284
<plugin
289285
id="org.mortbay.jasper.apache-jsp"
290-
version="9.0.96"/>
286+
version="0.0.0"/>
291287

292288
<plugin
293289
id="com.google.guava.failureaccess"
294290
version="0.0.0"/>
295291

296292
<plugin
297-
id="org.apache.commons.logging"
293+
id="org.apache.commons.commons-logging"
298294
version="0.0.0"/>
299295

300296
<plugin
@@ -407,7 +403,7 @@
407403

408404
<plugin
409405
id="org.mortbay.jasper.apache-el"
410-
version="9.0.96"/>
406+
version="0.0.0"/>
411407

412408
<plugin
413409
id="jakarta.el-api"
@@ -442,23 +438,11 @@
442438
version="0.0.0"/>
443439

444440
<plugin
445-
id="org.apache.commons.jxpath"
446-
version="0.0.0"/>
447-
448-
<plugin
449-
id="org.apache.commons.commons-beanutils"
450-
version="0.0.0"/>
451-
452-
<plugin
453-
id="org.apache.commons.collections"
454-
version="0.0.0"/>
455-
456-
<plugin
457-
id="org.jdom"
441+
id="org.eclipse.launchbar.core"
458442
version="0.0.0"/>
459443

460444
<plugin
461-
id="org.eclipse.launchbar.core"
445+
id="com.github.weisj.jsvg"
462446
version="0.0.0"/>
463447

464448
<plugin

releng/org.eclipse.tracecompass.target/tracecompass-e4.36.target

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.36" sequenceNumber="1">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.36" sequenceNumber="2">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/"/>
@@ -11,7 +11,7 @@
1111
<unit id="org.eclipse.remote.ui" version="0.0.0"/>
1212
<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
1313
<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
14-
<repository location="https://download.eclipse.org/tools/cdt/releases/12.0/cdt-12.0.0/"/>
14+
<repository location="https://download.eclipse.org/tools/cdt/builds/12.1/cdt-12.1.0-m2/"/>
1515
</location>
1616
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1717
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -24,7 +24,7 @@
2424
<unit id="bcprov" version="0.0.0"/>
2525
<unit id="ch.qos.logback.classic" version="0.0.0"/>
2626
<unit id="com.google.gson" version="0.0.0"/>
27-
<unit id="com.google.guava" version="33.4.6.jre"/>
27+
<unit id="com.google.guava" version="33.4.8.jre"/>
2828
<unit id="jakarta.activation-api" version="1.2.2"/>
2929
<unit id="jakarta.annotation-api" version="1.3.5"/>
3030
<unit id="jakarta.el-api" version="5.0.1"/>
@@ -37,15 +37,14 @@
3737
<unit id="org.apache.commons.cli" version="0.0.0"/>
3838
<unit id="org.apache.commons.commons-compress" version="0.0.0"/>
3939
<unit id="org.apache.commons.commons-io" version="0.0.0"/>
40-
<unit id="org.apache.commons.jxpath" version="0.0.0"/>
4140
<unit id="org.apache.commons.lang" version="0.0.0"/>
4241
<unit id="org.apache.commons.lang3" version="0.0.0"/>
4342
<unit id="org.apache.xml.serializer" version="0.0.0"/>
4443
<unit id="org.mortbay.jasper.apache-jsp" version="9.0.102"/>
4544
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
4645
<unit id="slf4j.api" version="0.0.0"/>
4746
<unit id="slf4j.simple" version="0.0.0"/>
48-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202504030806/"/>
47+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202505070543/"/>
4948
</location>
5049
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
5150
<unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -73,7 +72,7 @@
7372
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
7473
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
7574
<unit id="org.eclipse.osgi.services" version="0.0.0"/>
76-
<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250403-1800/"/>
75+
<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250507-1010/"/>
7776
</location>
7877
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
7978
<unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -83,11 +82,11 @@
8382
<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
8483
<unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
8584
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
86-
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.38.0/S-3.38M1-20250408014054/repository/"/>
85+
<repository location="https://download.eclipse.org/webtools/CI/3.38.0/20250423073756/repository/"/>
8786
</location>
8887
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
8988
<unit id="org.eclipse.xsd" version="0.0.0"/>
90-
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202504011014/"/>
89+
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202504150944/"/>
9190
</location>
9291
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
9392
<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
@@ -106,7 +105,7 @@
106105
<dependency>
107106
<groupId>org.eclipse.tracecompass</groupId>
108107
<artifactId>trace-event-logger</artifactId>
109-
<version>0.4.1</version>
108+
<version>0.5.0</version>
110109
<type>jar</type>
111110
</dependency>
112111
</dependencies>

releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="251">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="252">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/"/>
@@ -11,7 +11,7 @@
1111
<unit id="org.eclipse.remote.ui" version="0.0.0"/>
1212
<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
1313
<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
14-
<repository location="https://download.eclipse.org/tools/cdt/releases/12.0/cdt-12.0.0/"/>
14+
<repository location="https://download.eclipse.org/tools/cdt/builds/12.1/cdt-12.1.0-m2/"/>
1515
</location>
1616
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1717
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -24,7 +24,7 @@
2424
<unit id="bcprov" version="0.0.0"/>
2525
<unit id="ch.qos.logback.classic" version="0.0.0"/>
2626
<unit id="com.google.gson" version="0.0.0"/>
27-
<unit id="com.google.guava" version="33.4.6.jre"/>
27+
<unit id="com.google.guava" version="33.4.8.jre"/>
2828
<unit id="jakarta.activation-api" version="1.2.2"/>
2929
<unit id="jakarta.annotation-api" version="1.3.5"/>
3030
<unit id="jakarta.el-api" version="5.0.1"/>
@@ -37,15 +37,14 @@
3737
<unit id="org.apache.commons.cli" version="0.0.0"/>
3838
<unit id="org.apache.commons.commons-compress" version="0.0.0"/>
3939
<unit id="org.apache.commons.commons-io" version="0.0.0"/>
40-
<unit id="org.apache.commons.jxpath" version="0.0.0"/>
4140
<unit id="org.apache.commons.lang" version="0.0.0"/>
4241
<unit id="org.apache.commons.lang3" version="0.0.0"/>
4342
<unit id="org.apache.xml.serializer" version="0.0.0"/>
4443
<unit id="org.mortbay.jasper.apache-jsp" version="9.0.102"/>
4544
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
4645
<unit id="slf4j.api" version="0.0.0"/>
4746
<unit id="slf4j.simple" version="0.0.0"/>
48-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202504030806/"/>
47+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202505070543/"/>
4948
</location>
5049
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
5150
<unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -73,7 +72,7 @@
7372
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
7473
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
7574
<unit id="org.eclipse.osgi.services" version="0.0.0"/>
76-
<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250403-1800/"/>
75+
<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250507-1010/"/>
7776
</location>
7877
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
7978
<unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -83,11 +82,11 @@
8382
<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
8483
<unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
8584
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
86-
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.38.0/S-3.38M1-20250408014054/repository/"/>
85+
<repository location="https://download.eclipse.org/webtools/CI/3.38.0/20250423073756/repository/"/>
8786
</location>
8887
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
8988
<unit id="org.eclipse.xsd" version="0.0.0"/>
90-
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202504011014/"/>
89+
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202504150944/"/>
9190
</location>
9291
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
9392
<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
@@ -106,7 +105,7 @@
106105
<dependency>
107106
<groupId>org.eclipse.tracecompass</groupId>
108107
<artifactId>trace-event-logger</artifactId>
109-
<version>0.4.1</version>
108+
<version>0.5.0</version>
110109
<type>jar</type>
111110
</dependency>
112111
</dependencies>

0 commit comments

Comments
 (0)