Author: jdcasey
Date: Wed Jun 11 14:12:54 2008
New Revision: 666846
URL: http://svn.apache.org/viewvc?rev=666846&view=rev
Log:
Merging from the 2.1.x branch, and I'll remove that branch, since maven-script
is still alive and well in the maven-2.0.x branch of components.
Modified:
maven/shared/trunk/maven-script/maven-script-ant/pom.xml
maven/shared/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml
Modified: maven/shared/trunk/maven-script/maven-script-ant/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script/maven-script-ant/pom.xml?rev=666846&r1=666845&r2=666846&view=diff
==============================================================================
--- maven/shared/trunk/maven-script/maven-script-ant/pom.xml (original)
+++ maven/shared/trunk/maven-script/maven-script-ant/pom.xml Wed Jun 11
14:12:54 2008
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-descriptor</artifactId>
+ <artifactId>maven-plugin-api</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -48,12 +48,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-ant-factory</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0-alpha-5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-8</version>
+ <version>1.0-alpha-10</version>
</dependency>
</dependencies>
</project>
Modified:
maven/shared/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java?rev=666846&r1=666845&r2=666846&view=diff
==============================================================================
---
maven/shared/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
(original)
+++
maven/shared/trunk/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
Wed Jun 11 14:12:54 2008
@@ -19,8 +19,8 @@
* under the License.
*/
+import org.codehaus.classworlds.ClassRealm;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.factory.ComponentInstantiationException;
import org.codehaus.plexus.component.factory.ant.AntComponentFactory;
import org.codehaus.plexus.component.factory.ant.AntScriptInvoker;
Modified: maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml?rev=666846&r1=666845&r2=666846&view=diff
==============================================================================
--- maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/shared/trunk/maven-script/maven-script-beanshell/pom.xml Wed Jun 11
14:12:54 2008
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-bsh-factory</artifactId>
- <version>1.0-alpha-8</version>
+ <version>1.0-alpha-9</version>
</dependency>
</dependencies>
</project>
