Skip to content

Commit e8e8131

Browse files
PatrickTassePatrickTasse
committed
releng: Downgrade org.mozilla.rhino to org.mozilla.javascript
Use older version of org.mozilla.javascript for compatibility with incubator EASE Scripting feature. Fixes #116 Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
1 parent 9902828 commit e8e8131

6 files changed

Lines changed: 33 additions & 10 deletions

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
version="0.0.0"/>
231231

232232
<plugin
233-
id="org.mozilla.rhino"
233+
id="org.mozilla.javascript"
234234
version="0.0.0"/>
235235

236236
<plugin
@@ -429,4 +429,8 @@
429429
id="org.osgi.service.component.annotations"
430430
version="0.0.0"/>
431431

432+
<plugin
433+
id="org.eclipse.osgi.services"
434+
version="0.0.0"/>
435+
432436
</feature>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
unpack="false"/>
381381

382382
<plugin
383-
id="org.mozilla.rhino"
383+
id="org.mozilla.javascript"
384384
download-size="0"
385385
install-size="0"
386386
version="0.0.0"

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

Lines changed: 6 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.30" sequenceNumber="5">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.30" sequenceNumber="6">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -36,12 +36,16 @@
3636
<unit id="org.apache.xml.serializer" version="0.0.0"/>
3737
<unit id="org.hamcrest" version="0.0.0"/>
3838
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
39-
<unit id="org.mozilla.rhino" version="1.7.14"/>
39+
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
4040
<unit id="slf4j.api" version="0.0.0"/>
4141
<unit id="slf4j.simple" version="0.0.0"/>
4242
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/"/>
4343
</location>
4444
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
45+
<unit id="org.mozilla.javascript" version="0.0.0"/>
46+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0/"/>
47+
</location>
48+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4549
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
4650
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
4751
</location>

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

Lines changed: 7 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.31" sequenceNumber="5">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.31" sequenceNumber="6">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -18,6 +18,7 @@
1818
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1919
<unit id="bcpg" version="0.0.0"/>
2020
<unit id="bcprov" version="0.0.0"/>
21+
<unit id="bcutil" version="0.0.0"/>
2122
<unit id="ch.qos.logback.classic" version="0.0.0"/>
2223
<unit id="com.google.gson" version="0.0.0"/>
2324
<unit id="com.google.guava" version="33.0.0.jre"/>
@@ -38,12 +39,16 @@
3839
<unit id="org.apache.xml.serializer" version="0.0.0"/>
3940
<unit id="org.hamcrest" version="0.0.0"/>
4041
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
41-
<unit id="org.mozilla.rhino" version="1.7.14"/>
42+
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
4243
<unit id="slf4j.api" version="0.0.0"/>
4344
<unit id="slf4j.simple" version="0.0.0"/>
4445
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0/"/>
4546
</location>
4647
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48+
<unit id="org.mozilla.javascript" version="0.0.0"/>
49+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0/"/>
50+
</location>
51+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4752
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
4853
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
4954
</location>

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

Lines changed: 7 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.32" sequenceNumber="5">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.32" sequenceNumber="6">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -37,12 +37,16 @@
3737
<unit id="org.apache.commons.lang3" version="0.0.0"/>
3838
<unit id="org.apache.xml.serializer" version="0.0.0"/>
3939
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
40-
<unit id="org.mozilla.rhino" version="1.7.15"/>
40+
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
4141
<unit id="slf4j.api" version="0.0.0"/>
4242
<unit id="slf4j.simple" version="0.0.0"/>
4343
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0/"/>
4444
</location>
4545
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
46+
<unit id="org.mozilla.javascript" version="0.0.0"/>
47+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0/"/>
48+
</location>
49+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4650
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
4751
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
4852
</location>
@@ -63,6 +67,7 @@
6367
<unit id="org.eclipse.ui.views.log" version="0.0.0"/>
6468
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
6569
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
70+
<unit id="org.eclipse.osgi.services" version="0.0.0"/>
6671
<repository location="https://download.eclipse.org/eclipse/updates/4.32/R-4.32-202406010610/"/>
6772
</location>
6873
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

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

Lines changed: 7 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-eStaging" sequenceNumber="232">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="233">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -37,12 +37,16 @@
3737
<unit id="org.apache.commons.lang3" version="0.0.0"/>
3838
<unit id="org.apache.xml.serializer" version="0.0.0"/>
3939
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
40-
<unit id="org.mozilla.rhino" version="1.7.15"/>
40+
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
4141
<unit id="slf4j.api" version="0.0.0"/>
4242
<unit id="slf4j.simple" version="0.0.0"/>
4343
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0/"/>
4444
</location>
4545
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
46+
<unit id="org.mozilla.javascript" version="0.0.0"/>
47+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0/"/>
48+
</location>
49+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4650
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
4751
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
4852
</location>
@@ -63,6 +67,7 @@
6367
<unit id="org.eclipse.ui.views.log" version="0.0.0"/>
6468
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
6569
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
70+
<unit id="org.eclipse.osgi.services" version="0.0.0"/>
6671
<repository location="https://download.eclipse.org/eclipse/updates/4.32/R-4.32-202406010610/"/>
6772
</location>
6873
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

0 commit comments

Comments
 (0)