diff --git a/maven-shared-incremental-build.xml b/maven-shared-incremental-build.xml index 1f89bc5..e7d16c8 100644 --- a/maven-shared-incremental-build.xml +++ b/maven-shared-incremental-build.xml @@ -14,7 +14,8 @@ - + + @@ -28,10 +29,6 @@ - - - - @@ -80,100 +77,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - @@ -207,7 +110,7 @@ - + = 6 BuildRequires: maven-lib BuildRequires: maven-shared-utils -BuildRequires: plexus-component-api BuildRequires: plexus-containers-component-annotations +BuildRequires: sisu-plexus BuildRequires: unzip BuildArch: noarch @@ -50,6 +50,8 @@ This package provides %{summary}. %setup -q cp %{SOURCE1} build.xml +%pom_change_dep :plexus-component-api org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2 + %build mkdir -p lib build-jar-repository -s lib \ @@ -57,11 +59,10 @@ build-jar-repository -s lib \ maven/maven-model \ maven/maven-plugin-api \ maven-shared-utils/maven-shared-utils \ - plexus-component-api/plexus-component-api \ + org.eclipse.sisu.plexus \ plexus-containers/plexus-component-annotations %{ant} \ - -Dtest.skip=true \ jar javadoc %install