From 167ae87f617800de6735ab55611ae4a585ef06c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/11] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index acfb54e..a92c68f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9af6ed5d009061986d709a370829860e commons-jxpath-1.3-src.tar.gz +SHA512 (commons-jxpath-1.3-src.tar.gz) = a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152 From e9d24e45d2cf5aa14d46bb7197107b0be74807cb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:18 +0200 Subject: [PATCH 02/11] Mass rebuild for javapackages-tools 201901 --- apache-commons-jxpath.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index fe1b9b6..c083c32 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -56,6 +56,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.3-30 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1.3-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 56abb30a81b0556f784c96cd6592757c6296c2ff Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 12 Sep 2019 17:23:30 +0200 Subject: [PATCH 03/11] Fix bogus date --- apache-commons-jxpath.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index c083c32..9bc32ed 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -187,7 +187,7 @@ This package contains the API documentation for %{name}. - Use jdom-1.0-0.rc1.1jpp - Relax some versioned dependencies -* Sun Aug 23 2004 Randy Watler - 0:1.1-3jpp +* Mon Aug 23 2004 Randy Watler - 0:1.1-3jpp - Rebuild with ant-1.6.2 * Tue Jun 01 2004 Randy Watler - 0:1.1-2jpp From f57e065afa8298d4716d0ac39e2c577b942dc4a9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 12 Sep 2019 17:24:15 +0200 Subject: [PATCH 04/11] Remove dependency on glassfish --- apache-commons-jxpath.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 9bc32ed..be4b486 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -12,8 +12,6 @@ Patch0: commons-jxpath-mockrunner.patch BuildRequires: maven-local BuildRequires: mvn(commons-beanutils:commons-beanutils) -BuildRequires: mvn(javax.servlet:jsp-api) -BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -36,6 +34,13 @@ This package contains the API documentation for %{name}. %setup -q -n commons-jxpath-%{version}-src %patch0 -p1 +# Remove dependency on glassfish +%pom_remove_dep :servlet-api +%pom_remove_dep :jsp-api +rm src/java/org/apache/commons/jxpath/servlet/*Context*.java +rm src/java/org/apache/commons/jxpath/servlet/*Handler.java +rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java + %mvn_file ":{*}" %{name} @1 %mvn_alias : org.apache.commons: From cbf8d38402fac5ede0bba60ff0419d0fa28fff53 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 12 Sep 2019 17:39:30 +0200 Subject: [PATCH 05/11] Revert "Remove dependency on glassfish" This reverts commit f57e065afa8298d4716d0ac39e2c577b942dc4a9. --- apache-commons-jxpath.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index be4b486..9bc32ed 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -12,6 +12,8 @@ Patch0: commons-jxpath-mockrunner.patch BuildRequires: maven-local BuildRequires: mvn(commons-beanutils:commons-beanutils) +BuildRequires: mvn(javax.servlet:jsp-api) +BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -34,13 +36,6 @@ This package contains the API documentation for %{name}. %setup -q -n commons-jxpath-%{version}-src %patch0 -p1 -# Remove dependency on glassfish -%pom_remove_dep :servlet-api -%pom_remove_dep :jsp-api -rm src/java/org/apache/commons/jxpath/servlet/*Context*.java -rm src/java/org/apache/commons/jxpath/servlet/*Handler.java -rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java - %mvn_file ":{*}" %{name} @1 %mvn_alias : org.apache.commons: From f7b3386217e0969d7f55b3d4eb7fbc5d18dfe135 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 12 Sep 2019 17:24:15 +0200 Subject: [PATCH 06/11] Remove dependency on glassfish --- apache-commons-jxpath.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 9bc32ed..be4b486 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -12,8 +12,6 @@ Patch0: commons-jxpath-mockrunner.patch BuildRequires: maven-local BuildRequires: mvn(commons-beanutils:commons-beanutils) -BuildRequires: mvn(javax.servlet:jsp-api) -BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) @@ -36,6 +34,13 @@ This package contains the API documentation for %{name}. %setup -q -n commons-jxpath-%{version}-src %patch0 -p1 +# Remove dependency on glassfish +%pom_remove_dep :servlet-api +%pom_remove_dep :jsp-api +rm src/java/org/apache/commons/jxpath/servlet/*Context*.java +rm src/java/org/apache/commons/jxpath/servlet/*Handler.java +rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java + %mvn_file ":{*}" %{name} @1 %mvn_alias : org.apache.commons: From 92369ce37df64e11450202c0d0477195eb680db3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 18:57:03 +0200 Subject: [PATCH 07/11] Set compiler source/target to 1.6 --- apache-commons-jxpath.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index be4b486..c1cc559 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -49,7 +49,7 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %build # we are skipping tests because we don't have com.mockrunner in repos yet -%mvn_build -f +%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 %install %mvn_install From 4438b3d996e25b0255e90b49a1ee3610915d8e63 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 08/11] Mass rebuild for javapackages-tools 201902 --- apache-commons-jxpath.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index c1cc559..544e60a 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -61,6 +61,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.3-31 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.3-30 - Mass rebuild for javapackages-tools 201901 From d05b94f53f1da62173be12949d66bacc011dbba0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Dec 2019 17:35:51 +0100 Subject: [PATCH 09/11] Fix OSGi bundle symbolic name --- apache-commons-jxpath.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 544e60a..3209ed0 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -49,7 +49,7 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %build # we are skipping tests because we don't have com.mockrunner in repos yet -%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 +%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 -Dcommons.osgi.symbolicName=org.apache.commons.jxpath %install %mvn_install From 565f25d74a1c82e3de72d5d9d668a4617f03a878 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 05:56:57 +0200 Subject: [PATCH 10/11] Remove deps on xerces and xml-apis --- apache-commons-jxpath.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 3209ed0..f98509f 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -16,8 +16,6 @@ BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(xerces:xercesImpl) -BuildRequires: mvn(xml-apis:xml-apis) %description Defines a simple interpreter of an expression language called XPath. @@ -34,6 +32,9 @@ This package contains the API documentation for %{name}. %setup -q -n commons-jxpath-%{version}-src %patch0 -p1 +%pom_remove_dep xerces: +%pom_remove_dep xml-apis: + # Remove dependency on glassfish %pom_remove_dep :servlet-api %pom_remove_dep :jsp-api From 5767be9f45b43e635cd2fc452ed2fe7c45ef9bba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 11/11] Conditionalize buildrequires in bootstrap mode --- apache-commons-jxpath.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index f98509f..0d620c6 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-jxpath Version: 1.3 Release: 31%{?dist} @@ -11,11 +13,15 @@ Source0: http://www.apache.org/dist/commons/jxpath/source/commons-jxpath- Patch0: commons-jxpath-mockrunner.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +%endif %description Defines a simple interpreter of an expression language called XPath.