diff --git a/xmvn-tools.spec b/xmvn-tools.spec index 5ff1985..b79466c 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -39,14 +39,12 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: jdom2 BuildRequires: maven-invoker >= 3.0 -BuildRequires: maven-shared-utils BuildRequires: modello >= 2.0.0 BuildRequires: objectweb-asm BuildRequires: plexus-classworlds BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-metadata-generator -BuildRequires: plexus-utils BuildRequires: qdox BuildRequires: sisu-inject BuildRequires: sisu-plexus @@ -168,28 +166,40 @@ rm -f xmvn-core/src/test/java/org/fedoraproject/xmvn/resolver/JavaHomeResolverTe for i in api core; do %pom_xpath_inject "pom:project" " org.fedoraproject.xmvn - %{version}" %{parent}-${i} + %{version}" %{parent}-${i} %pom_remove_parent %{parent}-${i} done for i in install resolve subst; do %pom_xpath_inject "pom:project" " org.fedoraproject.xmvn - %{version}" %{parent}-tools/%{parent}-${i} + %{version}" %{parent}-tools/%{parent}-${i} %pom_remove_parent %{parent}-tools/%{parent}-${i} done %build mkdir -p lib build-jar-repository -s lib \ - beust-jcommander commons-compress maven-invoker/maven-invoker \ - objectweb-asm/asm plexus/utils plexus-classworlds jdom2/jdom2 commons-cli qdox plexus/cli guava/guava xbean/xbean-reflect \ - plexus/utils slf4j/api guice \ - maven-shared-utils/maven-shared-utils \ + atinject \ + beust-jcommander \ + commons-cli \ + commons-compress \ + guava/guava \ + guice \ + jdom2/jdom2 \ + maven-invoker/maven-invoker \ + maven-shared-utils/maven-shared-utils \ + objectweb-asm/asm \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ - plexus-metadata-generator \ + plexus/cli \ + plexus/utils \ + plexus-classworlds \ plexus-containers/plexus-component-annotations \ - javax.inject + plexus-metadata-generator \ + qdox \ + slf4j/api \ + xbean/xbean-reflect + %{ant} -Dtest.skip=true package javadoc %install