diff --git a/maven.spec b/maven.spec index 79edc42..173914d 100644 --- a/maven.spec +++ b/maven.spec @@ -226,7 +226,7 @@ build-jar-repository -s lib \ commons-cli \ glassfish-annotation-api \ guava/guava \ - guice/google-guice-no_aop \ + guice/google-guice \ jdom2/jdom2 \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-impl \ @@ -291,18 +291,17 @@ chmod -x %{buildroot}%{homedir}/bin/*.cmd %{buildroot}%{homedir}/bin/*.conf # Transitive deps of wagon-http, missing because of unshading build-jar-repository -p %{buildroot}%{homedir}/lib \ + aopalliance \ + apache-commons-lang3 \ + atinject \ commons-cli \ commons-codec \ - apache-commons-lang3 \ + glassfish-annotation-api \ guava/guava \ - guice/google-guice-no_aop \ - aopalliance \ + guice/google-guice \ httpcomponents/httpclient \ httpcomponents/httpcore \ jansi/jansi \ - atinject \ - slf4j/jcl-over-slf4j \ - glassfish-annotation-api \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-connector-basic \ maven-resolver/maven-resolver-impl \ @@ -313,19 +312,19 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \ maven-resolver/maven-resolver-transport-wagon \ maven-resolver/maven-resolver-util \ maven-shared-utils/maven-shared-utils \ - maven-wagon/http-shared \ - org.eclipse.sisu.inject \ - org.eclipse.sisu.plexus \ - plexus/plexus-cipher \ - plexus-containers/plexus-component-annotations \ - plexus/interpolation \ - plexus/plexus-sec-dispatcher \ - plexus/utils \ - slf4j/api \ maven-wagon/file \ maven-wagon/http \ maven-wagon/http-shared \ - maven-wagon/provider-api + maven-wagon/provider-api \ + org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ + plexus/plexus-cipher \ + plexus/interpolation \ + plexus/plexus-sec-dispatcher \ + plexus/utils \ + plexus-containers/plexus-component-annotations \ + slf4j/api \ + slf4j/jcl-over-slf4j cp %{buildroot}%{_javadir}/%{name}/*.jar %{buildroot}%{homedir}/lib/