Replace BIRT's axis copy with the new one from Orbit

eclipse-birt · Nov 7, 2023 · 2125a61 · 2125a61
1 parent 5cf2e58
commit 2125a61
Show file tree

Hide file tree

Showing 35 changed files with 6 additions and 728 deletions.
diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product b/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT-headless.product
@@ -431,7 +431,6 @@ United States, other countries, or both.
       <plugin id="org.sat4j.core"/>
       <plugin id="org.sat4j.pb"/>
       <plugin id="org.eclipse.orbit.xml-apis-ext"/>
-      <plugin id="org.w3c.sac"/>
       <plugin id="uk.co.spudsoft.birt.emitters.excel"/>
    </plugins>
 

diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product b/UI/org.eclipse.birt.report.designer.ui.rcp/BIRT.product
@@ -434,7 +434,6 @@ United States, other countries, or both.
       <plugin id="org.sat4j.core"/>
       <plugin id="org.sat4j.pb"/>
       <plugin id="org.eclipse.orbit.xml-apis-ext"/>
-      <plugin id="org.w3c.sac"/>
       <plugin id="uk.co.spudsoft.birt.emitters.excel"/>
    </plugins>
 

diff --git a/build/org.eclipse.birt.api/build.xml b/build/org.eclipse.birt.api/build.xml
@@ -32,8 +32,6 @@
 	<target name="copy-api-jars">
 		<echo>copy API jars to "${LIB_DIR}</echo>
 		<copy file="${ROOT_DIR}/engine/org.eclipse.birt.report.engine/lib/commons-cli-1.0.jar" tofile="${LIB_DIR}/commons-cli-1.0.jar" />
-		<!-- issue 662 axis vulnerabilities -->
-		<copy file="${ROOT_DIR}/common/org.apache.axis/lib/axis-1.4.1-SNAPSHOT.jar" tofile="${LIB_DIR}/axis.jar" />
 		<copy todir="${LIB_DIR}">
 			<fileset dir="${ROOT_DIR}">
 				<include name="core/org.eclipse.birt.core/target/org.eclipse.birt.core-*-api.jar" />

diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup
@@ -416,7 +416,7 @@
         </detail>
         <detail
             key="generateVersions">
-          <value>jakarta.annotation-api|org.mortbay.jasper.apache-.*</value>
+          <value>org.mortbay.jasper.apache-.*</value>
         </detail>
         <detail
             key="minimizeImplicitUnits">

diff --git a/build/org.eclipse.birt.target/org.eclipse.birt.target.target b/build/org.eclipse.birt.target/org.eclipse.birt.target.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from BIRT" sequenceNumber="24">
+<target name="Generated from BIRT" sequenceNumber="25">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -22,8 +22,8 @@
       <unit id="com.sun.jna" version="0.0.0"/>
       <unit id="com.sun.jna.platform" version="0.0.0"/>
       <unit id="com.zaxxer.sparsebits" version="0.0.0"/>
-      <unit id="jakarta.annotation-api" version="1.3.5"/>
-      <unit id="jakarta.annotation-api" version="2.1.1"/>
+      <unit id="jakarta.annotation-api" version="0.0.0"/>
+      <unit id="jakarta.enterprise.cdi-api" version="0.0.0"/>
       <unit id="jakarta.inject.jakarta.inject-api" version="0.0.0"/>
       <unit id="jakarta.interceptor-api" version="0.0.0"/>
       <unit id="jakarta.servlet-api" version="0.0.0"/>
@@ -46,6 +46,7 @@
       <unit id="junit-vintage-engine" version="0.0.0"/>
       <unit id="org.apache.ant" version="0.0.0"/>
       <unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
+      <unit id="org.apache.axis" version="0.0.0"/>
       <unit id="org.apache.axis.ant" version="0.0.0"/>
       <unit id="org.apache.batik.anim" version="0.0.0"/>
       <unit id="org.apache.batik.awt.util" version="0.0.0"/>
@@ -135,7 +136,6 @@
       <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="cdi.api" version="0.0.0"/>
       <unit id="javax.activation" version="0.0.0"/>
       <unit id="javax.annotation" version="0.0.0"/>
       <unit id="javax.el" version="0.0.0"/>

diff --git a/common/.project b/common/.project
diff --git a/common/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs
diff --git a/common/.settings/org.eclipse.m2e.core.prefs b/common/.settings/org.eclipse.m2e.core.prefs
diff --git a/common/org.apache.axis/.classpath b/common/org.apache.axis/.classpath
diff --git a/common/org.apache.axis/.gitignore b/common/org.apache.axis/.gitignore
diff --git a/common/org.apache.axis/.project b/common/org.apache.axis/.project
diff --git a/common/org.apache.axis/.settings/org.eclipse.core.resources.prefs b/common/org.apache.axis/.settings/org.eclipse.core.resources.prefs
diff --git a/common/org.apache.axis/.settings/org.eclipse.jdt.core.prefs b/common/org.apache.axis/.settings/org.eclipse.jdt.core.prefs
diff --git a/common/org.apache.axis/META-INF/MANIFEST.MF b/common/org.apache.axis/META-INF/MANIFEST.MF
diff --git a/common/org.apache.axis/about.html b/common/org.apache.axis/about.html
diff --git a/common/org.apache.axis/about.ini b/common/org.apache.axis/about.ini
diff --git a/common/org.apache.axis/about.mappings b/common/org.apache.axis/about.mappings
diff --git a/common/org.apache.axis/about.properties b/common/org.apache.axis/about.properties