From cddc13168fa22b1eeb00410cdd8b4f5f9ba15ee5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:50 +0200 Subject: [PATCH 01/12] Mass rebuild for javapackages-tools 201901 --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 9c496a8..0e91029 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -86,6 +86,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.0.6-13 +- Mass rebuild for javapackages-tools 201901 + * Mon Jul 23 2018 Michael Simacek - 2.0.6-12 - Repack tarball without bundled jars - The repacked jar contains slightly different source (force push by upstream?) From 55aae16aa8ffc5689c58a062575c038a94b7cbd1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 2 Aug 2019 10:07:48 +0200 Subject: [PATCH 02/12] Disable OSGi manifest injection unlit BND is fixed --- jdom2.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 0e91029..b29a90e 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -27,7 +27,7 @@ BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis BuildRequires: log4j12 -BuildRequires: aqute-bnd +#BuildRequires: aqute-bnd BuildArch: noarch @@ -68,9 +68,10 @@ build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle -bnd wrap --output build/package/jdom-%{version}.bar --properties %{SOURCE3} \ - --version %{version} build/package/jdom-%{version}.jar -mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar +# XXX disabled until BND is fixed +#bnd wrap --output build/package/jdom-%{version}.bar --properties %{SOURCE3} \ +# --version %{version} build/package/jdom-%{version}.jar +#mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %install %mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar From 7110c8dfdcd605b090ac871034a33d332956af64 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 14:22:49 +0100 Subject: [PATCH 03/12] Set compiler source/target levels to 1.6 --- jdom2.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index b29a90e..1bae457 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -61,11 +61,10 @@ 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 +%build mkdir lib build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer - -%build -ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven +ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle # XXX disabled until BND is fixed From 13d138c6c33fe7dfa09edd95666b2f8ab7cb004b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 04/12] Mass rebuild for javapackages-tools 201902 --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 1bae457..879249c 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -86,6 +86,9 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc %license LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0.6-14 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 2.0.6-13 - Mass rebuild for javapackages-tools 201901 From 7f370edaef94cf4cbcfc7743de4c048c80892db6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:27:17 +0100 Subject: [PATCH 05/12] Properly compress tarballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index b869a6b..e864f8b 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -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" From 56c0a7a04b46d58bd4b964d69b8060d646d50867 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Apr 2020 09:29:34 +0200 Subject: [PATCH 06/12] Disable contrib module --- 0001-Adapt-build.patch | 139 ++++++++++++++++++++------------------ jdom-contrib-template.pom | 96 -------------------------- jdom-junit-template.pom | 120 -------------------------------- jdom2.spec | 18 ++--- 4 files changed, 81 insertions(+), 292 deletions(-) delete mode 100644 jdom-contrib-template.pom delete mode 100644 jdom-junit-template.pom diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index 87e9f3b..e970552 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -1,14 +1,14 @@ -From 05a8a2fa49e92ad36a86d5d73588a2e46bf9ff95 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 23 Jul 2018 14:30:14 +0200 +From cf7e676edc7ab9d4b8b130ca4d8ecbd291995dea Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 20 Apr 2020 09:29:12 +0200 Subject: [PATCH] Adapt build --- - build.xml | 40 +++++++++++++++++++++++++--------------- - 1 file changed, 25 insertions(+), 15 deletions(-) + build.xml | 54 +++--------------------------------------------------- + 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/build.xml b/build.xml -index cd7c2ed..10d8df6 100644 +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. @@ -30,72 +30,83 @@ index cd7c2ed..10d8df6 100644 -@@ -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."> - -+ - +@@ -296,7 +286,7 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- + + +@@ -316,21 +306,6 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- + -@@ -373,11 +364,11 @@ For instructions on how to build JDOM, please view the README.txt file. - - -- -+ +@@ -500,7 +475,7 @@ For instructions on how to build JDOM, please view the README.txt file. + - - -@@ -401,6 +392,7 @@ For instructions on how to build JDOM, please view the README.txt file. - - - -+ - + +- + + +@@ -512,8 +487,6 @@ For instructions on how to build JDOM, please view the README.txt file. - -@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file. + + +- +- + + + +@@ -528,27 +501,6 @@ For instructions on how to build JDOM, please view the README.txt file. - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + -- -2.17.1 +2.25.2 diff --git a/jdom-contrib-template.pom b/jdom-contrib-template.pom deleted file mode 100644 index d719410..0000000 --- a/jdom-contrib-template.pom +++ /dev/null @@ -1,96 +0,0 @@ - - 4.0.0 - org.jdom - @artifactID@-contrib - jar - - JDOM Contrib - @version@ - - - A complete, Java-based solution for accessing, manipulating, - and outputting XML data - - http://www.jdom.org - - - JDOM - http://www.jdom.org - - - - - JDOM-interest Mailing List - jdom-interest@jdom.org - http://jdom.markmail.org/ - - - - - - Similar to Apache License but with the acknowledgment clause removed - https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt - repo - - - - - - git@github.com:/hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - - - - - hunterhacker - Jason Hunter - jhunter@servlets.com - - - rolfl - Rolf Lear - jdom@tuis.net - - - - - - org.jdom - @artifactID@ - @version@ - - - jaxen - jaxen - 1.1.4 - true - - - xerces - xercesImpl - 2.10.0 - true - - - isorelax - isorelax - 20030108 - true - - - stax - stax-api - 1.0.1 - true - - - - - @jdk@ - - \ No newline at end of file diff --git a/jdom-junit-template.pom b/jdom-junit-template.pom deleted file mode 100644 index 70c6554..0000000 --- a/jdom-junit-template.pom +++ /dev/null @@ -1,120 +0,0 @@ - - 4.0.0 - org.jdom - @artifactID@-junit - jar - - JDOM Junit - @version@ - - - A complete, Java-based solution for accessing, manipulating, - and outputting XML data - - http://www.jdom.org - - - JDOM - http://www.jdom.org - - - - - JDOM-interest Mailing List - jdom-interest@jdom.org - http://jdom.markmail.org/ - - - - - - Similar to Apache License but with the acknowledgment clause removed - https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt - repo - - - - - - git@github.com:/hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - - - - - hunterhacker - Jason Hunter - jhunter@servlets.com - - - rolfl - Rolf Lear - jdom@tuis.net - - - - - - org.jdom - @artifactID@ - @version@ - - - jaxen - jaxen - 1.1.4 - true - - - xerces - xercesImpl - 2.10.0 - true - - - junit - junit - 4.11 - true - - - asm - asm - 3.3.1 - true - - - asm - asm-tree - 3.3.1 - true - - - log4j - log4j - 1.2.17 - true - - - net.sourceforge.cobertura - cobertura - 1.9.4.1 - true - - - net.sourceforge.cobertura - cobertura-runtime - 1.9.4.1 - true - - - - - @jdk@ - - \ No newline at end of file diff --git a/jdom2.spec b/jdom2.spec index 879249c..af10384 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,14 +1,11 @@ Name: jdom2 Version: 2.0.6 -Release: 14%{?dist} +Release: 15%{?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 @@ -23,8 +20,6 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: isorelax BuildRequires: jaxen -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 BuildRequires: xml-commons-apis BuildRequires: log4j12 #BuildRequires: aqute-bnd @@ -53,9 +48,6 @@ This package contains javadoc for %{name}. %patch0 -p1 -cp -p %{SOURCE1} maven/contrib.pom -cp -p %{SOURCE2} maven/junit.pom - sed -i 's/\r//' LICENSE.txt README.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x @@ -63,7 +55,8 @@ sed -i.coverage "s|coverage, jars|jars|" build.xml %build mkdir lib -build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer +#build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer +build-jar-repository lib jaxen ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle @@ -74,8 +67,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,6 +77,9 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc %license LICENSE.txt %changelog +* Mon Apr 20 2020 Mikolaj Izdebski - 2.0.6-15 +- Disable contrib module + * Tue Nov 05 2019 Mikolaj Izdebski - 2.0.6-14 - Mass rebuild for javapackages-tools 201902 From 79a534d6ef1f73b4b819830a78c6bc7c1da94f34 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 06:34:50 +0200 Subject: [PATCH 07/12] Remove unneeded dependencies --- jdom2.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index af10384..e313029 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -18,11 +18,8 @@ Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: isorelax BuildRequires: jaxen -BuildRequires: xml-commons-apis BuildRequires: log4j12 -#BuildRequires: aqute-bnd BuildArch: noarch From b82e46814b656c20cddc87e13fdc188338224c59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 11:22:37 +0200 Subject: [PATCH 08/12] Remove XPath functionality --- jdom2.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index e313029..fee0abc 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -18,7 +18,6 @@ Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: jaxen BuildRequires: log4j12 BuildArch: noarch @@ -50,10 +49,12 @@ 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 -build-jar-repository lib jaxen ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle From e23286dabf4bf8aaf57915b81142f72424e2bff0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 28 Apr 2020 12:02:53 +0200 Subject: [PATCH 09/12] Drop buildrequires on log4j12 --- jdom2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index fee0abc..9b60df7 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -18,7 +18,6 @@ Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: log4j12 BuildArch: noarch From 9e7c20382c5348db5d2c37b43b7cc520e0428561 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 10/12] Conditionalize buildrequires in bootstrap mode --- jdom2.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jdom2.spec b/jdom2.spec index 9b60df7..96cd5e5 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: jdom2 Version: 2.0.6 Release: 15%{?dist} @@ -16,8 +18,12 @@ Source4: generate-tarball.sh Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: ant BuildRequires: ant-junit +%endif BuildArch: noarch From d29f52bb8f29db3759e7cfc58f5793d19211e931 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 18:31:23 +0200 Subject: [PATCH 11/12] Use %ant macro --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 96cd5e5..fa0f516 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -60,7 +60,7 @@ sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMCons %build mkdir lib -ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven +%ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle # XXX disabled until BND is fixed From 770b63da6d60f31758d10f5407105f6eea4a6f4e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 12/12] Turn off bootstrap mode by default --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index fa0f516..cee1a56 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: jdom2 Version: 2.0.6