Compare commits
No commits in common. "c8-stream-201902" and "stream-javapackages-tools-202201-rhel-9.4.0" have entirely different histories.
c8-stream-
...
stream-jav
|
|
@ -1 +1,3 @@
|
|||
SOURCES/jdom2-2.0.6.tar.gz
|
||||
/JDOM-2.0.5.tar.gz
|
||||
/JDOM-2.0.6.tar.gz
|
||||
/jdom2-2.0.6.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
d47a717b9ea4e9917652d4b80a669b5f55fe7639 SOURCES/jdom2-2.0.6.tar.gz
|
||||
d47a717b9ea4e9917652d4b80a669b5f55fe7639 jdom2-2.0.6.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,112 @@
|
|||
From cf7e676edc7ab9d4b8b130ca4d8ecbd291995dea Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Mon, 20 Apr 2020 09:29:12 +0200
|
||||
Subject: [PATCH] Adapt build
|
||||
|
||||
---
|
||||
build.xml | 54 +++---------------------------------------------------
|
||||
1 file changed, 3 insertions(+), 51 deletions(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index cd7c2ed..16368e2 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
|
||||
<!-- Compilation class path -->
|
||||
<path id="base.class.path">
|
||||
- <pathelement location="${jaxen.jar}" />
|
||||
- <pathelement location="${parser.jar}" />
|
||||
- <pathelement location="${xmlapi.jar}" />
|
||||
- <pathelement location="${junit.jar}" />
|
||||
- <pathelement location="${isorelax.jar}" />
|
||||
- <pathelement location="${xalan.jar}" />
|
||||
- <pathelement location="${xalanser.jar}" />
|
||||
- <!-- normally these stax jars will not be found -->
|
||||
- <!-- this is used for testing Java5 (the test sets stax.dir) -->
|
||||
- <pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
|
||||
- <pathelement location="${stax.dir}/sjsxp.jar" />
|
||||
+ <fileset dir="${lib.dir}" includes="*.jar" />
|
||||
</path>
|
||||
|
||||
<path id="core.class.path">
|
||||
@@ -296,7 +286,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
<!-- =================================================================== -->
|
||||
<!-- Creates the jars -->
|
||||
<!-- =================================================================== -->
|
||||
- <target name="jars" depends="compile, javadoc"
|
||||
+ <target name="jars" depends="compile.core, javadoc"
|
||||
description="Builds the Jars">
|
||||
<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
|
||||
<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
|
||||
@@ -316,21 +306,6 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
<fileset dir="${core.build}" includes="**/*.class" />
|
||||
<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
|
||||
</jar>
|
||||
- <jar jarfile="${package}/${jarbase}-contrib.jar" >
|
||||
- <fileset dir="${contrib.build}" includes="**/*" />
|
||||
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
|
||||
- </jar>
|
||||
- <jar jarfile="${package}/${jarbase}-junit.jar" >
|
||||
- <fileset dir="${junit.build}" includes="**/*" />
|
||||
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
|
||||
- </jar>
|
||||
- <jar destfile="${package}/${jarbase}-javadoc.jar"
|
||||
- basedir="${build.javadocs}" includes="**/*" />
|
||||
- <jar jarfile="${package}/${jarbase}-sources.jar" >
|
||||
- <fileset dir="${core.src}" includes="**/*" />
|
||||
- <fileset dir="${junit.src}" includes="**/*" />
|
||||
- <fileset dir="${contrib.src}" includes="**/*" />
|
||||
- </jar>
|
||||
|
||||
</target>
|
||||
|
||||
@@ -500,7 +475,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
<delete dir="${mavendir}" includes="**/*" failonerror="false"/>
|
||||
</target>
|
||||
|
||||
- <target name="maven" depends="maven.clean, package"
|
||||
+ <target name="maven" depends="maven.clean, jars"
|
||||
description="Prepares Maven bundle to load on to Sonatype Nexus for Maven-Central">
|
||||
<mkdir dir="${mavendir}" />
|
||||
<mkdir dir="${mavendir}/core" />
|
||||
@@ -512,8 +487,6 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
|
||||
<!-- copy the build jar -->
|
||||
<copy tofile="${mavendir}/core/${mavenbase}.jar" file="${package}/${jarbase}.jar"/>
|
||||
- <copy tofile="${mavendir}/core/${mavenbase}-javadoc.jar" file="${package}/${jarbase}-javadoc.jar"/>
|
||||
- <copy tofile="${mavendir}/core/${mavenbase}-sources.jar" file="${package}/${jarbase}-sources.jar"/>
|
||||
|
||||
<!-- load the license in to the ${license} property -->
|
||||
<loadfile property="license" srcfile="LICENSE.txt" />
|
||||
@@ -528,27 +501,6 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
</filterset>
|
||||
</copy>
|
||||
|
||||
- <exec dir="${mavendir}/core" executable="${gpg}">
|
||||
- <arg value="-abv"/>
|
||||
- <arg value="${mavenbase}.pom"/>
|
||||
- </exec>
|
||||
- <exec dir="${mavendir}/core" executable="${gpg}">
|
||||
- <arg value="-abv"/>
|
||||
- <arg value="${mavenbase}.jar"/>
|
||||
- </exec>
|
||||
- <exec dir="${mavendir}/core" executable="${gpg}">
|
||||
- <arg value="-abv"/>
|
||||
- <arg value="${mavenbase}-sources.jar"/>
|
||||
- </exec>
|
||||
- <exec dir="${mavendir}/core" executable="${gpg}">
|
||||
- <arg value="-abv"/>
|
||||
- <arg value="${mavenbase}-javadoc.jar"/>
|
||||
- </exec>
|
||||
-
|
||||
- <jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
|
||||
- basedir="${mavendir}/core"
|
||||
- includes="${mavenbase}*" excludes="*maven-bundle*" />
|
||||
-
|
||||
</target>
|
||||
|
||||
</project>
|
||||
--
|
||||
2.25.2
|
||||
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From 07f316957b59d305f04c7bdb26292852bcbc2eb5 Mon Sep 17 00:00:00 2001
|
||||
From: Rolf Lear <rolf@tuis.net>
|
||||
Date: Thu, 1 Jul 2021 23:56:47 -0400
|
||||
Subject: [PATCH] Update test case to ensure DTD handling is OK again. Related
|
||||
#188. Related #189
|
||||
|
||||
---
|
||||
test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||
index a69380ba..a35a1b90 100644
|
||||
--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||
+++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||
@@ -101,6 +101,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
import org.jdom2.DefaultJDOMFactory;
|
||||
import org.jdom2.Document;
|
||||
import org.jdom2.EntityRef;
|
||||
+import org.jdom2.JDOMConstants;
|
||||
import org.jdom2.JDOMException;
|
||||
import org.jdom2.JDOMFactory;
|
||||
import org.jdom2.UncheckedJDOMFactory;
|
||||
@@ -609,11 +610,12 @@ public void testSetExternalFeature() {
|
||||
XMLReader reader = sb.createParser();
|
||||
assertNotNull(reader);
|
||||
assertTrue(reader.getFeature(feature));
|
||||
+ assertNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER));
|
||||
sb.setFeature(feature, false);
|
||||
reader = sb.createParser();
|
||||
assertNotNull(reader);
|
||||
assertFalse(reader.getFeature(feature));
|
||||
-
|
||||
+ assertNotNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
fail("Could not create parser: " + e.getMessage());
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
From 05a8a2fa49e92ad36a86d5d73588a2e46bf9ff95 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Mon, 23 Jul 2018 14:30:14 +0200
|
||||
Subject: [PATCH] Adapt build
|
||||
|
||||
---
|
||||
build.xml | 40 +++++++++++++++++++++++++---------------
|
||||
1 file changed, 25 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index cd7c2ed..10d8df6 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
|
||||
<!-- Compilation class path -->
|
||||
<path id="base.class.path">
|
||||
- <pathelement location="${jaxen.jar}" />
|
||||
- <pathelement location="${parser.jar}" />
|
||||
- <pathelement location="${xmlapi.jar}" />
|
||||
- <pathelement location="${junit.jar}" />
|
||||
- <pathelement location="${isorelax.jar}" />
|
||||
- <pathelement location="${xalan.jar}" />
|
||||
- <pathelement location="${xalanser.jar}" />
|
||||
- <!-- normally these stax jars will not be found -->
|
||||
- <!-- this is used for testing Java5 (the test sets stax.dir) -->
|
||||
- <pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
|
||||
- <pathelement location="${stax.dir}/sjsxp.jar" />
|
||||
+ <fileset dir="${lib.dir}" includes="*.jar" />
|
||||
</path>
|
||||
|
||||
<path id="core.class.path">
|
||||
@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
header="<b>${Name}<br><font size='-1'>${version}</font></b>"
|
||||
bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
|
||||
<classpath refid="base.class.path"/>
|
||||
+ <link href="${j2se.apidoc}"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
@@ -373,11 +364,11 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
<!-- =================================================================== -->
|
||||
<target name="package" depends="coverage, jars"
|
||||
description="Creates the class package">
|
||||
- <zip destfile="${package}/${jarbase}.zip">
|
||||
+ <!--<zip destfile="${package}/${jarbase}.zip">
|
||||
<fileset dir="${package}" includes="${jarbase}*.jar" />
|
||||
<fileset dir="${basedir}" includes="lib/xerces* lib/jaxen* lib/xml* lib/xalan/**" />
|
||||
<fileset dir="${basedir}" includes="LICENSE.txt README.txt" />
|
||||
- </zip>
|
||||
+ </zip>-->
|
||||
</target>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
@@ -401,6 +392,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
<include name="**/*.class"/>
|
||||
<!-- exclude name="**/**/jaxen/**/*.class"/ -->
|
||||
</fileset>
|
||||
+ <classpath refid="junit.class.path" />
|
||||
</cobertura-instrument>
|
||||
|
||||
<property name="forkjunit" value="true" />
|
||||
@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
</filterset>
|
||||
</copy>
|
||||
|
||||
- <exec dir="${mavendir}/core" executable="${gpg}">
|
||||
+ <copy filtering="true" file="maven/contrib.pom" tofile="${mavendir}/core/${mavenbase}-contrib.pom">
|
||||
+ <filterset>
|
||||
+ <filter token="artifactID" value="${mavenartifact}"/>
|
||||
+ <filter token="version" value="${version}" />
|
||||
+ <filter token="jdk" value="${compile.target}" />
|
||||
+ <filter token="license" value="${license}" />
|
||||
+ </filterset>
|
||||
+ </copy>
|
||||
+
|
||||
+ <copy filtering="true" file="maven/junit.pom" tofile="${mavendir}/core/${mavenbase}-junit.pom">
|
||||
+ <filterset>
|
||||
+ <filter token="artifactID" value="${mavenartifact}"/>
|
||||
+ <filter token="version" value="${version}" />
|
||||
+ <filter token="jdk" value="${compile.target}" />
|
||||
+ <filter token="license" value="${license}" />
|
||||
+ </filterset>
|
||||
+ </copy>
|
||||
+
|
||||
+ <!--exec dir="${mavendir}/core" executable="${gpg}">
|
||||
<arg value="-abv"/>
|
||||
<arg value="${mavenbase}.pom"/>
|
||||
</exec>
|
||||
@@ -543,7 +553,7 @@ For instructions on how to build JDOM, please view the README.txt file.
|
||||
<exec dir="${mavendir}/core" executable="${gpg}">
|
||||
<arg value="-abv"/>
|
||||
<arg value="${mavenbase}-javadoc.jar"/>
|
||||
- </exec>
|
||||
+ </exec-->
|
||||
|
||||
<jar destfile="${mavendir}/${mavenbase}-maven-bundle.jar"
|
||||
basedir="${mavendir}/core"
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.jdom</groupId>
|
||||
<artifactId>@artifactID@-contrib</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>JDOM Contrib</name>
|
||||
<version>@version@</version>
|
||||
|
||||
<description>
|
||||
A complete, Java-based solution for accessing, manipulating,
|
||||
and outputting XML data
|
||||
</description>
|
||||
<url>http://www.jdom.org</url>
|
||||
|
||||
<organization>
|
||||
<name>JDOM</name>
|
||||
<url>http://www.jdom.org</url>
|
||||
</organization>
|
||||
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>JDOM-interest Mailing List</name>
|
||||
<post>jdom-interest@jdom.org</post>
|
||||
<archive>http://jdom.markmail.org/</archive>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Similar to Apache License but with the acknowledgment clause removed</name>
|
||||
<url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments xml:space="preserve"><![CDATA[
|
||||
|
||||
@license@
|
||||
|
||||
]]></comments>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<scm>
|
||||
<url>git@github.com:/hunterhacker/jdom</url>
|
||||
<connection>scm:git:git@github.com:hunterhacker/jdom</connection>
|
||||
<developerConnection>scm:git:git@github.com:hunterhacker/jdom</developerConnection>
|
||||
</scm>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>hunterhacker</id>
|
||||
<name>Jason Hunter</name>
|
||||
<email>jhunter@servlets.com</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rolfl</id>
|
||||
<name>Rolf Lear</name>
|
||||
<email>jdom@tuis.net</email>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jdom</groupId>
|
||||
<artifactId>@artifactID@</artifactId>
|
||||
<version>@version@</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jaxen</groupId>
|
||||
<artifactId>jaxen</artifactId>
|
||||
<version>1.1.4</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>xerces</groupId>
|
||||
<artifactId>xercesImpl</artifactId>
|
||||
<version>2.10.0</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>isorelax</groupId>
|
||||
<artifactId>isorelax</artifactId>
|
||||
<version>20030108</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>stax</groupId>
|
||||
<artifactId>stax-api</artifactId>
|
||||
<version>1.0.1</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<jdk.version>@jdk@</jdk.version>
|
||||
</properties>
|
||||
</project>
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.jdom</groupId>
|
||||
<artifactId>@artifactID@-junit</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>JDOM Junit</name>
|
||||
<version>@version@</version>
|
||||
|
||||
<description>
|
||||
A complete, Java-based solution for accessing, manipulating,
|
||||
and outputting XML data
|
||||
</description>
|
||||
<url>http://www.jdom.org</url>
|
||||
|
||||
<organization>
|
||||
<name>JDOM</name>
|
||||
<url>http://www.jdom.org</url>
|
||||
</organization>
|
||||
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>JDOM-interest Mailing List</name>
|
||||
<post>jdom-interest@jdom.org</post>
|
||||
<archive>http://jdom.markmail.org/</archive>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Similar to Apache License but with the acknowledgment clause removed</name>
|
||||
<url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments xml:space="preserve"><![CDATA[
|
||||
|
||||
@license@
|
||||
|
||||
]]></comments>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<scm>
|
||||
<url>git@github.com:/hunterhacker/jdom</url>
|
||||
<connection>scm:git:git@github.com:hunterhacker/jdom</connection>
|
||||
<developerConnection>scm:git:git@github.com:hunterhacker/jdom</developerConnection>
|
||||
</scm>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>hunterhacker</id>
|
||||
<name>Jason Hunter</name>
|
||||
<email>jhunter@servlets.com</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rolfl</id>
|
||||
<name>Rolf Lear</name>
|
||||
<email>jdom@tuis.net</email>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jdom</groupId>
|
||||
<artifactId>@artifactID@</artifactId>
|
||||
<version>@version@</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jaxen</groupId>
|
||||
<artifactId>jaxen</artifactId>
|
||||
<version>1.1.4</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>xerces</groupId>
|
||||
<artifactId>xercesImpl</artifactId>
|
||||
<version>2.10.0</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.11</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<version>3.3.1</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>asm</groupId>
|
||||
<artifactId>asm-tree</artifactId>
|
||||
<version>3.3.1</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.17</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.sourceforge.cobertura</groupId>
|
||||
<artifactId>cobertura</artifactId>
|
||||
<version>1.9.4.1</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.sourceforge.cobertura</groupId>
|
||||
<artifactId>cobertura-runtime</artifactId>
|
||||
<version>1.9.4.1</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<jdk.version>@jdk@</jdk.version>
|
||||
</properties>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
From bd3ab78370098491911d7fe9d7a43b97144a234e Mon Sep 17 00:00:00 2001
|
||||
From: Esti <esther.burs@gmail.com>
|
||||
Date: Thu, 18 Feb 2021 16:40:01 +0200
|
||||
Subject: [PATCH] fix setFeature bug and add test case
|
||||
|
||||
---
|
||||
core/src/java/org/jdom2/input/SAXBuilder.java | 10 ++++------
|
||||
.../test/cases/input/TestSAXBuilder.java | 20 +++++++++++++++++++
|
||||
2 files changed, 24 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||
index d7105ec6..a1462334 100644
|
||||
--- a/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||
+++ b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||
@@ -971,11 +971,6 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH
|
||||
}
|
||||
}
|
||||
|
||||
- // Set any user-specified features on the parser.
|
||||
- for (final Map.Entry<String, Boolean> me : features.entrySet()) {
|
||||
- internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey());
|
||||
- }
|
||||
-
|
||||
// Set any user-specified properties on the parser.
|
||||
for (final Map.Entry<String, Object> me : properties.entrySet()) {
|
||||
internalSetProperty(parser, me.getKey(), me.getValue(), me.getKey());
|
||||
@@ -1007,7 +1002,10 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH
|
||||
// No lexical reporting available
|
||||
}
|
||||
}
|
||||
-
|
||||
+ // Set any user-specified features on the parser.
|
||||
+ for (final Map.Entry<String, Boolean> me : features.entrySet()) {
|
||||
+ internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey());
|
||||
+ }
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||
index 4ef34834..a69380ba 100644
|
||||
--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||
+++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
|
||||
@@ -600,6 +600,26 @@ public void testSetFeature() {
|
||||
}
|
||||
}
|
||||
|
||||
+ @Test
|
||||
+ public void testSetExternalFeature() {
|
||||
+ String feature = "http://xml.org/sax/features/external-general-entities";
|
||||
+ MySAXBuilder sb = new MySAXBuilder();
|
||||
+ try {
|
||||
+ sb.setFeature(feature, true);
|
||||
+ XMLReader reader = sb.createParser();
|
||||
+ assertNotNull(reader);
|
||||
+ assertTrue(reader.getFeature(feature));
|
||||
+ sb.setFeature(feature, false);
|
||||
+ reader = sb.createParser();
|
||||
+ assertNotNull(reader);
|
||||
+ assertFalse(reader.getFeature(feature));
|
||||
+
|
||||
+ } catch (Exception e) {
|
||||
+ e.printStackTrace();
|
||||
+ fail("Could not create parser: " + e.getMessage());
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
@Test
|
||||
public void testSetProperty() {
|
||||
LexicalHandler lh = new LexicalHandler() {
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From dd4f3c2fc7893edd914954c73eb577f925a7d361 Mon Sep 17 00:00:00 2001
|
||||
From: Rolf Lear <rolf@tuis.net>
|
||||
Date: Thu, 1 Jul 2021 23:42:05 -0400
|
||||
Subject: [PATCH] Addresses #189 - synchronizes external entity expansion
|
||||
setting
|
||||
|
||||
---
|
||||
core/src/java/org/jdom2/input/SAXBuilder.java | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||
index a1462334..514b026d 100644
|
||||
--- a/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||
+++ b/core/src/java/org/jdom2/input/SAXBuilder.java
|
||||
@@ -82,6 +82,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
import org.jdom2.DocType;
|
||||
import org.jdom2.Document;
|
||||
import org.jdom2.EntityRef;
|
||||
+import org.jdom2.JDOMConstants;
|
||||
import org.jdom2.JDOMException;
|
||||
import org.jdom2.JDOMFactory;
|
||||
import org.jdom2.Verifier;
|
||||
@@ -797,6 +798,11 @@ public void setFastReconfigure(final boolean fastReconfigure) {
|
||||
public void setFeature(final String name, final boolean value) {
|
||||
// Save the specified feature for later.
|
||||
features.put(name, value ? Boolean.TRUE : Boolean.FALSE);
|
||||
+ if (JDOMConstants.SAX_FEATURE_EXTERNAL_ENT.equals(name)) {
|
||||
+ // See issue https://github.com/hunterhacker/jdom/issues/189
|
||||
+ // And PR https://github.com/hunterhacker/jdom/pull/188
|
||||
+ setExpandEntities(value);
|
||||
+ }
|
||||
engine = null;
|
||||
}
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ wget "https://github.com/hunterhacker/jdom/archive/JDOM-${version}.tar.gz" -O "$
|
|||
|
||||
rm -rf tarball-tmp
|
||||
mkdir tarball-tmp
|
||||
cd tarball-tmp
|
||||
pushd tarball-tmp
|
||||
tar xf "../${name}-${version}.orig.tar.gz"
|
||||
|
||||
# CLEAN TARBALL
|
||||
|
|
@ -17,6 +17,6 @@ rm -r */lib */*/lib
|
|||
find -name '*.jar' -delete
|
||||
find -name '*.class' -delete
|
||||
|
||||
tar cf "../${name}-${version}.tar.gz" *
|
||||
cd ..
|
||||
tar -czf "../${name}-${version}.tar.gz" *
|
||||
popd
|
||||
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
%bcond_with bootstrap
|
||||
|
||||
Name: jdom2
|
||||
Version: 2.0.6
|
||||
Release: 14%{?dist}
|
||||
Release: 29%{?dist}
|
||||
Summary: Java manipulation of XML made easy
|
||||
License: Saxpath
|
||||
URL: http://www.jdom.org/
|
||||
# ./generate-tarball.sh
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
# originally taken from http://repo1.maven.org/maven2/org/jdom/jdom-contrib/1.1.3/jdom-contrib-1.1.3.pom
|
||||
Source1: jdom-contrib-template.pom
|
||||
Source2: jdom-junit-template.pom
|
||||
# Bnd tool configuration
|
||||
Source3: bnd.properties
|
||||
# Remove bundled jars that might not have clear licensing
|
||||
|
|
@ -18,18 +17,25 @@ Source4: generate-tarball.sh
|
|||
# Process contrib and junit pom files
|
||||
Patch0: 0001-Adapt-build.patch
|
||||
|
||||
#
|
||||
# Security patches
|
||||
# P100 -> ...
|
||||
#
|
||||
# CVE-2021-33813
|
||||
Patch100: bd3ab78370098491911d7fe9d7a43b97144a234e.patch
|
||||
Patch101: dd4f3c2fc7893edd914954c73eb577f925a7d361.patch
|
||||
Patch102: 07f316957b59d305f04c7bdb26292852bcbc2eb5.patch
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: isorelax
|
||||
BuildRequires: jaxen
|
||||
BuildRequires: xalan-j2
|
||||
BuildRequires: xerces-j2
|
||||
BuildRequires: xml-commons-apis
|
||||
BuildRequires: log4j12
|
||||
#BuildRequires: aqute-bnd
|
||||
%endif
|
||||
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
%description
|
||||
JDOM is a Java-oriented object model which models XML documents.
|
||||
|
|
@ -53,18 +59,22 @@ This package contains javadoc for %{name}.
|
|||
|
||||
%patch0 -p1
|
||||
|
||||
cp -p %{SOURCE1} maven/contrib.pom
|
||||
cp -p %{SOURCE2} maven/junit.pom
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
|
||||
sed -i 's/\r//' LICENSE.txt README.txt
|
||||
|
||||
# Unable to run coverage: use log4j12 but switch to log4j 2.x
|
||||
sed -i.coverage "s|coverage, jars|jars|" build.xml
|
||||
|
||||
# XPath functionality is not needed
|
||||
rm -rf core/src/java/org/jdom2/xpath/
|
||||
sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMConstants.java
|
||||
|
||||
%build
|
||||
mkdir lib
|
||||
build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer
|
||||
ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven
|
||||
%ant -Dversion=%{version} -Dcompile.source=1.7 -Dcompile.target=1.7 -Dj2se.apidoc=%{_javadocdir}/java maven
|
||||
|
||||
# Make jar into an OSGi bundle
|
||||
# XXX disabled until BND is fixed
|
||||
|
|
@ -74,8 +84,6 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc
|
|||
|
||||
%install
|
||||
%mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar
|
||||
%mvn_artifact build/maven/core/%{name}-%{version}-contrib.pom build/package/jdom-%{version}-contrib.jar
|
||||
%mvn_artifact build/maven/core/%{name}-%{version}-junit.pom build/package/jdom-%{version}-junit.jar
|
||||
%mvn_install -J build/apidocs
|
||||
|
||||
%files -f .mfiles
|
||||
|
|
@ -86,12 +94,68 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc
|
|||
%license LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-29
|
||||
- Rebuild to regenerate auto-requires
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.6-27
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-25
|
||||
- Bump Java compiler source/target levels to 1.7
|
||||
|
||||
* Thu Oct 14 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-24
|
||||
- Add patches to address DoS security vulnerability
|
||||
- Resolves CVE-2021-33813
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-22
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Sep 10 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0.6-20
|
||||
- Drop log4j12 dependency and switch junit module to log4j 1.2 API shim.
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sun Jul 19 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0.6-18
|
||||
- Set javac source and target to 1.8 to fix Java 11 builds.
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.0.6-17
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Thu May 07 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0.6-16
|
||||
- Drop optional isorelax verifier support from contrib.
|
||||
|
||||
* Mon Apr 20 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-15
|
||||
- Disable contrib module
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-14
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-13
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jul 23 2018 Michael Simacek <msimacek@redhat.com> - 2.0.6-12
|
||||
- Repack tarball without bundled jars
|
||||
- The repacked jar contains slightly different source (force push by upstream?)
|
||||
Loading…
Reference in New Issue