From 0e27f7ce329d8ec1ed6321bc2dea48c34cfe33c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Oct 2021 11:37:21 +0200 Subject: [PATCH] Fix bootstrap mode --- maven-resolver.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index 68c3218..346c4d0 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,5 +1,11 @@ %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 Epoch: 1 Version: 1.6.1 @@ -15,7 +21,6 @@ BuildRequires: maven-local-openjdk8 BuildRequires: javapackages-bootstrap %else BuildRequires: mvn(javax.inject:javax.inject) -BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) 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.codehaus.plexus:plexus-classworlds) 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.plexus) 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.sonatype.sisu:sisu-guice::no_aop:) %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-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-redisson %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 # generate OSGi manifests