You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2022/10/15 01:12:34 UTC
[xalan-java] branch xalan-j_2_7_1_maint updated: xalanj commit : committing, codebase changes for xalanj 2.7.3 release, after including new version 6.6.0 of commons bcel
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_2_7_1_maint
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_2_7_1_maint by this push:
new a9cecd58 xalanj commit : committing, codebase changes for xalanj 2.7.3 release, after including new version 6.6.0 of commons bcel
a9cecd58 is described below
commit a9cecd5817502dd140714862ae4332f6e63a0c09
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Sat Oct 15 06:42:17 2022 +0530
xalanj commit : committing, codebase changes for xalanj 2.7.3 release,
after including new version 6.6.0 of commons bcel
---
build.xml | 23 +++++++++++++++--------
lib/BCEL.jar | Bin 491665 -> 0 bytes
lib/bcel-6.6.0.jar | Bin 0 -> 704234 bytes
src/MANIFEST.MF | 2 +-
src/manifest.xsltc | 2 +-
xdocs/sources/xalan/readme.xml | 7 +++++--
6 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/build.xml b/build.xml
index 3914e15b..920b54ff 100644
--- a/build.xml
+++ b/build.xml
@@ -78,7 +78,7 @@ $Id$
<!-- Xerces Java version information -->
<property name="parser.version.VERSION" value="2"/>
<property name="parser.version.RELEASE" value="12"/>
- <property name="parser.version.MINOR" value="0"/>
+ <property name="parser.version.MINOR" value="2"/>
<!-- Xalan Java directories -->
<!-- <property name="bin.dir" value="./bin"/> -->
@@ -102,6 +102,8 @@ $Id$
<property name="xmlapis.jar" value="${endorsed.dir}/${xmlapis.jar.name}"/>
<property name="parser.jar.name" value="xercesImpl.jar"/>
<property name="parser.jar" value="${endorsed.dir}/${parser.jar.name}"/>
+ <property name="bcel.jar.name" value="bcel-6.6.0.jar"/>
+ <property name="bcel.jar" value="${lib.dir}/${bcel.jar.name}"/>
<property name="runtime.jar.name" value="runtime.jar"/>
<property name="runtime.jar" value="${lib.dir}/${runtime.jar.name}"/>
<property name="regexp.jar.name" value="regexp.jar"/>
@@ -207,6 +209,7 @@ $Id$
<path id="docs.class.path">
<pathelement location="${xmlapis.jar}" />
<pathelement location="${parser.jar}" />
+ <pathelement location="${bcel.jar}" />
<pathelement location="${runtime.jar}" />
<pathelement location="${stylebook.jar}" />
<pathelement location="${doclet.jar}" />
@@ -307,7 +310,8 @@ $Id$
</patternset>
<!-- XSLTC engine dependency .jar files -->
- <patternset id="xsltc-deps-jars">
+ <patternset id="xsltc-deps-jars" >
+ <include name="${dist.file}/lib/${bcel.jar.name}"/>
<include name="${dist.file}/tools/${java_cup.jar.name}"/>
<include name="${dist.file}/tools/${jlex.jar.name}"/>
<include name="${dist.file}/lib/${runtime.jar.name}"/>
@@ -436,6 +440,7 @@ $Id$
<path id="xsltc.class.path">
<pathelement location="${xmlapis.jar}" />
<pathelement location="${build.serializer.jar}" />
+ <pathelement location="${bcel.jar}" />
<pathelement location="${jlex.jar}" />
<pathelement location="${java_cup.jar}" />
<pathelement location="${runtime.jar}" />
@@ -470,7 +475,8 @@ $Id$
<srcfiles dir="${src.dir}/${xsltc.reldir}/compiler" includes="xpath.lex" />
</uptodate>
- <!-- Determine whether the support jars are already expanded -->
+ <!-- Determine whether the support jars are already expanded -->
+ <available file="${build.classes}/org/apache/bcel" type="dir" property="xsltc.bcel_jar.not_needed" />
<available file="${build.classes}/JLex" type="dir" property="xsltc.jlex_jar.not_needed" />
<available file="${build.classes}/java_cup/Main.class" type="file" property="xsltc.java_cup_jar.not_needed" />
<available file="${build.classes}/java_cup/runtime" type="dir" property="xsltc.runtime_jar.not_needed" />
@@ -574,10 +580,10 @@ $Id$
<target name="xsltc.copy-deps-jars" depends="xsltc.copy-licenses">
<echo message="Copying XSLTC support jars" />
<!-- copy the 3rd party support jar files -->
- <!--<antcall target="xsltc.copy-deps-jar">
+ <antcall target="xsltc.copy-deps-jar">
<param name="param_unless" value="xsltc.bcel_jar.not_needed" />
<param name="param_jar_name" value="${bcel.jar.name}" />
- </antcall>-->
+ </antcall>
<!-- We don't need to package the JLex or java_cup jars in the xalan.jar.
These are only required for building XSLTC, not for using XSLTC.
@@ -611,7 +617,7 @@ $Id$
<!-- Creates the xsltc jar including all support jars -->
<!-- =================================================================== -->
<target name="xsltc.jar" depends="xsltc.compile,xsltc.copy-deps-jars"
- description="Jar xsltc,xml,JLex,java_cup,runtime and jakarta regexp">
+ description="Jar xsltc,xml,BCEL,JLex,java_cup,runtime and jakarta regexp">
<!-- create new META-INF dir w/ transformer factory default -->
<!-- GTM: comment this out so that bundled xsltc.jar does not have
@@ -637,6 +643,7 @@ $Id$
</fileset>
<fileset dir="${build.classes}" includes="org/apache/xml/**"
excludes="${serializer.reldir}/**" />
+ <fileset dir="${build.classes}" includes="org/apache/bcel/**" />
<fileset dir="${build.classes}" includes="JLex/**" />
<fileset dir="${build.classes}" includes="java_cup/**" />
<fileset dir="${build.classes}" includes="org/apache/regexp/**" />
@@ -885,7 +892,7 @@ $Id$
<!-- =================================================================== -->
<!-- Compiles (does not jar) the translet samples. -->
<!-- For time being, classes are generated in place. -->
- <!-- To run these samples, add xsltc.jar, runtime.jar, -->
+ <!-- To run these samples, add xsltc.jar, runtime.jar, bcel.jar, -->
<!-- and java_cup.jar (all in the bin directory) to the classpath -->
<!-- -->
<!-- When we have straightened out classpath issues, -->
@@ -1860,4 +1867,4 @@ $Id$
# END OF SECTION TO BUILD STAND-ALONE SERIALIZER #
################################################## -->
-</project>
\ No newline at end of file
+</project>
diff --git a/lib/BCEL.jar b/lib/BCEL.jar
deleted file mode 100644
index 644f8763..00000000
Binary files a/lib/BCEL.jar and /dev/null differ
diff --git a/lib/bcel-6.6.0.jar b/lib/bcel-6.6.0.jar
new file mode 100644
index 00000000..78dd0302
Binary files /dev/null and b/lib/bcel-6.6.0.jar differ
diff --git a/src/MANIFEST.MF b/src/MANIFEST.MF
index 14160aa7..bb13412e 100644
--- a/src/MANIFEST.MF
+++ b/src/MANIFEST.MF
@@ -52,7 +52,7 @@ Name: org/apache/bcel/
Comment: Byte Code Engineering Library
Specification-Title: Byte Code Engineering Library
Specification-Vendor: Markus Dahm
-Specification-Version: 5.0 rc1
+Specification-Version: 6.6.0
Implementation-Title: org.apache.bcel
Implementation-Version: @impl.version@
Implementation-Vendor: Apache Software Foundation
diff --git a/src/manifest.xsltc b/src/manifest.xsltc
index bdfc0e18..fd248872 100644
--- a/src/manifest.xsltc
+++ b/src/manifest.xsltc
@@ -33,7 +33,7 @@ Name: org/apache/bcel/
Comment: Byte Code Engineering Library
Specification-Title: Byte Code Engineering Library
Specification-Vendor: Markus Dahm
-Specification-Version: 5.0 rc1
+Specification-Version: 6.6.0
Implementation-Title: org.apache.bcel
Implementation-Version: @impl.version@
Implementation-Vendor: Apache Software Foundation
diff --git a/xdocs/sources/xalan/readme.xml b/xdocs/sources/xalan/readme.xml
index 455618ac..6560ebf7 100644
--- a/xdocs/sources/xalan/readme.xml
+++ b/xdocs/sources/xalan/readme.xml
@@ -42,9 +42,12 @@
</p>
<s3 title="Fix for CVE-2022-34169 An integer truncation issue when processing malicious XSLT stylesheets">
</s3>
+ <s3 title="Upgrade to Commons BCEL 6.6.0">
+ The distributions contain upgraded version of Commons BCEL.
+ </s3>
<s3 title="Upgrade to Xerces-J 2.12.2">
- The distributions contain upgraded versions of <code>xercesImpl.jar</code>
- and <code>xml-apis.jar</code> (Xerces-J 2.12.2).
+ The distributions contain upgraded versions of <code>xercesImpl.jar</code>
+ and <code>xml-apis.jar</code> (Xerces-J 2.12.2).
</s3>
<s3 title="XALANJ Jira bug fixes">
<p>XALANJ Jira bug fixes:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org