Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use org.mozilla.rhino instead of org.mozilla.javascript #1567

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Use org.mozilla.rhino instead of org.mozilla.javascript #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions UI/org.eclipse.birt.report.debug.core/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="org/mozilla/javascript/debug/**"/>
merks marked this conversation as resolved.
Show resolved Hide resolved
</accessrules>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 1 addition & 1 deletion UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ United States, other countries, or both.
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.eclipse.update.configurator"/>
<plugin id="org.mozilla.javascript"/>
<plugin id="org.mozilla.rhino"/>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
<plugin id="org.eclipse.orbit.xml-apis-ext"/>
Expand Down
2 changes: 1 addition & 1 deletion UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ United States, other countries, or both.
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.eclipse.update.configurator"/>
<plugin id="org.mozilla.javascript"/>
<plugin id="org.mozilla.rhino"/>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
<plugin id="org.eclipse.orbit.xml-apis-ext"/>
Expand Down
1 change: 0 additions & 1 deletion build/birt-packages/birt-runtime-osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<version>${tycho.version}</version>
<configuration>
<pomDependencies>consider</pomDependencies>
<includePackedArtifacts>false</includePackedArtifacts>
<environments>
<environment>
<os>win32</os>
Expand Down
4 changes: 2 additions & 2 deletions build/org.eclipse.birt.api/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
</copy>
<copy todir="${LIB_DIR}">
<fileset dir="${PRODUCT_DIR}/plugins">
<include name="org.mozilla.javascript_*.jar" />
<include name="org.mozilla.rhino_*.jar" />
</fileset>
<globmapper from="org.mozilla.javascript_*.jar" to="js.jar" />
<globmapper from="org.mozilla.rhino_*.jar" to="js.jar" />
</copy>
<antcall target="build-odadesign-api" />
<antcall target="build-odaconnectivity-api" />
Expand Down
4 changes: 2 additions & 2 deletions ...org.eclipse.birt.releng.birtbuilder/eclipse/buildConfigs/birt/tools/BIRTDownloadSetup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<include name="org.eclipse.birt.chart_*/**" />
<include name="org.eclipse.birt.core_*.jar" />
<include name="org.eclipse.birt.core.ui_*.jar" />
<include name="org.mozilla.javascript_*/**" />
<include name="org.mozilla.rhino_*/**" />
<include name="org.apache.commons.codec_*.jar" />
</patternset>

Expand Down Expand Up @@ -171,7 +171,7 @@
<exclude name="com.lowagie.itext_*/**" />
<exclude name="org.apache.commons.codec_*/**" />
<exclude name="org.w3c.sac_*/**" />
<exclude name="org.mozilla.javascript*/**" />
<exclude name="org.mozilla.rhino*/**" />
<exclude name="org.eclipse.birt.chart.runtime*/**" />
<exclude name="org.eclipse.birt.crosstab*/**" />
<exclude name="org.eclipse.birt.report.data.oda.jdbc*/**" />
Expand Down
16 changes: 0 additions & 16 deletions build/org.eclipse.birt.sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,6 @@
</dependency>
</dependencies>

<!-- <include name="coreapi.jar" /> <include name="dteapi.jar" /> <include
name="dataaggregationapi.jar" /> <include name="modelapi.jar" /> <include
name="modelodaapi.jar" /> "../org.eclipse.birt.report.model.adapter.oda/lib"
<include name="odadesignapi.jar" /> <include name="scriptapi.jar" /> <include
name="dataextraction.jar" /> <include name="dataadapterapi.jar" /> <include
name="crosstabcoreapi.jar" /> <include name="emitterconfig.jar" /> <include
name="chartitemapi.jar" /> <include name="chartexamplescoreapi.jar" /> <fileset
dir="../org.w3c.sac/lib"> <include name="*.jar" /> </fileset> <include name="com.ibm.icu_*.jar"
/> <include name="org.eclipse.emf.common_*.jar" /> <include name="org.eclipse.emf.ecore.xmi_*.jar"
/> <include name="org.eclipse.emf.ecore_*.jar" /> <include name="org.eclipse.birt.axis.overlay_*.jar"
/> <mapper type="regexp" from="org.eclipse.birt.chart.engine_.*.jar" to="chartengineapi.jar"/>
<mapper type="regexp" from="org.mozilla.javascript_.*.jar" to="js.jar"/>
<include name="javax.servlet*.jar"/> <include name="org.w3c.css.sac_*.jar"/>
<include name="org.apache.commons.codec_*.jar"/> <include name="commons-cli*.jar"
/> -->

<build>
<plugins>
<plugin>
Expand Down
6 changes: 3 additions & 3 deletions build/org.eclipse.birt.target/org.eclipse.birt.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="Generated from BIRT" sequenceNumber="30">
<target name="Generated from BIRT" sequenceNumber="31">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="bcpg" version="0.0.0"/>
Expand Down Expand Up @@ -98,7 +98,6 @@
<unit id="org.eclipse.jetty.ee8.webapp" version="0.0.0"/>
<unit id="org.eclipse.jetty.http" version="0.0.0"/>
<unit id="org.eclipse.jetty.io" version="0.0.0"/>
<unit id="org.eclipse.jetty.logging" version="0.0.0"/>
<unit id="org.eclipse.jetty.osgi" version="0.0.0"/>
<unit id="org.eclipse.jetty.plus" version="0.0.0"/>
<unit id="org.eclipse.jetty.security" version="0.0.0"/>
Expand All @@ -123,12 +122,13 @@
<unit id="org.mongodb.mongo-java-driver" version="0.0.0"/>
<unit id="org.mortbay.jasper.apache-el" version="9.0.83"/>
<unit id="org.mortbay.jasper.apache-jsp" version="9.0.83"/>
<unit id="org.mozilla.javascript" version="0.0.0"/>
<unit id="org.mozilla.rhino" version="0.0.0"/>
<unit id="org.objectweb.asm.commons" version="0.0.0"/>
<unit id="org.osgi.service.coordinator" version="0.0.0"/>
<unit id="org.osgi.service.repository" version="0.0.0"/>
<unit id="org.osgi.util.tracker" version="0.0.0"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<repository location="https://download.eclipse.org/cbi/updates/license"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
<repository location="https://download.eclipse.org/oomph/simrel-orbit-legacy/milestone/latest"/>
Expand Down
2 changes: 1 addition & 1 deletion chart/org.eclipse.birt.chart.viewer/BuildChartWebViewer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<include name="org.eclipse.birt.chart.device.svg_*.jar" />
<include name="org.eclipse.birt.chart.device.pdf_*.jar" />
<include name="org.eclipse.birt.chart.examples.core_*.jar"/>
<include name="org.mozilla.javascript_*.jar" />
<include name="org.mozilla.rhino_*.jar" />
<!-- batik.pdf has been moved to Orbit -->
<!--
<include name="org.apache.batik.pdf_*/lib/*.jar" />
Expand Down
2 changes: 1 addition & 1 deletion core/org.eclipse.birt.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Export-Package: org.eclipse.birt.core.archive,
org.eclipse.birt.core.template,
org.eclipse.birt.core.util
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
org.mozilla.javascript;bundle-version="1.7.4";visibility:=reexport,
org.mozilla.rhino;bundle-version="1.7.4";visibility:=reexport,
com.ibm.icu;bundle-version="70.1.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
Eclipse-ExtensibleAPI: true
Expand Down
2 changes: 1 addition & 1 deletion docs/org.eclipse.birt.chart.doc.isv/BuildChartISVDoc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<include name="org.eclipse.emf.ecore.xmi_*.jar"/>
</fileset>
<fileset dir="../">
<include name="org.mozilla.javascript_*.jar"/>
<include name="org.mozilla.rhino_*.jar"/>
</fileset>
<pathelement path="${core.dir}/@dot"/>
<pathelement path="${core.ui.dir}/@dot"/>
Expand Down
2 changes: 1 addition & 1 deletion docs/org.eclipse.birt.doc.isv/BuildISVDoc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<include name="org.apache.commons.codec_*.jar"/>
<include name="org.eclipse.orbit.xml-apis-ext_*.jar"/>
<include name="org.w3c.css.sac_*.jar"/>
<include name="org.mozilla.javascript_*.jar"/>
<include name="org.mozilla.rhino_*.jar"/>
</fileset>
<fileset dir="${engine.dir}/lib">
<include name="**/*.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.birt.chart.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
unpack="false"/>

<plugin
id="org.mozilla.javascript"
id="org.mozilla.rhino"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.birt.chart.osgi.runtime/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
unpack="false"/>

<plugin
id="org.mozilla.javascript"
id="org.mozilla.rhino"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.birt.engine.runtime/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
version="0.0.0"/>

<plugin
id="org.mozilla.javascript"
id="org.mozilla.rhino"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.birt.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
version="0.0.0"/>

<plugin
id="org.mozilla.javascript"
id="org.mozilla.rhino"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.birt.osgi.runtime/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
version="0.0.0"/>

<plugin
id="org.mozilla.javascript"
id="org.mozilla.rhino"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
unpack="false"/>

<plugin
id="org.mozilla.javascript"
id="org.mozilla.rhino"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<junit-version>4.13.2</junit-version>
<maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
<maven-surefire-plugin-version>2.22.0</maven-surefire-plugin-version>
<tycho.version>4.0.4</tycho.version>
<tycho.version>4.0.6</tycho.version>
<jetty.version>10.0.15</jetty.version>
<cbi-version>1.3.1</cbi-version>
<skipTests>false</skipTests>
Expand Down Expand Up @@ -254,7 +254,6 @@
</artifact>
</target>
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
<includePackedArtifacts>false</includePackedArtifacts>
<environments>
<environment>
<os>win32</os>
Expand Down
4 changes: 2 additions & 2 deletions promotion/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ SPDX-License-Identifier: EPL-2.0
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-eclipse-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<executionEnvironment>JavaSE-17</executionEnvironment>
Expand Down
10 changes: 5 additions & 5 deletions viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
<include name="javax.xml.soap_*/lib/*.jar"/>
<include name="org.apache.commons.discovery_*/lib/*.jar"/>
<include name="org.apache.commons.codec*.jar" />
<include name="org.mozilla.javascript_*.jar"/>
<include name="org.mozilla.rhino_*.jar"/>
</fileset>
<fileset dir="${build.result.folder}/${birt.dir}/WEB-INF/lib">
<include name="*.jar" />
Expand Down Expand Up @@ -399,7 +399,7 @@
<include name="javax.xml.soap_*/lib/*.jar"/>
<include name="org.apache.commons.discovery_*/lib/*.jar"/>
<include name="org.apache.commons.codec*.jar" />
<include name="org.mozilla.javascript_*.jar"/>
<include name="org.mozilla.rhino_*.jar"/>
</fileset>
<fileset dir="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/lib">
<include name="*.jar" />
Expand Down Expand Up @@ -533,7 +533,7 @@
</copy>
<copy todir="${export.dir}/lib">
<fileset dir="${integrate.dir}/plugins" />
<mapper type="regexp" from="org.mozilla.javascript_.*.jar" to="js.jar"/>
<mapper type="regexp" from="org.mozilla.rhino_.*.jar" to="js.jar"/>
</copy>

</target>
Expand Down Expand Up @@ -641,7 +641,7 @@
<fileset dir="${integrate.dir}/plugins">
<!-- 3rd party bundles -->
<include name="org.w3c.sac_*/**" />
<include name="org.mozilla.javascript_*/**" />
<include name="org.mozilla.rhino_*/**" />
<include name="com.lowagie.text_*/**" />
<!-- birt bundles -->
<include name="org.eclipse.birt.chart.device.extension_*.jar" />
Expand Down Expand Up @@ -775,7 +775,7 @@

<copy todir="${export.dir}/lib">
<fileset dir="${buildDirectory}/plugins" />
<mapper type="regexp" from="org.mozilla.javascript_.*.jar" to="js.jar"/>
<mapper type="regexp" from="org.mozilla.rhino_.*.jar" to="js.jar"/>
</copy>


Expand Down
2 changes: 1 addition & 1 deletion viewer/org.eclipse.birt.report.viewer/customBuildCallbacks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<include name="javax.xml.rpc_*/lib/*.jar"/>
<include name="javax.xml.soap_*/lib/*.jar"/>
<include name="org.apache.commons.discovery_*/lib/*.jar"/>
<include name="org.mozilla.javascript_*.jar"/>
<include name="org.mozilla.rhino_*.jar"/>
</fileset>

<pathelement path="${viewer.model.dir}/@dot" />
Expand Down
Loading