Bootstrap Maven as non-modular packages
Resolves: rhbz#1951482
This commit is contained in:
Mikolaj Izdebski
parent
4d4418b9dd
commit
55e167b618
@ -1,6 +1,12 @@
|
|||||||
|
# Workaround for rhbz#1969370: __bootstrap macro is not defined in
|
||||||
|
# CentOS Stream, See https://bugzilla.redhat.com/1969370
|
||||||
|
%global __bootstrap ~bootstrap
|
||||||
|
|
||||||
|
%bcond_without bootstrap
|
||||||
|
|
||||||
Name: apache-commons-jxpath
|
Name: apache-commons-jxpath
|
||||||
Version: 1.3
|
Version: 1.3
|
||||||
Release: 39%{?dist}
|
Release: 40%{?dist}
|
||||||
Summary: Simple XPath interpreter
|
Summary: Simple XPath interpreter
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://commons.apache.org/jxpath/
|
URL: http://commons.apache.org/jxpath/
|
||||||
@ -11,13 +17,14 @@ Source0: http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-
|
|||||||
Patch0: commons-jxpath-mockrunner.patch
|
Patch0: commons-jxpath-mockrunner.patch
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
|
%if %{with bootstrap}
|
||||||
|
BuildRequires: javapackages-bootstrap
|
||||||
|
%else
|
||||||
BuildRequires: mvn(commons-beanutils:commons-beanutils)
|
BuildRequires: mvn(commons-beanutils:commons-beanutils)
|
||||||
BuildRequires: mvn(javax.servlet:jsp-api)
|
|
||||||
BuildRequires: mvn(javax.servlet:servlet-api)
|
|
||||||
BuildRequires: mvn(jdom:jdom)
|
BuildRequires: mvn(jdom:jdom)
|
||||||
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
||||||
BuildRequires: mvn(xerces:xercesImpl)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
|
||||||
BuildRequires: mvn(xml-apis:xml-apis)
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Defines a simple interpreter of an expression language called XPath.
|
Defines a simple interpreter of an expression language called XPath.
|
||||||
@ -34,6 +41,16 @@ This package contains the API documentation for %{name}.
|
|||||||
%setup -q -n commons-jxpath-%{version}-src
|
%setup -q -n commons-jxpath-%{version}-src
|
||||||
%patch0 -p1
|
%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_file ":{*}" %{name} @1
|
||||||
%mvn_alias : org.apache.commons:
|
%mvn_alias : org.apache.commons:
|
||||||
|
|
||||||
@ -42,7 +59,7 @@ This package contains the API documentation for %{name}.
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
# we are skipping tests because we don't have com.mockrunner in repos yet
|
# we are skipping tests because we don't have com.mockrunner in repos yet
|
||||||
%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.jxpath -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
|
%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 -Dcommons.osgi.symbolicName=org.apache.commons.jxpath
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
@ -54,8 +71,12 @@ This package contains the API documentation for %{name}.
|
|||||||
%license LICENSE.txt NOTICE.txt
|
%license LICENSE.txt NOTICE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.3-39
|
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-40
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
- Bootstrap Maven for CentOS Stream 9
|
||||||
|
|
||||||
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-39
|
||||||
|
- Bootstrap build
|
||||||
|
- Non-bootstrap build
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-38
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-38
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
@ -72,9 +93,15 @@ This package contains the API documentation for %{name}.
|
|||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-34
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-34
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-31
|
||||||
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-33
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-33
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-30
|
||||||
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
* Thu Feb 07 2019 Mat Booth <mat.booth@redhat.com> - 1.3-32
|
* Thu Feb 07 2019 Mat Booth <mat.booth@redhat.com> - 1.3-32
|
||||||
- Rebuild to fix OSGi metadata
|
- Rebuild to fix OSGi metadata
|
||||||
|
|
||||||
@ -212,7 +239,7 @@ This package contains the API documentation for %{name}.
|
|||||||
- Use jdom-1.0-0.rc1.1jpp
|
- Use jdom-1.0-0.rc1.1jpp
|
||||||
- Relax some versioned dependencies
|
- Relax some versioned dependencies
|
||||||
|
|
||||||
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
|
* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
|
||||||
- Rebuild with ant-1.6.2
|
- Rebuild with ant-1.6.2
|
||||||
|
|
||||||
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.1-2jpp
|
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.1-2jpp
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user