From 71ce478ba4156020cedebb3482e618de716b1952 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:19:57 +0000 Subject: [PATCH 01/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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..a2f186f 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 +* Thu Jul 12 2018 Fedora Release Engineering - 1.3-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.3-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 729d8eff82084abbb41536618156b1da63894998 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:28:56 +0000 Subject: [PATCH 02/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 a2f186f..0c106a0 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/ @@ -56,6 +56,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.3-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1.3-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 7ff53afa2beb51c6b9e97b742a9d4a4b19d93efe Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 7 Feb 2019 15:53:36 +0000 Subject: [PATCH 03/52] Rebuild to fix OSGi metadata --- apache-commons-jxpath.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 0c106a0..2d51b71 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -44,7 +44,7 @@ This package contains the API documentation for %{name}. %build # we are skipping tests because we don't have com.mockrunner in repos yet -%mvn_build -f +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.jxpath %install %mvn_install @@ -56,6 +56,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Thu Feb 07 2019 Mat Booth - 1.3-32 +- Rebuild to fix OSGi metadata + * Thu Jan 31 2019 Fedora Release Engineering - 1.3-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3b72e588f35ed0659b9da3ee354cc2721205faa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:05:29 +0000 Subject: [PATCH 04/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 2d51b71..20bb3c8 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 32%{?dist} +Release: 33%{?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 +* Wed Jul 24 2019 Fedora Release Engineering - 1.3-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 07 2019 Mat Booth - 1.3-32 - Rebuild to fix OSGi metadata From e52de4aa447519555ecffddbb7720a888f1a4960 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:45:38 +0000 Subject: [PATCH 05/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 20bb3c8..7448fe9 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 33%{?dist} +Release: 34%{?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 +* Tue Jan 28 2020 Fedora Release Engineering - 1.3-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.3-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c13c6da00d7d154776db53245efa8ff2a2029322 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 22 May 2020 23:13:20 +0200 Subject: [PATCH 06/52] set javac -source and -target to 1.8 --- apache-commons-jxpath.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 7448fe9..2ae46dd 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -15,9 +15,7 @@ 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:) -BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(xerces:xercesImpl) BuildRequires: mvn(xml-apis:xml-apis) @@ -44,7 +42,7 @@ This package contains the API documentation for %{name}. %build # we are skipping tests because we don't have com.mockrunner in repos yet -%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.jxpath +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.jxpath -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -56,6 +54,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Fri May 22 2020 Fabio Valentini - 1.3-35 +- Set javac -source and -target to 1.8. + * Tue Jan 28 2020 Fedora Release Engineering - 1.3-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 37d6cf50453c9cd4d4ba1b75c06b53b1beccb0d5 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 15:35:58 +0200 Subject: [PATCH 07/52] Rebuilt for JDK-11 --- 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 2ae46dd..a013db1 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -54,6 +54,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 1.3-36 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri May 22 2020 Fabio Valentini - 1.3-35 - Set javac -source and -target to 1.8. From 3e9ce73192f5b4c2beb28b4dc316866883bdcac6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:11:00 +0000 Subject: [PATCH 08/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 a013db1..57bf65b 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -54,6 +54,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.3-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1.3-36 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 47370419457294b672ee19f053a248bf8da593e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:14:36 +0000 Subject: [PATCH 09/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 57bf65b..ad7ad61 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -54,6 +54,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.3-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.3-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5767be9f45b43e635cd2fc452ed2fe7c45ef9bba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 10/52] 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. From f45a7b2061f7033b1c9955e4757cd245b12d9ccc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 11/52] Turn off bootstrap mode by default --- 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 e0937f5..89e6989 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-jxpath Version: 1.3 From b62220502136111155bf7ec1735658003969800d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:28 +0200 Subject: [PATCH 12/52] Bootstrap build --- apache-commons-jxpath.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 89e6989..1a25171 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-commons-jxpath Version: 1.3 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -67,6 +67,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.3-39 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1.3-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 30f6b51711a4c65cd350d7586b4b28aa5096465a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:41 +0200 Subject: [PATCH 13/52] Non-bootstrap build --- apache-commons-jxpath.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 1a25171..dc5ebef 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-jxpath Version: 1.3 @@ -69,6 +69,7 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %changelog * Mon May 17 2021 Mikolaj Izdebski - 1.3-39 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.3-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 835ba90859388c2bb6ad56599e71c3173027e372 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:47:08 +0000 Subject: [PATCH 14/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bf9ec2d1365fb895ad8135855a4c9dde1708d845 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:43:07 +0000 Subject: [PATCH 15/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 dc5ebef..840f114 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -67,6 +67,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.3-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1.3-39 - Bootstrap build - Non-bootstrap build From 94abfedfb6b477dcff4db4db01d76404e0d09c0a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 15:57:38 +0100 Subject: [PATCH 16/52] Bump Java compiler source/target levels to 1.7 --- apache-commons-jxpath.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 840f114..ef0dc82 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -55,7 +55,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 -Dcommons.osgi.symbolicName=org.apache.commons.jxpath +%mvn_build -f -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 -Dcommons.osgi.symbolicName=org.apache.commons.jxpath %install %mvn_install @@ -67,6 +67,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 1.3-41 +- Bump Java compiler source/target levels to 1.7 + * Wed Jul 21 2021 Fedora Release Engineering - 1.3-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ab9de883381eaf10f171c1cbeae11378e9cdc141 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jan 2022 09:52:56 +0100 Subject: [PATCH 17/52] Module javapackages-tools stream 202001 was retired --- .gitignore | 4 - apache-commons-jxpath.spec | 206 -------------------------------- commons-jxpath-mockrunner.patch | 47 -------- dead.package | 1 + sources | 1 - 5 files changed, 1 insertion(+), 258 deletions(-) delete mode 100644 .gitignore delete mode 100644 apache-commons-jxpath.spec delete mode 100644 commons-jxpath-mockrunner.patch create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5b23633..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/commons-jxpath-1.3-src.tar.gz -/.build-*.log -/noarch -/*.src.rpm diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec deleted file mode 100644 index f98509f..0000000 --- a/apache-commons-jxpath.spec +++ /dev/null @@ -1,206 +0,0 @@ -Name: apache-commons-jxpath -Version: 1.3 -Release: 31%{?dist} -Summary: Simple XPath interpreter -License: ASL 2.0 -URL: http://commons.apache.org/jxpath/ -BuildArch: noarch - -Source0: http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-%{version}-src.tar.gz - -Patch0: commons-jxpath-mockrunner.patch - -BuildRequires: maven-local -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) - -%description -Defines a simple interpreter of an expression language called XPath. -JXPath applies XPath expressions to graphs of objects of all kinds: -JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof. - -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%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 -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: - -%pom_xpath_inject 'pom:properties' \ - 'org.apache.commons.beanutils;resolution:="optional",org.jdom*;resolution:="optional",org.w3c.dom;resolution:="optional",javax.servlet*;resolution:="optional",*' - -%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 -Dcommons.osgi.symbolicName=org.apache.commons.jxpath - -%install -%mvn_install - -%files -f .mfiles -%license LICENSE.txt NOTICE.txt - -%files javadoc -f .mfiles-javadoc -%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 - -* Wed Feb 07 2018 Fedora Release Engineering - 1.3-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 31 2017 Mat Booth - 1.3-28 -- Make the OSGi dep on servlet APIs optional - -* Wed Jul 26 2017 Fedora Release Engineering - 1.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.3-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Apr 24 2015 Mat Booth - 1.3-23 -- Fix optional deps in OSGi manifest - -* Tue Apr 14 2015 Mikolaj Izdebski - 1.3-22 -- Cleanup spec file - -* Wed Feb 25 2015 Alexander Kurtakov 1.3-21 -- Rebuild for jsp api. -- Drop old javadoc pre section. - -* Tue Oct 14 2014 Mikolaj Izdebski - 1.3-20 -- Remove legacy Obsoletes/Provides for jakarta-commons - -* Sat Jun 07 2014 Fedora Release Engineering - 1.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.3-18 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 1.3-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Mikolaj Izdebski - 1.3-16 -- Remove unneeded BR: maven-idea-plugin - -* Tue Feb 26 2013 Mikolaj Izdebski - 1.3-15 -- Migrate from Tomcat 6 to Tomcat 7 -- Resolves: rhbz#913879 - -* Wed Feb 13 2013 Fedora Release Engineering - 1.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.3-13 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Jan 15 2013 Michal Srb - 1.3-12 -- Build with xmvn - -* Thu Nov 22 2012 Mikolaj Izdebski - 1.3-11 -- Install NOTICE file -- Resolves: rhbz#879556 - -* Fri Nov 9 2012 Mikolaj Izdebski - 1.3-10 -- Don't build-require maven2 - -* Wed Jul 18 2012 Fedora Release Engineering - 1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Mar 2 2012 Stanislav Ochotnicky 1.3-8 -- Fix build and update to latest guidelines - -* Thu Jan 12 2012 Fedora Release Engineering - 1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 21 2010 Chris Spike 1.3-5 -- tomcat5 -> tomcat6 BRs/Rs - -* Thu Jul 8 2010 Stanislav Ochotnicky - 1.3-4 -- Add license to javadoc subpackage - -* Thu May 27 2010 Stanislav Ochotnicky - 1.3-3 -- Add tomcat5 to BR - -* Tue May 25 2010 Stanislav Ochotnicky - 1.3-2 -- Fix ownership of some directories - -* Tue May 25 2010 Stanislav Ochotnicky - 1.3-1 -- Rename package (jakarta-commons-jxpath->apache-commons-jxpath) -- Cleanup spec file -- Build using maven, drop old pom file from sources -- Update to upstream version - -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-9 -- Fix random spaces. - -* Wed Aug 19 2009 Alexander Kurtakov 0:1.2-8 -- BuildRequires java-devel >= 1.6.0. - -* Wed Aug 19 2009 Alexander Kurtakov 0:1.2-7 -- Initial package for Fedora. - -* Sun May 17 2009 Fernando Nasser - 0:1.2-6 -- Fix License -- Provide intructions for obtaining source and refresh source tar ball - -* Wed Mar 18 2009 Yong Yang - 0:1.2-5 -- rebuild with new maven2 2.0.8 built in bootstrap mode - -* Thu Feb 05 2009 Yong Yang - 0:1.2-4 -- Fix release tag - -* Thu Jan 08 2009 Yong Yang - 0:1.2-3jpp.1 -- Import from dbhole's maven 2.0.8 packages, initial building - -* Wed Apr 09 2008 Deepak Bhole - 0:1.2-2jpp.1 -- Import from JPackage -- Added pom file - -* Wed Jun 07 2006 Fernando Nasser - 0:1.2-2jpp -- First JPP 1.7 build - -* Sat Sep 18 2004 Ralph Apel - 0:1.2-1jpp -- Upgrade to 1.2 -- Use jdom-1.0-0.rc1.1jpp -- Relax some versioned dependencies - -* 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 -- Upgrade to Ant 1.6.X - -* Mon Jan 19 2004 Ralph Apel - 0:1.1-1jpp -- First JPackage release diff --git a/commons-jxpath-mockrunner.patch b/commons-jxpath-mockrunner.patch deleted file mode 100644 index f2587fa..0000000 --- a/commons-jxpath-mockrunner.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 1a4f2c4..f5fa596 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -160,42 +160,6 @@ under the License. - 1.7.0 - true - -- -- com.mockrunner -- mockrunner-jdk1.3-j2ee1.3 -- 0.4 -- test -- -- -- cglib-nodep -- cglib-nodep -- -- -- jboss -- jboss-jee -- -- -- nekohtml -- nekohtml -- -- -- struts -- struts -- -- -- oro -- oro -- -- -- commons-validator -- commons-validator -- -- -- commons-digester -- commons-digester -- -- -- - - - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..78f11b3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Module javapackages-tools stream 202001 was retired diff --git a/sources b/sources deleted file mode 100644 index a92c68f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (commons-jxpath-1.3-src.tar.gz) = a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152 From 0a77a3115f9c7634e4006ea68737b036631e8322 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:25:07 +0000 Subject: [PATCH 18/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 ef0dc82..3ba3484 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -67,6 +67,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.3-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 1.3-41 - Bump Java compiler source/target levels to 1.7 From 8b7f5c0714cf7607d8307bc5c225b5602195690f Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:27:02 +0100 Subject: [PATCH 19/52] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- 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 3ba3484..1bf4f44 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -67,6 +67,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.3-43 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1.3-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0bdb4c674eedf681a3ec14ecaa68a4cdb2732d91 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:23 +0200 Subject: [PATCH 20/52] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-commons-jxpath.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 1bf4f44..3514fea 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -7,6 +7,7 @@ Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-%{version}-src.tar.gz From 82f30f28d5986bb379e529855efe25d7e4c0baa9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 21/52] Update build-requires in bootstrap mode --- 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 3514fea..317aa57 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -13,10 +13,10 @@ 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: maven-local BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) From dbf4ca11f403bfda12448fb07ca146eba9cc3344 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:59:54 +0000 Subject: [PATCH 22/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 317aa57..f52638a 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.3-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1.3-43 - Rebuilt for java-17-openjdk as system jdk From 2fd11821368e6240a7c40d7d432a21bd2900dc5a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 23/52] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From cb5e414794e66ee32062366a97acb620aba88bcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:54:36 +0000 Subject: [PATCH 24/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 f52638a..6813fff 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.3-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.3-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7a9522323188f64058207b5cd126abb12e977c0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:29:13 +0000 Subject: [PATCH 25/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 6813fff..9fc6e5c 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.3-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.3-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 078c94705e78f4cc30b392aa5375a5b3452483e0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:30 +0200 Subject: [PATCH 26/52] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- apache-commons-jxpath.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 9fc6e5c..d846773 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,9 +2,9 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Simple XPath interpreter -License: ASL 2.0 +License: Apache-2.0 URL: http://commons.apache.org/jxpath/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.3-47 +- Convert License tag to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 1.3-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1606b435b00fca613fa67aadd5b7ec532dd8b3e9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Dec 2023 20:15:26 +0100 Subject: [PATCH 27/52] Port to apache-commons-parent 65 --- apache-commons-jxpath.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index d846773..814ba74 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -56,7 +56,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.7 -Dmaven.compiler.target=1.7 -Dcommons.osgi.symbolicName=org.apache.commons.jxpath +%mvn_build -f -- -Dcommons.packageId=jxpath %install %mvn_install @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Mon Dec 04 2023 Mikolaj Izdebski - 1.3-48 +- Port to apache-commons-parent 65 + * Fri Sep 01 2023 Mikolaj Izdebski - 1.3-47 - Convert License tag to SPDX format From 2ffbce5960f6f56ec33e8b37ade01b01bbc4973c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 28/52] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From de20977d040985b270c41a5b427af90771ecf64c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:14:27 +0000 Subject: [PATCH 29/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 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 814ba74..5872bef 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.3-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 04 2023 Mikolaj Izdebski - 1.3-48 - Port to apache-commons-parent 65 From a6eb530560dd44bfc5f3b9d391fe6ce9be04f871 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:14:06 +0000 Subject: [PATCH 30/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- 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 5872bef..903bdf3 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.3-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.3-49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ced7baaeae8b99091b5257b997b037aa54fefb30 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:14:42 +0100 Subject: [PATCH 31/52] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- 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 903bdf3..bfad3d5 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 50%{?dist} +Release: 51%{?dist} Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 1.3-51 +- bump of release for for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 1.3-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b94f06f60b36157343c219ac1677c1574109abac Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:44:35 +0100 Subject: [PATCH 32/52] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- 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 bfad3d5..3d27899 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.3-52 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 1.3-51 - bump of release for for java-21-openjdk as system jdk From 887ff4e07cc728dd667e0b0ede688205db8545d1 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 33/52] Eliminate use of obsolete %patchN syntax (#2283636) --- 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 3d27899..793746e 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -36,7 +36,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n commons-jxpath-%{version}-src -%patch0 -p1 +%patch -P0 -p1 %pom_remove_dep xerces: %pom_remove_dep xml-apis: From dd560c9bf87e91e6c7ad68b6ee4dcf5d7daf66fd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2024 05:41:47 +0200 Subject: [PATCH 34/52] Switch to a newer %patch syntax --- apache-commons-jxpath.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 793746e..0afccd0 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 52%{?dist} +Release: 53%{?dist} Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -36,7 +36,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n commons-jxpath-%{version}-src -%patch -P0 -p1 +%patch 0 -p1 %pom_remove_dep xerces: %pom_remove_dep xml-apis: @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Fri May 31 2024 Mikolaj Izdebski - 1.3-53 +- Switch to a newer patch macro syntax + * Tue Feb 27 2024 Jiri Vanek - 1.3-52 - Rebuilt for java-21-openjdk as system jdk From c6ddb96dc07d8c4bc4aeb1920a9d59fed1dfffe7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:11:29 +0000 Subject: [PATCH 35/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- 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 0afccd0..7115422 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 53%{?dist} +Release: 54%{?dist} Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -68,6 +68,9 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.3-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 31 2024 Mikolaj Izdebski - 1.3-53 - Switch to a newer patch macro syntax From f45d0c2b0e607831b91ea896955f563625c62a0a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 36/52] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 34c903abba81fbcd4fb359bd901340d1cff813c2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 37/52] Switch from %setup to %autosetup --- apache-commons-jxpath.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 7115422..7bcf1a5 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -35,8 +35,7 @@ Summary: API documentation for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n commons-jxpath-%{version}-src -%patch 0 -p1 +%autosetup -p1 -n commons-jxpath-%{version}-src %pom_remove_dep xerces: %pom_remove_dep xml-apis: From 85ed5b95e4456420f867c3de2a1e4f1147bc7316 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 38/52] Switch to non-numdered patches --- 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 7bcf1a5..97f4667 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -11,7 +11,7 @@ ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-%{version}-src.tar.gz -Patch0: commons-jxpath-mockrunner.patch +Patch: commons-jxpath-mockrunner.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 9fcc333dab8bc878f877783a48fc0bb549f1f0e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:00 +0200 Subject: [PATCH 39/52] Convert to %autorelease and %autochangelog --- apache-commons-jxpath.spec | 221 +------------------------------------ changelog | 218 ++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+), 219 deletions(-) create mode 100644 changelog diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 97f4667..c3c543a 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -2,7 +2,7 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 54%{?dist} +Release: %autorelease Summary: Simple XPath interpreter License: Apache-2.0 URL: http://commons.apache.org/jxpath/ @@ -67,221 +67,4 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 1.3-54 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 1.3-53 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 1.3-52 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 1.3-51 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 1.3-50 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.3-49 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 04 2023 Mikolaj Izdebski - 1.3-48 -- Port to apache-commons-parent 65 - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.3-47 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 1.3-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.3-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.3-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.3-43 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.3-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 1.3-41 -- Bump Java compiler source/target levels to 1.7 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.3-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.3-39 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1.3-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.3-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.3-36 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri May 22 2020 Fabio Valentini - 1.3-35 -- Set javac -source and -target to 1.8. - -* Tue Jan 28 2020 Fedora Release Engineering - 1.3-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.3-31 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.3-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.3-30 -- Mass rebuild for javapackages-tools 201901 - -* Thu Feb 07 2019 Mat Booth - 1.3-32 -- Rebuild to fix OSGi metadata - -* Thu Jan 31 2019 Fedora Release Engineering - 1.3-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.3-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.3-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 31 2017 Mat Booth - 1.3-28 -- Make the OSGi dep on servlet APIs optional - -* Wed Jul 26 2017 Fedora Release Engineering - 1.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.3-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Apr 24 2015 Mat Booth - 1.3-23 -- Fix optional deps in OSGi manifest - -* Tue Apr 14 2015 Mikolaj Izdebski - 1.3-22 -- Cleanup spec file - -* Wed Feb 25 2015 Alexander Kurtakov 1.3-21 -- Rebuild for jsp api. -- Drop old javadoc pre section. - -* Tue Oct 14 2014 Mikolaj Izdebski - 1.3-20 -- Remove legacy Obsoletes/Provides for jakarta-commons - -* Sat Jun 07 2014 Fedora Release Engineering - 1.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.3-18 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 1.3-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Mikolaj Izdebski - 1.3-16 -- Remove unneeded BR: maven-idea-plugin - -* Tue Feb 26 2013 Mikolaj Izdebski - 1.3-15 -- Migrate from Tomcat 6 to Tomcat 7 -- Resolves: rhbz#913879 - -* Wed Feb 13 2013 Fedora Release Engineering - 1.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.3-13 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Jan 15 2013 Michal Srb - 1.3-12 -- Build with xmvn - -* Thu Nov 22 2012 Mikolaj Izdebski - 1.3-11 -- Install NOTICE file -- Resolves: rhbz#879556 - -* Fri Nov 9 2012 Mikolaj Izdebski - 1.3-10 -- Don't build-require maven2 - -* Wed Jul 18 2012 Fedora Release Engineering - 1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Mar 2 2012 Stanislav Ochotnicky 1.3-8 -- Fix build and update to latest guidelines - -* Thu Jan 12 2012 Fedora Release Engineering - 1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 21 2010 Chris Spike 1.3-5 -- tomcat5 -> tomcat6 BRs/Rs - -* Thu Jul 8 2010 Stanislav Ochotnicky - 1.3-4 -- Add license to javadoc subpackage - -* Thu May 27 2010 Stanislav Ochotnicky - 1.3-3 -- Add tomcat5 to BR - -* Tue May 25 2010 Stanislav Ochotnicky - 1.3-2 -- Fix ownership of some directories - -* Tue May 25 2010 Stanislav Ochotnicky - 1.3-1 -- Rename package (jakarta-commons-jxpath->apache-commons-jxpath) -- Cleanup spec file -- Build using maven, drop old pom file from sources -- Update to upstream version - -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-9 -- Fix random spaces. - -* Wed Aug 19 2009 Alexander Kurtakov 0:1.2-8 -- BuildRequires java-devel >= 1.6.0. - -* Wed Aug 19 2009 Alexander Kurtakov 0:1.2-7 -- Initial package for Fedora. - -* Sun May 17 2009 Fernando Nasser - 0:1.2-6 -- Fix License -- Provide intructions for obtaining source and refresh source tar ball - -* Wed Mar 18 2009 Yong Yang - 0:1.2-5 -- rebuild with new maven2 2.0.8 built in bootstrap mode - -* Thu Feb 05 2009 Yong Yang - 0:1.2-4 -- Fix release tag - -* Thu Jan 08 2009 Yong Yang - 0:1.2-3jpp.1 -- Import from dbhole's maven 2.0.8 packages, initial building - -* Wed Apr 09 2008 Deepak Bhole - 0:1.2-2jpp.1 -- Import from JPackage -- Added pom file - -* Wed Jun 07 2006 Fernando Nasser - 0:1.2-2jpp -- First JPP 1.7 build - -* Sat Sep 18 2004 Ralph Apel - 0:1.2-1jpp -- Upgrade to 1.2 -- Use jdom-1.0-0.rc1.1jpp -- Relax some versioned dependencies - -* 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 -- Upgrade to Ant 1.6.X - -* Mon Jan 19 2004 Ralph Apel - 0:1.1-1jpp -- First JPackage release +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..1a1c2a4 --- /dev/null +++ b/changelog @@ -0,0 +1,218 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 1.3-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 1.3-53 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 1.3-52 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.3-51 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.3-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.3-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 1.3-48 +- Port to apache-commons-parent 65 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.3-47 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.3-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.3-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.3-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.3-43 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.3-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1.3-41 +- Bump Java compiler source/target levels to 1.7 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.3-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.3-39 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.3-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.3-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.3-36 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri May 22 2020 Fabio Valentini - 1.3-35 +- Set javac -source and -target to 1.8. + +* Tue Jan 28 2020 Fedora Release Engineering - 1.3-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.3-31 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.3-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.3-30 +- Mass rebuild for javapackages-tools 201901 + +* Thu Feb 07 2019 Mat Booth - 1.3-32 +- Rebuild to fix OSGi metadata + +* Thu Jan 31 2019 Fedora Release Engineering - 1.3-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.3-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.3-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 31 2017 Mat Booth - 1.3-28 +- Make the OSGi dep on servlet APIs optional + +* Wed Jul 26 2017 Fedora Release Engineering - 1.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 1.3-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Apr 24 2015 Mat Booth - 1.3-23 +- Fix optional deps in OSGi manifest + +* Tue Apr 14 2015 Mikolaj Izdebski - 1.3-22 +- Cleanup spec file + +* Wed Feb 25 2015 Alexander Kurtakov 1.3-21 +- Rebuild for jsp api. +- Drop old javadoc pre section. + +* Tue Oct 14 2014 Mikolaj Izdebski - 1.3-20 +- Remove legacy Obsoletes/Provides for jakarta-commons + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.3-18 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 29 2013 Mikolaj Izdebski - 1.3-16 +- Remove unneeded BR: maven-idea-plugin + +* Tue Feb 26 2013 Mikolaj Izdebski - 1.3-15 +- Migrate from Tomcat 6 to Tomcat 7 +- Resolves: rhbz#913879 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.3-13 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Jan 15 2013 Michal Srb - 1.3-12 +- Build with xmvn + +* Thu Nov 22 2012 Mikolaj Izdebski - 1.3-11 +- Install NOTICE file +- Resolves: rhbz#879556 + +* Fri Nov 9 2012 Mikolaj Izdebski - 1.3-10 +- Don't build-require maven2 + +* Wed Jul 18 2012 Fedora Release Engineering - 1.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Mar 2 2012 Stanislav Ochotnicky 1.3-8 +- Fix build and update to latest guidelines + +* Thu Jan 12 2012 Fedora Release Engineering - 1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 21 2010 Chris Spike 1.3-5 +- tomcat5 -> tomcat6 BRs/Rs + +* Thu Jul 8 2010 Stanislav Ochotnicky - 1.3-4 +- Add license to javadoc subpackage + +* Thu May 27 2010 Stanislav Ochotnicky - 1.3-3 +- Add tomcat5 to BR + +* Tue May 25 2010 Stanislav Ochotnicky - 1.3-2 +- Fix ownership of some directories + +* Tue May 25 2010 Stanislav Ochotnicky - 1.3-1 +- Rename package (jakarta-commons-jxpath->apache-commons-jxpath) +- Cleanup spec file +- Build using maven, drop old pom file from sources +- Update to upstream version + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-9 +- Fix random spaces. + +* Wed Aug 19 2009 Alexander Kurtakov 0:1.2-8 +- BuildRequires java-devel >= 1.6.0. + +* Wed Aug 19 2009 Alexander Kurtakov 0:1.2-7 +- Initial package for Fedora. + +* Sun May 17 2009 Fernando Nasser - 0:1.2-6 +- Fix License +- Provide intructions for obtaining source and refresh source tar ball + +* Wed Mar 18 2009 Yong Yang - 0:1.2-5 +- rebuild with new maven2 2.0.8 built in bootstrap mode + +* Thu Feb 05 2009 Yong Yang - 0:1.2-4 +- Fix release tag + +* Thu Jan 08 2009 Yong Yang - 0:1.2-3jpp.1 +- Import from dbhole's maven 2.0.8 packages, initial building + +* Wed Apr 09 2008 Deepak Bhole - 0:1.2-2jpp.1 +- Import from JPackage +- Added pom file + +* Wed Jun 07 2006 Fernando Nasser - 0:1.2-2jpp +- First JPP 1.7 build + +* Sat Sep 18 2004 Ralph Apel - 0:1.2-1jpp +- Upgrade to 1.2 +- Use jdom-1.0-0.rc1.1jpp +- Relax some versioned dependencies + +* 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 +- Upgrade to Ant 1.6.X + +* Mon Jan 19 2004 Ralph Apel - 0:1.1-1jpp +- First JPackage release From 4f2d8e9e734e0abd92c476c50973230cbcb1324e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 40/52] Use %autosetup -C --- 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 c3c543a..9da3e57 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -35,7 +35,7 @@ Summary: API documentation for %{name} This package contains the API documentation for %{name}. %prep -%autosetup -p1 -n commons-jxpath-%{version}-src +%autosetup -p1 -C %pom_remove_dep xerces: %pom_remove_dep xml-apis: From c58d3549d4f9ae5b2d0c21186b3d48cbc360fe43 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 41/52] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From bc2354a66c457e2cb748cb4a7808a4a093b524c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 42/52] Update javadoc package description [skip changelog] --- 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 9da3e57..52e8212 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -32,7 +32,7 @@ JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof. Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 20da3e4568a47882f61d115bc5cf30c538875e69 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:53:08 +0100 Subject: [PATCH 43/52] Update upstream URL --- 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 52e8212..b76d1bb 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -5,7 +5,7 @@ Version: 1.3 Release: %autorelease Summary: Simple XPath interpreter License: Apache-2.0 -URL: http://commons.apache.org/jxpath/ +URL: https://commons.apache.org/proper/commons-jxpath/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 3dd321318828cefffcbc2986dd3763e93c233948 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:16:16 +0000 Subject: [PATCH 44/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b0c0a7e2fe7f6edf308e6a2ea7d2c50b3304e96c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 45/52] Remove javadoc subpackage --- apache-commons-jxpath.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index b76d1bb..a4bad02 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -22,18 +22,14 @@ BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.3-77 %description Defines a simple interpreter of an expression language called XPath. JXPath applies XPath expressions to graphs of objects of all kinds: JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -55,7 +51,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 -- -Dcommons.packageId=jxpath +%mvn_build -j -f -- -Dcommons.packageId=jxpath %install %mvn_install @@ -63,8 +59,5 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %files -f .mfiles %license LICENSE.txt NOTICE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog From 96682c5b550eb4e5d5b217eb1c9f26e0a4411186 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 46/52] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 07c594bddfe6b4f7f4c4cfd8dcacec0c67a80a3d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 47/52] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From d8f4b1513ad55a38c0395dc9d65be7a35218ae71 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 48/52] Build with OpenJDK 25 --- 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 a4bad02..58d3bc1 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -16,7 +16,7 @@ Patch: commons-jxpath-mockrunner.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) From b9c3dcff94b9d7bac05c3762ac7b57c2479a1927 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 20:51:29 +0200 Subject: [PATCH 49/52] Update to upstream version 1.4.0 --- .gitignore | 1 + apache-commons-jxpath.spec | 13 ++++----- commons-jxpath-mockrunner.patch | 47 --------------------------------- sources | 2 +- 4 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 commons-jxpath-mockrunner.patch diff --git a/.gitignore b/.gitignore index 5b23633..b0b05f0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /.build-*.log /noarch /*.src.rpm +/commons-jxpath-1.4.0-src.tar.gz diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 58d3bc1..43094d3 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-jxpath -Version: 1.3 +Version: 1.4.0 Release: %autorelease Summary: Simple XPath interpreter License: Apache-2.0 @@ -11,8 +11,6 @@ ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-%{version}-src.tar.gz -Patch: commons-jxpath-mockrunner.patch - %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -33,15 +31,14 @@ JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof. %prep %autosetup -p1 -C -%pom_remove_dep xerces: -%pom_remove_dep xml-apis: +%pom_remove_dep com.mockrunner: # 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 +rm src/main/java/org/apache/commons/jxpath/servlet/*Context*.java +rm src/main/java/org/apache/commons/jxpath/servlet/*Handler.java +rm src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %mvn_file ":{*}" %{name} @1 %mvn_alias : org.apache.commons: diff --git a/commons-jxpath-mockrunner.patch b/commons-jxpath-mockrunner.patch deleted file mode 100644 index f2587fa..0000000 --- a/commons-jxpath-mockrunner.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 1a4f2c4..f5fa596 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -160,42 +160,6 @@ under the License. - 1.7.0 - true - -- -- com.mockrunner -- mockrunner-jdk1.3-j2ee1.3 -- 0.4 -- test -- -- -- cglib-nodep -- cglib-nodep -- -- -- jboss -- jboss-jee -- -- -- nekohtml -- nekohtml -- -- -- struts -- struts -- -- -- oro -- oro -- -- -- commons-validator -- commons-validator -- -- -- commons-digester -- commons-digester -- -- -- - - - diff --git a/sources b/sources index a92c68f..3dc9b99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-jxpath-1.3-src.tar.gz) = a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152 +SHA512 (commons-jxpath-1.4.0-src.tar.gz) = fd18abb89fa37f6d78e906a4e65af54a4d8424949f01df1166e6ce1ef7a1938f07290bba15e14185fcdd108a4836243f94dcff77f8bbd98ae4b2c7c546607416 From f818e569c9c7c694102891a0834597c553048387 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:05:59 +0000 Subject: [PATCH 50/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cdb3491bef9e500b725cd44d5bf9be4d85e25252 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:05:27 +0200 Subject: [PATCH 51/52] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From 9ca02f378734aa664bb9647c4e34a6c21899fae4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:47:12 +0000 Subject: [PATCH 52/52] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild