diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index b0b05f0..203d7f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/commons-jxpath-1.3-src.tar.gz -/.build-*.log -/noarch -/*.src.rpm -/commons-jxpath-1.4.0-src.tar.gz +commons-jxpath-1.3-src.tar.gz diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 43094d3..689e7a4 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,60 +1,172 @@ -%bcond_with bootstrap +%global base_name jxpath +%global short_name commons-%{base_name} -Name: apache-commons-jxpath -Version: 1.4.0 -Release: %autorelease -Summary: Simple XPath interpreter -License: Apache-2.0 -URL: https://commons.apache.org/proper/commons-jxpath/ -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +Name: apache-%{short_name} +Version: 1.3 +Release: 16%{?dist} +Summary: Simple XPath interpreter -Source0: http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-%{version}-src.tar.gz +Group: Development/Libraries +License: ASL 2.0 +URL: http://commons.apache.org/%{base_name}/ +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Patch0: %{short_name}-mockrunner.patch +BuildArch: noarch -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap -%else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(commons-beanutils:commons-beanutils) -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 +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: maven-local +BuildRequires: maven-antrun-plugin +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-plugin-bundle +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: servlet +BuildRequires: jsp +BuildRequires: el_api + +Provides: jakarta-%{short_name} = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release} %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} +Group: Documentation +Requires: jpackage-utils + +Provides: jakarta-%{short_name}-javadoc = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release} + +%description javadoc +This package contains the API documentation for %{name}. + %prep -%autosetup -p1 -C - -%pom_remove_dep com.mockrunner: - -# Remove dependency on glassfish -%pom_remove_dep :servlet-api -%pom_remove_dep :jsp-api -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: - -%pom_xpath_inject 'pom:properties' \ - 'org.apache.commons.beanutils;resolution:="optional",org.jdom*;resolution:="optional",org.w3c.dom;resolution:="optional",javax.servlet*;resolution:="optional",*' +%setup -q -n %{short_name}-%{version}-src +%patch0 -p1 %build # we are skipping tests because we don't have com.mockrunner in repos yet -%mvn_build -j -f -- -Dcommons.packageId=jxpath +%mvn_file : %{short_name} %{name} +%mvn_alias : org.apache.commons:%{short_name} +%mvn_build -f %install %mvn_install +%pre javadoc +# workaround for rpm bug, can be removed in F-20 +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : + + %files -f .mfiles -%license LICENSE.txt NOTICE.txt +%doc LICENSE.txt NOTICE.txt + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt NOTICE.txt %changelog -%autochangelog +* 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 + +* Sun 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/changelog b/changelog deleted file mode 100644 index 1a1c2a4..0000000 --- a/changelog +++ /dev/null @@ -1,218 +0,0 @@ -* 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 diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/commons-jxpath-mockrunner.patch b/commons-jxpath-mockrunner.patch new file mode 100644 index 0000000..f2587fa --- /dev/null +++ b/commons-jxpath-mockrunner.patch @@ -0,0 +1,47 @@ +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/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !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 deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/sources b/sources index 3dc9b99..acfb54e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-jxpath-1.4.0-src.tar.gz) = fd18abb89fa37f6d78e906a4e65af54a4d8424949f01df1166e6ce1ef7a1938f07290bba15e14185fcdd108a4836243f94dcff77f8bbd98ae4b2c7c546607416 +9af6ed5d009061986d709a370829860e commons-jxpath-1.3-src.tar.gz