diff options
| author | Brett Porter <brett@apache.org> | 2006-11-06 18:40:17 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2006-11-06 18:40:17 +0000 |
| commit | ec4a395f4190efa4a0904280ba8c831cb1f08b7b (patch) | |
| tree | 0580018ba64e217b47fa4ad35dfbd5cb9410c3da /archiva-cli | |
| parent | 346a46678c7c64fc752bb4ef1c2429e9a0eebd08 (diff) | |
| download | archiva-ec4a395f4190efa4a0904280ba8c831cb1f08b7b.tar.gz archiva-ec4a395f4190efa4a0904280ba8c831cb1f08b7b.zip | |
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
Diffstat (limited to 'archiva-cli')
| -rw-r--r-- | archiva-cli/pom.xml | 31 | ||||
| -rw-r--r-- | archiva-cli/src/main/resources/META-INF/MANIFEST.MF | 4 |
2 files changed, 9 insertions, 26 deletions
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 2f4e5f200..e2dc6a2fe 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -18,6 +18,10 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.1</version> </dependency> @@ -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 index a26d266c5..000000000 --- a/archiva-cli/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: 1.4.2-66 ("Apple Computer, Inc.")
-Main-Class: org.apache.maven.archiva.cli.Cli
|