From d8fc8d54f0294f592f0b0c3bb00e2ebba3f6dd1d Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 13:48:17 +0000 Subject: [PATCH] import CS apache-commons-jxpath-1.3-73.module_el9+1171+eb38a622 --- SPECS/apache-commons-jxpath.spec | 108 ++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 10 deletions(-) diff --git a/SPECS/apache-commons-jxpath.spec b/SPECS/apache-commons-jxpath.spec index 544e60a..e27b801 100644 --- a/SPECS/apache-commons-jxpath.spec +++ b/SPECS/apache-commons-jxpath.spec @@ -1,23 +1,27 @@ +%bcond_with bootstrap + Name: apache-commons-jxpath Version: 1.3 -Release: 31%{?dist} +Release: 73%{?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 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 +%else 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) -BuildRequires: mvn(xerces:xercesImpl) -BuildRequires: mvn(xml-apis:xml-apis) +%endif %description Defines a simple interpreter of an expression language called XPath. @@ -28,11 +32,13 @@ 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 -%setup -q -n commons-jxpath-%{version}-src -%patch0 -p1 +%autosetup -p1 -n commons-jxpath-%{version}-src + +%pom_remove_dep xerces: +%pom_remove_dep xml-apis: # Remove dependency on glassfish %pom_remove_dep :servlet-api @@ -49,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 +%mvn_build -f -- -Dcommons.packageId=jxpath %install %mvn_install @@ -61,12 +67,94 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java %license LICENSE.txt NOTICE.txt %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.3-72 +- Update javapackages test plan to f42 + +* Tue Sep 03 2024 Mikolaj Izdebski - 1.3-71 +- Use %%autosetup -C + +* 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