You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/03/26 17:57:53 UTC
svn commit: r522555 - in /maven/ant-tasks/trunk: pom.xml
src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Author: jvanzyl
Date: Mon Mar 26 08:57:52 2007
New Revision: 522555
URL: http://svn.apache.org/viewvc?view=rev&rev=522555
Log:
o updating for 2.0.6 and creating an uber jar with shade like 2.0.6 itself
Modified:
maven/ant-tasks/trunk/pom.xml
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?view=diff&rev=522555&r1=522554&r2=522555
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Mon Mar 26 08:57:52 2007
@@ -30,11 +30,35 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
- <configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- </configuration>
+ <artifactId>shade-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ <exclude>jmock:jmock</exclude>
+ <exclude>xml-apis:xml-apis</exclude>
+ <exclude>ant:ant</exclude>
+ </excludes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.codehaus.plexus.util</pattern>
+ <excludes>
+ <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
+ <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
+ </excludes>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -48,7 +72,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
@@ -59,21 +83,23 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-error-diagnostics</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
+ <version>1.0-beta-2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
+ <version>1.0-beta-2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -84,7 +110,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
@@ -95,19 +121,22 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
+ <version>1.0-beta-2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9-stable-1</version>
</dependency>
</dependencies>
</project>
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=522555&r1=522554&r2=522555
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Mon Mar 26 08:57:52 2007
@@ -35,13 +35,13 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-import org.codehaus.plexus.classworlds.ClassWorld;
-import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
-import org.codehaus.plexus.PlexusContainerException;
+import org.codehaus.classworlds.ClassWorld;
+import org.codehaus.classworlds.DuplicateRealmException;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -92,8 +92,9 @@
Authentication authentication = repository.getAuthentication();
if ( authentication != null )
{
- manager.addAuthenticationInfo( repository.getId(), authentication.getUserName(), authentication.getPassword(),
- authentication.getPrivateKey(), authentication.getPassphrase() );
+ manager.addAuthenticationInfo( repository.getId(), authentication.getUserName(),
+ authentication.getPassword(), authentication.getPrivateKey(),
+ authentication.getPassphrase() );
}
Proxy proxy = repository.getProxy();
@@ -270,7 +271,8 @@
}
}
- protected Object lookup( String role, String roleHint )
+ protected Object lookup( String role,
+ String roleHint )
{
try
{
@@ -308,8 +310,11 @@
classWorld.newRealm( "plexus.core", getClass().getClassLoader() );
- container = new DefaultPlexusContainer( null, null, classWorld );
+ Embedder embedder = new Embedder();
+
+ embedder.start( classWorld );
+ container = embedder.getContainer();
}
catch ( PlexusContainerException e )
{
@@ -320,14 +325,15 @@
throw new BuildException( "Unable to create embedder ClassRealm", e );
}
- getProject().addReference( PlexusContainer.class.getName(),container );
+ getProject().addReference( PlexusContainer.class.getName(), container );
}
}
return container;
}
- public Pom buildPom( MavenProjectBuilder projectBuilder, ArtifactRepository localArtifactRepository )
+ public Pom buildPom( MavenProjectBuilder projectBuilder,
+ ArtifactRepository localArtifactRepository )
{
if ( pomRefId != null && pom != null )
{
@@ -442,9 +448,7 @@
return policy;
}
- /**
- * @noinspection RefusedBequest
- */
+ /** @noinspection RefusedBequest */
public void execute()
{
try