From b0c0a7e2fe7f6edf308e6a2ea7d2c50b3304e96c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild