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 2023/01/07 15:10:36 UTC
[xalan-java] branch xalan-j_2_7_1_maint updated: xalanj commit : committing XalanJ build steps improvements to related files, for the 2.7.3 release. This seems to be now complete, and the README file has been updated for the latest steps. Java 1.8 is supported as a build Java version. XalanJ 2.7.3 release year, has been updated to 2023 within related files.
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 fdb71083 xalanj commit : committing XalanJ build steps improvements to related files, for the 2.7.3 release. This seems to be now complete, and the README file has been updated for the latest steps. Java 1.8 is supported as a build Java version. XalanJ 2.7.3 release year, has been updated to 2023 within related files.
fdb71083 is described below
commit fdb71083bf0c07fa426c684bdbbba4eff0825926
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Sat Jan 7 20:40:16 2023 +0530
xalanj commit : committing XalanJ build steps improvements to related
files, for the 2.7.3 release. This seems to be now complete, and the
README file has been updated for the latest steps. Java 1.8 is supported
as a build Java version. XalanJ 2.7.3 release year, has been updated to
2023 within related files.
---
NOTICE.txt | 2 +-
README | 53 ++++----------------
build.bat | 4 +-
build.xml | 2 +-
build_srcdist_xalan.xml | 24 ++++------
build_srcdist_xalan_tests.xml | 85 ++++++++++++++++-----------------
xdocs/sources/xalan-apache-org-site.xml | 2 +-
xdocs/sources/xalan-jlocal.xml | 2 +-
xdocs/sources/xalan-jsite.xml | 2 +-
xdocs/sources/xalan/readme.xml | 2 +-
xdocs/sources/xsltc.xml | 2 +-
11 files changed, 70 insertions(+), 110 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index 87adbc0b..7147df72 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,7 +4,7 @@
=========================================================================
Apache Xalan (Xalan XSLT processor)
- Copyright 1999-2022 The Apache Software Foundation
+ Copyright 1999-2023 The Apache Software Foundation
Apache Xalan (Xalan serializer)
Copyright 1999-2012 The Apache Software Foundation
diff --git a/README b/README
index a148f638..10fdc77a 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@
* limitations under the License.
-->
-Copyright 1999-2022 The Apache Software Foundation
+Copyright 1999-2023 The Apache Software Foundation
Authors:
Gary Gregory <gg...@apache.org>
@@ -51,9 +51,6 @@ For XalanJ source distribution users, this command needs to be run from, the roo
of the XalanJ source distribution folder (i.e, from the source distribution folder,
which contains folders "src", "tools" etc).
-This shall produce the following jars, relevant for testing the XalanJ
-build : xalan.jar, serializer.jar. [1]
-
(2) Steps to run the XalanJ tests, on XalanJ implementation
1) Go to the XalanJ tests repos's, local git clone folder:
@@ -71,45 +68,15 @@ set JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-8.0.352.8-hotspot\
set ANT_HOME=C:\java\apache-ant-1.10.12
3) Run the command "build clean jar" from folder xalan-test. This produces
-the file testxsl.jar within folder xalan-test/java/build.
-
-4) Create a folder xalanjrelease_jardir somewhere on file system.
-Copy the jar file testxsl.jar produced within the previous step, to the folder
-xalanjrelease_jardir. Copy the jars xalan.jar, serializer.jar [1] to this
-folder. From the folder xalan-java/lib/endorsed, copy jars xml-apis.jar and
-xercesImpl.jar to the folder xalanjrelease_jardir. Copy the jar Tidy.jar from folder
-xalan-test/tools to the folder xalanjrelease_jardir. From the folder xalan-java/lib
-copy the jars bsf.jar, rhino-1.7.14.jar, commons-logging-1.2.jar, regexp.jar to the
-folder xalanjrelease_jardir (XalanJ source distribution users may copy the jars bsf.jar,
-rhino-1.7.14.jar, commons-logging-1.2.jar, regexp.jar from folder for e.g xalan-j_2_7_3/lib
-within the source distribution. XalanJ source distribution users may also copy the
-jars xml-apis.jar and xercesImpl.jar from folder for e.g xalan-j_2_7_3/lib/endorsed
-to the folder xalanjrelease_jardir).
-
-Now the folder xalanjrelease_jardir, has the XalanJ jar xalan.jar that needs
-to be tested, and all the supporting jars needed for testing.
-
-For example, on Windows, from xalan-test:
+the file testxsl.jar that acts as main XalanJ test driver, within folder xalan-test/java/build.
-copy /Y java\build\testxsl.jar "%JARDIR%"
-copy /Y tools\Tidy.jar "%JARDIR%"
+4) Run the necessary XalanJ tests as follows,
-copy /Y ..\xalan-java\build\xalan.jar "%JARDIR%"
-copy /Y ..\xalan-java\build\serializer.jar "%JARDIR%"
-copy /Y ..\xalan-java\lib\bsf.jar "%JARDIR%"
-copy /Y ..\xalan-java\lib\commons-logging-1.2.jar "%JARDIR%"
-copy /Y ..\xalan-java\lib\regexp.jar "%JARDIR%"
-copy /Y ..\xalan-java\lib\rhino-1.7.14.jar "%JARDIR%"
-copy /Y ..\xalan-java\lib\endorsed\xercesImpl.jar "%JARDIR%"
-copy /Y ..\xalan-java\lib\endorsed\xml-apis.jar "%JARDIR%"
+The tests described below within points 4.1, 4.2 and 4.3 need to be run from folder xalan-test.
-5) Set JARDIR environment variable, pointing to the folder "xalanjrelease_jardir".
+4.1 Run the ant target "smoketest", using following three commands in sequence shown below
-6) Run the necessary XalanJ tests as follows,
-
-The tests described below within points 5.1, 5.2 and 5.3 need to be run from folder xalan-test.
-
-6.1 Run the ant target "smoketest", using following two commands in sequence shown below
+build extensions.classes
build extensions
@@ -120,7 +87,7 @@ The output of the command "build smoketest" should be following, and without any
smoketest-pass:
[echo] [minitest] CONGRATULATIONS! The Smoketest passed!
-6.2 Run the ant target "smoketest.xsltc", using following three commands in sequence shown below
+4.2 Run the ant target "smoketest.xsltc", using following three commands in sequence shown below
build conf.xsltc
@@ -133,9 +100,7 @@ The output of the command "build smoketest.xsltc" should be following, and witho
smoketest.xsltc-pass:
[echo] [minitest] CONGRATULATIONS! The Smoketest passed!
-6.3 Run the ant target "smoketest.dev", using following two commands in sequence shown below
-
-build extensions
+4.3 Run the ant target "smoketest.dev", using following command
build smoketest.dev
@@ -144,7 +109,7 @@ The output of the command "build smoketest.dev" should be following, and without
smoketest-pass:
[echo] [minitest] CONGRATULATIONS! The Smoketest passed!
-6.4 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file
+4.4 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file
xsltc_int_truncation_test.bat (provided for Windows platform) to run test for,
"XalanJ integer truncation bug fix, when using XSLTC".
\ No newline at end of file
diff --git a/build.bat b/build.bat
index 4cf4423d..3f69f7fd 100644
--- a/build.bat
+++ b/build.bat
@@ -17,7 +17,9 @@ rem = See the License for the specific language governing permissions and
rem = limitations under the License.
rem ==========================================================================
rem
-rem build.bat: Build Xalan-J 2.x using Ant
+rem build.bat: Build Xalan-J 2.x using Ant
+rem Author: XalanJ team
+
rem Usage: build [ant-options] [targets]
rem Setup:
rem - you must set JAVA_HOME
diff --git a/build.xml b/build.xml
index 2fd99c2c..13c28522 100644
--- a/build.xml
+++ b/build.xml
@@ -62,7 +62,7 @@ $Id$
<project name="Xalan" default="jar" basedir=".">
<property name="name" value="xalan"/>
- <property name="year" value="2022"/>
+ <property name="year" value="2023"/>
<property name="build.debug" value="on"/>
<property name="compiler.target" value="1.8"/>
<property name="compiler.source" value="1.8"/>
diff --git a/build_srcdist_xalan.xml b/build_srcdist_xalan.xml
index d0de25cf..9da3a149 100644
--- a/build_srcdist_xalan.xml
+++ b/build_srcdist_xalan.xml
@@ -66,7 +66,7 @@ $Id$
<project name="Xalan" default="jar" basedir=".">
<property name="name" value="xalan"/>
- <property name="year" value="2022"/>
+ <property name="year" value="2023"/>
<property name="build.debug" value="on"/>
<property name="compiler.target" value="1.8"/>
<property name="compiler.source" value="1.8"/>
@@ -238,19 +238,15 @@ $Id$
<pathelement location="${parser.jar}" />
<pathelement path="${java.class.path}" />
</path>
+
<path id="xslt.boot.class.path">
- <!-- Put this version of xalan in front of the jdk's for JDK 1.4+ -->
- <!-- Set build.boot.class.path to a JDK 1.1.x classes.zip file to check
- compatibility with 1.1.x. If you omit this property, compatability
- with 1.1.x will not be checked even though javac specifies a target of 1.1 -->
- <pathelement location="${build.classes}" />
- <pathelement location="${serializer.build.classes}" />
- <pathelement location="${xmlapis.jar}" />
- <pathelement location="${build.serializer.jar}" />
- <pathelement location="${parser.jar}" />
- <pathelement path="${build.boot.class.path}" />
- <pathelement path="${sun.boot.class.path}" />
+ <!-- Put this version of xalan in front of the jdk's for JDK 1.4+ -->
+ <pathelement location="${xmlapis.jar}" />
+ <pathelement location="${build.serializer.jar}" />
+ <pathelement location="${parser.jar}" />
+ <pathelement path="${sun.boot.class.path}" />
</path>
+
<path id="compile.source.path">
<dirset dir="${src.dir}" includes="/org/apache/**" />
</path>
@@ -986,8 +982,8 @@ $Id$
<javac srcdir="${samples.dir}/CompiledServlet"
destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
- target="${compiler.target}" source="${compiler.source}">
- <classpath location="${servlet-api.jar}"/>
+ target="${compiler.target}" source="${compiler.source}"
+ classpath="${build.xalan.jar}:${servlet-api.jar}">
</javac>
<jar jarfile="${build.xsltc.servlet.jar}"
basedir="${build.samples}/CompiledServlet"
diff --git a/build_srcdist_xalan_tests.xml b/build_srcdist_xalan_tests.xml
index 411a24a6..c1e99056 100644
--- a/build_srcdist_xalan_tests.xml
+++ b/build_srcdist_xalan_tests.xml
@@ -64,7 +64,7 @@ file build.xml provided by XalanJ xalan-test git repos.
-->
<property environment="ENV" />
- <property name="year" value="2000-2022"/>
+ <property name="year" value="2000-2023"/>
<!-- Properties related to compiling the tests -->
<property name="build.compiler" value="classic"/>
<property name="compiler" value="${build.compiler}"/>
@@ -80,9 +80,9 @@ file build.xml provided by XalanJ xalan-test git repos.
<property name="test.build.apidocs" value="${test.build.docs}/apidocs"/>
<property name="tests.bugzilla.dir" value="tests/bugzilla"/>
<property name="tests.bugzilla.build.dir" value="tests/bugzilla/build"/>
- <property name="tests.extensions.dir" value="${extensions.inputDir}/java"/>
- <property name="tests.extensions.build.dir" value="${extensions.inputDir}/java/build"/>
-
+ <property name="extensions.dir" value="tests/extensions"/>
+ <property name="tests.extensions.dir" value="${extensions.dir}/java"/>
+ <property name="tests.extensions.build.dir" value="${extensions.dir}/java/build"/>
<!-- Names/locations of .jar files we build -->
<property name="testxsl.jar.name" value="testxsl.jar"/>
@@ -138,7 +138,6 @@ file build.xml provided by XalanJ xalan-test git repos.
<pathelement location="${ser.jar}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
- <pathelement path="${java.class.path}" />
</path>
<!-- Note: given that many of the tests interact with xerces and
@@ -160,7 +159,6 @@ file build.xml provided by XalanJ xalan-test git repos.
<!-- ================================================================== -->
<!-- Classpath used when compiling tests -->
<path id="compiletest.class.path">
- <pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
<pathelement location="${xsltc.jar}" /> <!-- add this so we can test the
separate jar distribution -->
@@ -171,19 +169,21 @@ file build.xml provided by XalanJ xalan-test git repos.
</path>
<!-- Classpath used when running API tests -->
- <path id="api.class.path">
- <pathelement path="${java.class.path}" />
- <pathelement location="${xalan.jar}" />
- <pathelement location="${ser.jar}" />
- <pathelement location="${xml-apis.jar}" />
- <pathelement location="${parserjar}" />
- <pathelement location="${testxsl.jar}" />
- <pathelement location="${jtidy.jar}" />
- </path>
+ <path id="api.class.path">
+ <pathelement location="${xalan.jar}" />
+ <pathelement location="${ser.jar}" />
+ <pathelement location="${xml-apis.jar}" />
+ <pathelement location="${parserjar}" />
+ <pathelement location="${testxsl.jar}" />
+ <pathelement location="${jtidy.jar}" />
+ </path>
+
+ <path id="testxsl.class.path">
+ <pathelement location="${testxsl.jar}" />
+ </path>
<!-- Classpath used when running conf or conformance tests -->
<path id="conf.class.path">
- <pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
<pathelement location="${ser.jar}" />
<pathelement location="${xml-apis.jar}" />
@@ -192,18 +192,15 @@ file build.xml provided by XalanJ xalan-test git repos.
<pathelement location="${jtidy.jar}" />
</path>
- <!-- Boot class path for JDK 1.4. Order is important to ensure
- GUMP builds work correctly, and people who don't use the
- build.bat/build.sh can still build on JDK 1.4 as normal. -->
- <path id="boot.class.path">
- <pathelement location="${xalan.jar}" />
- <pathelement location="${xsltc.jar}" /> <!-- add this so we can test the
- separate jar distribution -->
- <pathelement location="${ser.jar}" />
- <pathelement location="${java.class.path}" />
- <pathelement location="${xml-apis.jar}" />
- <pathelement location="${parserjar}" />
- </path>
+ <!-- Boot class path for JDK 1.4+ -->
+ <path id="boot.class.path">
+ <pathelement location="${xalan.jar}" />
+ <pathelement location="${xsltc.jar}" /> <!-- add this so we can test the
+ separate jar distribution -->
+ <pathelement location="${ser.jar}" />
+ <pathelement location="${xml-apis.jar}" />
+ <pathelement location="${parserjar}" />
+ </path>
<!-- Gump build xml-xalan2-smoketest should use xalan.unbundled.jar -->
<path id="boot.class.path.gump">
@@ -231,15 +228,18 @@ file build.xml provided by XalanJ xalan-test git repos.
<pathelement location="${tests.bugzilla.build.dir}" />
</path>
- <!-- Classpath used when running extensions tests -->
- <path id="extensions.class.path">
- <path refid="api.class.path" />
- <pathelement location="${bsf.jar}" />
- <pathelement location="${commons-logging.jar}" />
- <pathelement location="${js.jar}" />
- <pathelement location="${tests.extensions.build.dir}" />
- <!-- Add more pathelements if we add more Java extensions dirs -->
- </path>
+ <!-- Classpath used when running extensions tests -->
+ <path id="extensions.class.path">
+ <pathelement location="${xalan.jar}" />
+ <path refid="testxsl.class.path" />
+ <pathelement location="${commons-logging.jar}" />
+ <pathelement location="${bsf.jar}" />
+ <pathelement location="${js.jar}" />
+ <pathelement location="${jtidy.jar}" />
+ <pathelement location="${tests.extensions.build.dir}" />
+ <pathelement location="${tests.bugzilla.build.dir}" />
+ <!-- Add more pathelements if we add more Java extensions dirs -->
+ </path>
<!-- Classpath used when build/running xslt20 XPath 2.0 RWAPI tests -->
<path id="rwapitest.class.path">
@@ -252,7 +252,6 @@ file build.xml provided by XalanJ xalan-test git repos.
<!-- ================================================================== -->
<taskdef name="xalantest" classname="org.apache.qetest.xsl.XSLTestAntTask">
<classpath>
- <pathelement path="${java.class.path}" />
<!-- Needed so this build file can run: this refers to
a precompiled version of XSLTestAntTask.class that
is checked in: normally at runtime, it should come
@@ -326,7 +325,7 @@ file build.xml provided by XalanJ xalan-test git repos.
</target>
<target name="run.xalan-extension-test" >
- <antcall target="run.xalan-extension-test.gump"/>
+ <!-- <antcall target="run.xalan-extension-test.gump"/> -->
<antcall target="run.xalan-extension-test.normal"/>
</target>
@@ -342,7 +341,7 @@ file build.xml provided by XalanJ xalan-test git repos.
</xalantest>
</target>
- <target name="run.xalan-extension-test.normal" unless="gump">
+ <target name="run.xalan-extension-test.normal">
<xalantest test="${testClass}"
testType="${testType}"
classpathref="${xalantest.classpathref}"
@@ -636,9 +635,9 @@ file build.xml provided by XalanJ xalan-test git repos.
<!-- ================================================================== -->
<target name="extensions"
description="Run extensions tests.
- Non-Java extensions will use the Jakarta BSF implementation."
+ Non-Java extensions will use the Apache BSF implementation."
depends="init.test">
- <echo message="Executing Xalan extensions tests. Non-Java extensions will use the Jakarta BSF implementation." />
+ <echo message="Executing Xalan extensions tests. Non-Java extensions will use the Apache BSF implementation." />
<!-- Set the default conformance test driver, user may
override; note test.properties:extensions.testlet=
-->
@@ -1562,7 +1561,6 @@ file build.xml provided by XalanJ xalan-test git repos.
-->
<path id="xsltc.runtime.class.path">
- <pathelement path="${java.class.path}" />
<pathelement location="${xalan.build.dir}/xalan.jar" />
<!-- add xsltc.jar so we can test the separate jar distribution -->
@@ -1575,7 +1573,6 @@ file build.xml provided by XalanJ xalan-test git repos.
<pathelement location="${jtidy.jar}" />
</path>
<path id="xsltc.compile.class.path">
- <pathelement path="${java.class.path}" />
<pathelement location="${xalan.build.dir}/xalan.jar" />
<!-- add xsltc.jar so we can test the separate jar distribution -->
diff --git a/xdocs/sources/xalan-apache-org-site.xml b/xdocs/sources/xalan-apache-org-site.xml
index 63678342..3dc90e16 100644
--- a/xdocs/sources/xalan-apache-org-site.xml
+++ b/xdocs/sources/xalan-apache-org-site.xml
@@ -19,7 +19,7 @@
-->
<!-- $Id$ -->
-<book title="Apache Xalan Project " copyright="1999-2022 The Apache Software Foundation">
+<book title="Apache Xalan Project " copyright="1999-2023 The Apache Software Foundation">
<document id="index" label="Apache Xalan" source="xalan-apache-org/index.xml"/>
<document id="charter" label="Charter" source="xalan/charter.xml"/>
<separator/>
diff --git a/xdocs/sources/xalan-jlocal.xml b/xdocs/sources/xalan-jlocal.xml
index 8985982b..1c536a97 100644
--- a/xdocs/sources/xalan-jlocal.xml
+++ b/xdocs/sources/xalan-jlocal.xml
@@ -19,7 +19,7 @@
-->
<!-- $Id$ -->
-<book title="Xalan XSL Transformer User's Guide" copyright="1999-2022 The Apache Software Foundation">
+<book title="Xalan XSL Transformer User's Guide" copyright="1999-2023 The Apache Software Foundation">
<resources source="sbk:/sources/xalan/resources.xml"/>
<document id="whatsnew" label="What's New" source="xalan/whatsnew.xml"/>
<document id="readme" label="Release Notes" source="xalan/readme.xml"/>
diff --git a/xdocs/sources/xalan-jsite.xml b/xdocs/sources/xalan-jsite.xml
index b107541f..469811ee 100644
--- a/xdocs/sources/xalan-jsite.xml
+++ b/xdocs/sources/xalan-jsite.xml
@@ -19,7 +19,7 @@
-->
<!-- $Id$ -->
-<book title="Xalan XSL Transformer User's Guide" copyright="1999-2022 The Apache Software Foundation">
+<book title="Xalan XSL Transformer User's Guide" copyright="1999-2023 The Apache Software Foundation">
<resources source="sbk:/sources/xalan/resources.xml"/>
<external href="http://xalan.apache.org/index.html" label="Home"/>
<separator/>
diff --git a/xdocs/sources/xalan/readme.xml b/xdocs/sources/xalan/readme.xml
index 3bc99628..baa908af 100644
--- a/xdocs/sources/xalan/readme.xml
+++ b/xdocs/sources/xalan/readme.xml
@@ -38,7 +38,7 @@
<anchor name="notes_latest"/>
<s2 title="Release notes for &xslt4j; 2.7.3">
<p>
- &xslt4j; 2.7.3 was released in December 2022.
+ &xslt4j; 2.7.3 was released in January 2023.
</p>
<s3 title="Fix for CVE-2022-34169 An integer truncation issue when processing malicious XSLT stylesheets">
This issue was fixed within XalanJ's XSLTC processor. This XalanJ issue, when present causes following problems:
diff --git a/xdocs/sources/xsltc.xml b/xdocs/sources/xsltc.xml
index 3e20a254..580fcb4a 100644
--- a/xdocs/sources/xsltc.xml
+++ b/xdocs/sources/xsltc.xml
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<book title="XSLTC Design" copyright="1999-2022 The Apache Software Foundation">
+<book title="XSLTC Design" copyright="1999-2023 The Apache Software Foundation">
<document id="index"
label="Overview"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org