fix build errors

- ensure correct version of plexus container is used
- remove custom manifest, generate with configuration. Ant tasks were not working OOTB

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@471809 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 2f4e5f2007c985e17f4a5d87c955d1521dc956e6..e2dc6a2febab133d0ab8983b2ab1c4a7b029924f 100644 (file)
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -16,6 +16,10 @@
       <artifactId>classworlds</artifactId>
       <version>1.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
@@ -53,30 +57,13 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptor>src/main/assembly/archiva-cli-assembly.xml</descriptor>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.maven.archiva.cli.Cli</mainClass>
+            </manifest>
+          </archive>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <!-- This needs to run here as it can't run in the package phase 
-                 because the directory assembly needs to be made first. Total hack, but works.-->
-            <phase>integration-test</phase>
-            <configuration>
-              <sourceRoot>target/generated/src/main/java</sourceRoot>
-              <tasks>
-                <jar destfile="${basedir}/target/archiva-cli-1.0-SNAPSHOT-cli.jar"
-                     basedir="${basedir}/target/archiva-cli-1.0-SNAPSHOT-cli"
-                     manifest="${basedir}/src/main/resources/META-INF/MANIFEST.MF"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/archiva-cli/src/main/resources/META-INF/MANIFEST.MF b/archiva-cli/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index a26d266..0000000
--- a/archiva-cli/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0\r
-Archiver-Version: Plexus Archiver\r
-Created-By: 1.4.2-66 ("Apple Computer, Inc.")\r
-Main-Class: org.apache.maven.archiva.cli.Cli\r