.gitignore

@@ -1,3 +1 @@
-jdom-1.1.1.tar.gz
-jdom-1.1.2.tar.gz
-jdom-1.1.3.tar.gz
+SOURCES/jdom-1.1.3.tar.gz

.jdom.metadata

@@ -0,0 +1 @@
+21f36cfda1c3a4d62182bda68afda3e58bc17c2e SOURCES/jdom-1.1.3.tar.gz

CVE-2021-33813.patch

@@ -1,42 +0,0 @@
---- libjdom1-java-1.1.3.orig/src/java/org/jdom/input/SAXBuilder.java
-+++ libjdom1-java-1.1.3/src/java/org/jdom/input/SAXBuilder.java
-@@ -442,6 +442,11 @@ public class SAXBuilder {
-     public void setFeature(String name, boolean value) {
-         // Save the specified feature for later.
-         features.put(name, value ? Boolean.TRUE : Boolean.FALSE);
-+        if (name.equals("http://xml.org/sax/features/external-general-entities")) {
-+            // See issue https://github.com/hunterhacker/jdom/issues/189
-+            // And PR https://github.com/hunterhacker/jdom/pull/188
-+            setExpandEntities(value);
-+        }
-     }
- 
-     /**
-@@ -766,13 +771,6 @@ public class SAXBuilder {
-             internalSetFeature(parser, name, value.booleanValue(), name);
-         }
- 
--        // Set any user-specified properties on the parser.
--        iter = properties.keySet().iterator();
--        while (iter.hasNext()) {
--            String name = (String)iter.next();
--            internalSetProperty(parser, name, properties.get(name), name);
--        }
--
-         if (coreFeatures) {
-             // Set validation.
-             try {
-@@ -810,6 +808,13 @@ public class SAXBuilder {
-         }
-         catch (SAXNotRecognizedException e) { /* Ignore... */ }
-         catch (SAXNotSupportedException  e) { /* Ignore... */ }
-+
-+        // Set any user-specified properties on the parser.
-+        iter = properties.keySet().iterator();
-+        while (iter.hasNext()) {
-+            String name = (String)iter.next();
-+            internalSetProperty(parser, name, properties.get(name), name);
-+        }
-     }
- 
-     /**

SPECS/jdom.spec

@@ -1,5 +1,3 @@
-%bcond_with bootstrap
-
 # Copyright (c) 2000-2012, JPackage Project
 # All rights reserved.
 #
@@ -32,7 +30,8 @@
 
 Name:           jdom
 Version:        1.1.3
-Release:        31%{?dist}
+Release:        17%{?dist}
+Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Saxpath
 URL:            http://www.jdom.org/
@@ -41,21 +40,13 @@ Source1:        http://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{ve
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-1.1-OSGiManifest.patch
 
-#
-# Security patches
-# P100 -> ...
-#
-Patch100:       CVE-2021-33813.patch
-
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  javapackages-local
 BuildRequires:  ant
-%endif
+BuildRequires:  javapackages-local
+
+BuildRequires:  mvn(jaxen:jaxen)
+BuildRequires:  mvn(xerces:xercesImpl)
 
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 %description
 JDOM is, quite simply, a Java representation of an XML document. JDOM
@@ -73,7 +64,7 @@ Javadoc for %{name}.
 
 %package demo
 Summary:        Demos for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description demo
 Demonstrations and samples for %{name}.
@@ -83,13 +74,13 @@ Demonstrations and samples for %{name}.
 %setup -q -n %{name}
 %patch0 -p0
 %patch1 -p0
-%patch100 -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
 %build
-%ant -Dcompile.source=1.7 -Dcompile.target=1.7 -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
+export CLASSPATH=$(build-classpath xerces-j2 jaxen)
+ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
 
 %install
 %mvn_file : %{name}
@@ -113,58 +104,6 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 %license LICENSE.txt
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.1.3-30
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-28
-- Bump Java compiler source/target levels to 1.7
-
-* Thu Jul 22 2021 Nicolas Lécureuil <neoclust@mageia.org> - 1.1.3-27
-- Add P100: Fixes CVE-2021-33813
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-25
-- Bump release
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-20
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.1.3-22
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jun 25 2020 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.3-21
-- Fix compilation with Java 11.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-19
-- Mass rebuild for javapackages-tools 201902
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-18
-- Mass rebuild for javapackages-tools 201901
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 0:1.1.3-17
 - Correct license to Saxpath
 

sources

@@ -1 +0,0 @@
-SHA512 (jdom-1.1.3.tar.gz) = a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278