Skip to content

Commit 501e408

Browse files
PatrickTassePatrickTasse
committed
releng: Add e4.36 and update eStaging targets for 2025-06 M1
Specify fixed version of org.mortbay.jasper.apache-jsp in the target files instead of the RCP feature.xml. Update e4.35 target for this, but not older targets since they have their own legacy version of the RCP feature.xml. Upgrade trace-event-logger library version to 0.4.1 for all targets. Signed-off-by: Patrick Tasse <[email protected]>
1 parent 3923557 commit 501e408

19 files changed

+164
-43
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287

288288
<plugin
289289
id="org.mortbay.jasper.apache-jsp"
290-
version="9.0.96"/>
290+
version="0.0.0"/>
291291

292292
<plugin
293293
id="com.google.guava.failureaccess"
@@ -407,7 +407,7 @@
407407

408408
<plugin
409409
id="org.mortbay.jasper.apache-el"
410-
version="9.0.96"/>
410+
version="0.0.0"/>
411411

412412
<plugin
413413
id="jakarta.el-api"

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target‎

Lines changed: 2 additions & 2 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.20" sequenceNumber="21">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.20" sequenceNumber="22">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>org.eclipse.tracecompass</groupId>
100100
<artifactId>trace-event-logger</artifactId>
101-
<version>0.4.0</version>
101+
<version>0.4.1</version>
102102
<type>jar</type>
103103
</dependency>
104104
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target‎

Lines changed: 2 additions & 2 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.21" sequenceNumber="23">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.21" sequenceNumber="24">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>org.eclipse.tracecompass</groupId>
100100
<artifactId>trace-event-logger</artifactId>
101-
<version>0.4.0</version>
101+
<version>0.4.1</version>
102102
<type>jar</type>
103103
</dependency>
104104
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target‎

Lines changed: 2 additions & 2 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.22" sequenceNumber="23">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.22" sequenceNumber="24">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>org.eclipse.tracecompass</groupId>
100100
<artifactId>trace-event-logger</artifactId>
101-
<version>0.4.0</version>
101+
<version>0.4.1</version>
102102
<type>jar</type>
103103
</dependency>
104104
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target‎

Lines changed: 2 additions & 2 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.23" sequenceNumber="21">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.23" sequenceNumber="22">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>org.eclipse.tracecompass</groupId>
100100
<artifactId>trace-event-logger</artifactId>
101-
<version>0.4.0</version>
101+
<version>0.4.1</version>
102102
<type>jar</type>
103103
</dependency>
104104
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target‎

Lines changed: 2 additions & 2 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.24" sequenceNumber="21">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.24" sequenceNumber="22">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>org.eclipse.tracecompass</groupId>
101101
<artifactId>trace-event-logger</artifactId>
102-
<version>0.4.0</version>
102+
<version>0.4.1</version>
103103
<type>jar</type>
104104
</dependency>
105105
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target‎

Lines changed: 2 additions & 2 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.25" sequenceNumber="20">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.25" sequenceNumber="21">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>org.eclipse.tracecompass</groupId>
101101
<artifactId>trace-event-logger</artifactId>
102-
<version>0.4.0</version>
102+
<version>0.4.1</version>
103103
<type>jar</type>
104104
</dependency>
105105
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target‎

Lines changed: 2 additions & 2 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.26" sequenceNumber="15">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.26" sequenceNumber="16">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -101,7 +101,7 @@
101101
<dependency>
102102
<groupId>org.eclipse.tracecompass</groupId>
103103
<artifactId>trace-event-logger</artifactId>
104-
<version>0.4.0</version>
104+
<version>0.4.1</version>
105105
<type>jar</type>
106106
</dependency>
107107
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target‎

Lines changed: 2 additions & 2 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.27" sequenceNumber="13">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.27" sequenceNumber="14">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>org.eclipse.tracecompass</groupId>
9797
<artifactId>trace-event-logger</artifactId>
98-
<version>0.4.0</version>
98+
<version>0.4.1</version>
9999
<type>jar</type>
100100
</dependency>
101101
</dependencies>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target‎

Lines changed: 2 additions & 2 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.28" sequenceNumber="14">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.28" sequenceNumber="15">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>org.eclipse.tracecompass</groupId>
9494
<artifactId>trace-event-logger</artifactId>
95-
<version>0.4.0</version>
95+
<version>0.4.1</version>
9696
<type>jar</type>
9797
</dependency>
9898
</dependencies>

0 commit comments

Comments
 (0)