Author: jvanzyl
Date: Tue Apr 24 13:09:40 2007
New Revision: 532065
URL: http://svn.apache.org/viewvc?view=rev&rev=532065
Log:
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
Modified:
maven/components/trunk/build.properties
maven/components/trunk/build.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.properties?view=diff&rev=532065&r1=532064&r2=532065
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Tue Apr 24 13:09:40 2007
@@ -17,7 +17,7 @@
classworlds.version=1.2-alpha-7
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-interactivity-api.version=1.0-alpha-6-SNAPSHOT
commons-cli.version=1.0
Modified: maven/components/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?view=diff&rev=532065&r1=532064&r2=532065
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Tue Apr 24 13:09:40 2007
@@ -119,6 +119,7 @@
<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-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-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"/>
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?view=diff&rev=532065&r1=532064&r2=532065
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Tue Apr 24 13:09:40 2007
@@ -76,11 +76,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>2.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-error-diagnostics</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
Modified: maven/components/trunk/maven-embedder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diff&rev=532065&r1=532064&r2=532065
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Tue Apr 24 13:09:40 2007
@@ -44,9 +44,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
<configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
<finalName>maven-${version}</finalName>
</configuration>
<executions>
@@ -61,7 +59,7 @@
<plugin>
<artifactId>shade-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.0-alpha-8-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
<executions>
<execution>
<phase>package</phase>
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=diff&rev=532065&r1=532064&r2=532065
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Tue Apr 24 13:09:40 2007
@@ -132,7 +132,7 @@
<module>maven-embedder</module>
</modules>
<properties>
- <plexusVersion>1.0-alpha-23</plexusVersion>
+ <plexusVersion>1.0-alpha-24</plexusVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>
<dependencies>
