Fix bootstrap mode
This commit is contained in:
parent
0b5641931a
commit
0e27f7ce32
@ -1,5 +1,11 @@
|
|||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
|
|
||||||
|
%if %{without bootstrap} && !0%{?rhel}
|
||||||
|
%bcond_without maven_resolver_extra_modules
|
||||||
|
%else
|
||||||
|
%bcond_with maven_resolver_extra_modules
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: maven-resolver
|
Name: maven-resolver
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.6.1
|
Version: 1.6.1
|
||||||
@ -15,7 +21,6 @@ BuildRequires: maven-local-openjdk8
|
|||||||
BuildRequires: javapackages-bootstrap
|
BuildRequires: javapackages-bootstrap
|
||||||
%else
|
%else
|
||||||
BuildRequires: mvn(javax.inject:javax.inject)
|
BuildRequires: mvn(javax.inject:javax.inject)
|
||||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
|
||||||
BuildRequires: mvn(junit:junit)
|
BuildRequires: mvn(junit:junit)
|
||||||
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
@ -24,9 +29,6 @@ BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
|
|||||||
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
|
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||||
BuildRequires: mvn(org.eclipse.jetty:jetty-http)
|
|
||||||
BuildRequires: mvn(org.eclipse.jetty:jetty-server)
|
|
||||||
BuildRequires: mvn(org.eclipse.jetty:jetty-util)
|
|
||||||
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
|
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
|
||||||
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
|
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
|
||||||
BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
|
BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
|
||||||
@ -36,6 +38,12 @@ BuildRequires: mvn(org.slf4j:slf4j-api)
|
|||||||
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
||||||
BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:)
|
BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:)
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with maven_resolver_extra_modules}
|
||||||
|
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||||
|
BuildRequires: mvn(org.eclipse.jetty:jetty-http)
|
||||||
|
BuildRequires: mvn(org.eclipse.jetty:jetty-server)
|
||||||
|
BuildRequires: mvn(org.eclipse.jetty:jetty-util)
|
||||||
|
%endif
|
||||||
|
|
||||||
Provides: maven-resolver-api = %{epoch}:%{version}-%{release}
|
Provides: maven-resolver-api = %{epoch}:%{version}-%{release}
|
||||||
Provides: maven-resolver-spi = %{epoch}:%{version}-%{release}
|
Provides: maven-resolver-spi = %{epoch}:%{version}-%{release}
|
||||||
@ -78,6 +86,10 @@ rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http
|
|||||||
%pom_disable_module maven-resolver-synccontext-global
|
%pom_disable_module maven-resolver-synccontext-global
|
||||||
%pom_disable_module maven-resolver-synccontext-redisson
|
%pom_disable_module maven-resolver-synccontext-redisson
|
||||||
%pom_disable_module maven-resolver-transport-classpath
|
%pom_disable_module maven-resolver-transport-classpath
|
||||||
|
%if %{without maven_resolver_extra_modules}
|
||||||
|
%pom_disable_module maven-resolver-transport-file
|
||||||
|
%pom_disable_module maven-resolver-transport-http
|
||||||
|
%endif
|
||||||
%mvn_package :maven-resolver-test-util __noinstall
|
%mvn_package :maven-resolver-test-util __noinstall
|
||||||
|
|
||||||
# generate OSGi manifests
|
# generate OSGi manifests
|
||||||
|
Loading…
Reference in New Issue
Block a user