You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/25 11:38:54 UTC
svn commit: r164550 - in /maven/components/trunk/maven-artifact-ant: ./
src/main/java/org/apache/maven/artifact/ant/
src/main/resources/META-INF/plexus/
Author: brett
Date: Mon Apr 25 02:38:53 2005
New Revision: 164550
URL: http://svn.apache.org/viewcvs?rev=164550&view=rev
Log:
updates to versions, and make sure it is valid not to have a <localRepository/> element
Modified:
maven/components/trunk/maven-artifact-ant/pom.xml
maven/components/trunk/maven-artifact-ant/sample.build.xml
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-artifact-ant/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/pom.xml?rev=164550&r1=164549&r2=164550&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/pom.xml (original)
+++ maven/components/trunk/maven-artifact-ant/pom.xml Mon Apr 25 02:38:53 2005
@@ -30,14 +30,20 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>1.0-alpha-3-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0-alpha-3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0-alpha-3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/sample.build.xml?rev=164550&r1=164549&r2=164550&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/sample.build.xml (original)
+++ maven/components/trunk/maven-artifact-ant/sample.build.xml Mon Apr 25 02:38:53 2005
@@ -30,18 +30,18 @@
<localRepository refid="local.repository"/>
</artifact:dependencies>
- <artifact:install file="target/maven-artifact-ant-1.0-alpha-2-SNAPSHOT.jar">
+ <artifact:install file="target/maven-artifact-ant-2.0-SNAPSHOT.jar">
<localRepository refid="local.repository"/>
<pom refid="maven.project"/>
</artifact:install>
- <artifact:deploy file="target/maven-artifact-ant-1.0-alpha-2-SNAPSHOT.jar">
+ <artifact:deploy file="target/maven-artifact-ant-2.0-SNAPSHOT.jar">
<localRepository refid="local.repository"/>
<remoteRepository refid="deploy.repository"/>
<pom refid="maven.project"/>
</artifact:deploy>
- <artifact:deploy file="target/maven-artifact-ant-1.0-alpha-2-SNAPSHOT.jar">
+ <artifact:deploy file="target/maven-artifact-ant-2.0-SNAPSHOT.jar">
<localRepository refid="local.repository"/>
<remoteRepository url="scp://localhost/tmp/deployment-repo">
<authentication username="brett" privateKey="${user.home}/.ssh/id_dsa"/>
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=164550&r1=164549&r2=164550&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Mon Apr 25 02:38:53 2005
@@ -25,6 +25,8 @@
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.embed.Embedder;
+import java.io.File;
+
/**
* Base class for artifact tasks.
*
@@ -104,5 +106,12 @@
}
}
return embedder;
+ }
+
+ protected LocalRepository getDefaultLocalRepository()
+ {
+ LocalRepository localRepository = new LocalRepository();
+ localRepository.setLocation( new File( System.getProperty( "user.home" ), ".m2/repository" ) );
+ return localRepository;
}
}
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=164550&r1=164549&r2=164550&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Mon Apr 25 02:38:53 2005
@@ -55,6 +55,11 @@
public void execute()
{
+ if ( localRepository == null )
+ {
+ localRepository = getDefaultLocalRepository();
+ }
+
ArtifactRepository localRepo = createArtifactRepository( localRepository );
ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java?rev=164550&r1=164549&r2=164550&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java Mon Apr 25 02:38:53 2005
@@ -47,6 +47,11 @@
public void execute()
{
+ if ( localRepository == null )
+ {
+ localRepository = getDefaultLocalRepository();
+ }
+
ArtifactRepository localRepo = createArtifactRepository( localRepository );
pom.initialise( (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ), localRepo );
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java?rev=164550&r1=164549&r2=164550&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java Mon Apr 25 02:38:53 2005
@@ -46,6 +46,11 @@
public void execute()
{
+ if ( localRepository == null )
+ {
+ localRepository = getDefaultLocalRepository();
+ }
+
ArtifactRepository localRepo = createArtifactRepository( localRepository );
pom.initialise( (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ), localRepo );
Modified: maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml?rev=164550&r1=164549&r2=164550&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml Mon Apr 25 02:38:53 2005
@@ -222,9 +222,6 @@
<requirement>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
</requirement>
- <requirement>
- <role>org.apache.maven.settings.MavenSettingsBuilder</role>
- </requirement>
</requirements>
</component>
<!--
@@ -263,14 +260,6 @@
<component>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
<implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
- </component>
-
- <component>
- <role>org.apache.maven.settings.MavenSettingsBuilder</role>
- <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
- <configuration>
- <settingsPath>${user.home}/.m2/settings.xml</settingsPath>
- </configuration>
</component>
<component>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org