Skip to content

Commit 77dab55

Browse files
committed
releng: Fix legacy files for trace-event-logger and JustJ
Add trace-event-logger plug-in to legacy feature.xml files Add JustJ feature to legacy tracing.product files Add trace-event-logger bundle to legacy releng-site category.xml file
1 parent 383f3fe commit 77dab55

File tree

8 files changed

+32
-6
lines changed

8 files changed

+32
-6
lines changed

rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.23-e4.25/tracing.product

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
4+
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
55

66
<aboutInfo>
77
<image path="/org.eclipse.tracecompass.rcp.branding/icons/tc_about.png"/>
@@ -144,6 +144,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
144144
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
145145
<feature id="org.eclipse.tracecompass.tmf.cli"/>
146146
<feature id="org.eclipse.equinox.executable"/>
147+
<feature id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped" installMode="root"/>
147148
</features>
148149

149150
<configurations>
@@ -158,7 +159,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
158159
</configurations>
159160

160161
<repositories>
161-
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" enabled="true" />
162+
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" name="" enabled="true" />
162163
</repositories>
163164

164165
<preferencesInfo>

rcp/org.eclipse.tracecompass.rcp.product/legacy-e4.26-e4.29/tracing.product

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
4+
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
55

66
<aboutInfo>
77
<image path="/org.eclipse.tracecompass.rcp.branding/icons/tc_about.png"/>
@@ -144,6 +144,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
144144
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
145145
<feature id="org.eclipse.tracecompass.tmf.cli"/>
146146
<feature id="org.eclipse.equinox.executable"/>
147+
<feature id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped" installMode="root"/>
147148
</features>
148149

149150
<configurations>
@@ -158,7 +159,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
158159
</configurations>
159160

160161
<repositories>
161-
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" enabled="true" />
162+
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" name="" enabled="true" />
162163
</repositories>
163164

164165
<preferencesInfo>

rcp/org.eclipse.tracecompass.rcp.product/legacy/tracing.product

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
4+
<product name="Trace Compass" uid="org.eclipse.tracecompass.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="10.2.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
55

66
<aboutInfo>
77
<image path="/org.eclipse.tracecompass.rcp.branding/icons/tc_about.png"/>
@@ -144,6 +144,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
144144
<feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
145145
<feature id="org.eclipse.tracecompass.tmf.cli"/>
146146
<feature id="org.eclipse.equinox.executable"/>
147+
<feature id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped" installMode="root"/>
147148
</features>
148149

149150
<configurations>
@@ -158,7 +159,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
158159
</configurations>
159160

160161
<repositories>
161-
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" enabled="true" />
162+
<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository" name="" enabled="true" />
162163
</repositories>
163164

164165
<preferencesInfo>

rcp/org.eclipse.tracecompass.rcp/legacy-e4.30/feature.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,4 +673,11 @@
673673
version="0.0.0"
674674
unpack="false"/>
675675

676+
<plugin
677+
id="org.eclipse.tracecompass.trace-event-logger"
678+
download-size="0"
679+
install-size="0"
680+
version="0.0.0"
681+
unpack="false"/>
682+
676683
</feature>

rcp/org.eclipse.tracecompass.rcp/legacy-e4.32/feature.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,4 +433,8 @@
433433
id="org.eclipse.osgi.services"
434434
version="0.0.0"/>
435435

436+
<plugin
437+
id="org.eclipse.tracecompass.trace-event-logger"
438+
version="0.0.0"/>
439+
436440
</feature>

rcp/org.eclipse.tracecompass.rcp/legacy-e4.33/feature.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,4 +437,8 @@
437437
id="org.tukaani.xz"
438438
version="0.0.0"/>
439439

440+
<plugin
441+
id="org.eclipse.tracecompass.trace-event-logger"
442+
version="0.0.0"/>
443+
440444
</feature>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,4 +463,11 @@
463463
version="0.0.0"
464464
unpack="false"/>
465465

466+
<plugin
467+
id="org.eclipse.tracecompass.trace-event-logger"
468+
download-size="0"
469+
install-size="0"
470+
version="0.0.0"
471+
unpack="false"/>
472+
466473
</feature>

releng/org.eclipse.tracecompass.releng-site/legacy/category.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<feature url="features/org.eclipse.tracecompass.tmf.cli.source_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.tmf.cli.source" version="0.0.0"/>
3838
<bundle id="org.eclipse.tracecompass.common.core"/>
3939
<bundle id="org.eclipse.tracecompass.common.core.source"/>
40+
<bundle id="org.eclipse.tracecompass.trace-event-logger"/>
4041
<bundle id="org.apache.commons.lang3"/>
4142
<bundle id="org.json"/>
4243
<category-def name="Trace Compass" label="Trace Compass Main Features"/>

0 commit comments

Comments
 (0)