o using a new plexus release, have to setting for the two jar plexus setup, i can't get the single jar

to work right now


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532065 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-04-24 20:09:40 +00:00
parent 906e4a2f74
commit 1e87b8acd8
5 changed files with 5 additions and 11 deletions

View File

@ -17,7 +17,7 @@
classworlds.version=1.2-alpha-7 classworlds.version=1.2-alpha-7
plexus-active-collections.version=1.0-beta-1 plexus-active-collections.version=1.0-beta-1
plexus.version=1.0-alpha-23 plexus.version=1.0-alpha-24
plexus-utils.version=1.4.1 plexus-utils.version=1.4.1
plexus-interactivity-api.version=1.0-alpha-6-SNAPSHOT plexus-interactivity-api.version=1.0-alpha-6-SNAPSHOT
commons-cli.version=1.0 commons-cli.version=1.0

View File

@ -119,6 +119,7 @@ under the License.
<pull orgpath="org/codehaus/plexus/plexus-active-collections" version="${plexus-active-collections.version}" name="plexus-active-collections" repository="codehaus"/> <pull orgpath="org/codehaus/plexus/plexus-active-collections" version="${plexus-active-collections.version}" name="plexus-active-collections" repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-utils" version="${plexus-utils.version}" name="plexus-utils" repository="codehaus"/> <pull orgpath="org/codehaus/plexus/plexus-utils" version="${plexus-utils.version}" name="plexus-utils" repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-container-default" version="${plexus.version}" name="plexus-container-default" repository="codehaus"/> <pull orgpath="org/codehaus/plexus/plexus-container-default" version="${plexus.version}" name="plexus-container-default" repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-component-api" version="${plexus.version}" name="plexus-component-api" repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-classworlds" version="${classworlds.version}" name="plexus-classworlds" repository="codehaus"/> <pull orgpath="org/codehaus/plexus/plexus-classworlds" version="${classworlds.version}" name="plexus-classworlds" repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-interactivity-api" version="${plexus-interactivity-api.version}" name="plexus-interactivity-api" repository="codehaus"/> <pull orgpath="org/codehaus/plexus/plexus-interactivity-api" version="${plexus-interactivity-api.version}" name="plexus-interactivity-api" repository="codehaus"/>
<pull orgpath="org/apache/maven/maven-parent" version="4" name="maven-parent" type="pom"/> <pull orgpath="org/apache/maven/maven-parent" version="4" name="maven-parent" type="pom"/>

View File

@ -74,11 +74,6 @@ under the License.
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-error-diagnostics</artifactId> <artifactId>maven-error-diagnostics</artifactId>

View File

@ -44,9 +44,7 @@ under the License.
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version> <version>2.1</version>
<configuration> <configuration>
<descriptors> <descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
<finalName>maven-${version}</finalName> <finalName>maven-${version}</finalName>
</configuration> </configuration>
<executions> <executions>
@ -61,7 +59,7 @@ under the License.
<plugin> <plugin>
<artifactId>shade-maven-plugin</artifactId> <artifactId>shade-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<version>1.0-alpha-8-SNAPSHOT</version> <version>1.0-alpha-4</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

View File

@ -132,7 +132,7 @@ under the License.
<module>maven-embedder</module> <module>maven-embedder</module>
</modules> </modules>
<properties> <properties>
<plexusVersion>1.0-alpha-23</plexusVersion> <plexusVersion>1.0-alpha-24</plexusVersion>
<wagonVersion>1.0-beta-2</wagonVersion> <wagonVersion>1.0-beta-2</wagonVersion>
</properties> </properties>
<dependencies> <dependencies>