Author: brianf
Date: Fri Sep 19 07:27:45 2008
New Revision: 697105
URL: http://svn.apache.org/viewvc?rev=697105&view=rev
Log:
MDEP-181 use installer to produce the repository layout. Second Patch from Igor
Fedorenko
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=697105&r1=697104&r2=697105&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Fri Sep 19 07:27:45 2008
@@ -81,7 +81,7 @@
</issueManagement>
<properties>
- <maven.version>2.0.8</maven.version>
+ <maven.version>2.0.9</maven.version>
</properties>
<dependencies>
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java?rev=697105&r1=697104&r2=697105&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
Fri Sep 19 07:27:45 2008
@@ -123,6 +123,7 @@
if ( "pom".equals( artifact.getType() ) )
{
installer.install( artifact.getFile(),
artifact, targetRepository );
+ installBaseSnapshot( artifact, targetRepository );
}
else
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java?rev=697105&r1=697104&r2=697105&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java
Fri Sep 19 07:27:45 2008
@@ -20,6 +20,7 @@
*/
import java.io.File;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -226,20 +227,28 @@
throws Exception
{
String baseVersion = "2.0-SNAPSHOT";
- Artifact expandedSnapshot = this.stubFactory.createArtifact(
"testGroupId", "expanded-snapshot", baseVersion );
+ String groupId = "testGroupId";
+ String artifactId = "expanded-snapshot";
- SnapshotTransformation tr = new SnapshotTransformation();
- Snapshot snapshot = new Snapshot();
- snapshot.setTimestamp( tr.getDeploymentTimestamp() );
- snapshot.setBuildNumber( 1 );
- RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata(
expandedSnapshot, snapshot );
- String newVersion = snapshot.getTimestamp() + "-" +
snapshot.getBuildNumber();
- expandedSnapshot.setResolvedVersion( StringUtils.replace( baseVersion,
Artifact.SNAPSHOT_VERSION, newVersion ) );
- expandedSnapshot.addMetadata( metadata );
+ Artifact expandedSnapshot = createExpandedVersionArtifact(
baseVersion,
+
groupId,
+
artifactId,
+
"compile",
+
"jar",
+
null);
mojo.project.getArtifacts().add(expandedSnapshot);
mojo.project.getDependencyArtifacts().add(expandedSnapshot);
+ Artifact pomExpandedSnapshot = createExpandedVersionArtifact(
baseVersion,
+
groupId,
+
artifactId,
+
"compile",
+
"pom",
+
null);
+ mojo.project.getArtifacts().add(pomExpandedSnapshot);
+ mojo.project.getDependencyArtifacts().add(pomExpandedSnapshot);
+
mojo.useRepositoryLayout = true;
mojo.execute();
@@ -269,6 +278,27 @@
}
}
+ private Artifact createExpandedVersionArtifact( String baseVersion,
+ String groupId,
+ String
artifactId,
+ String scope,
+ String type,
+ String
classifier )
+ throws IOException
+ {
+ Artifact expandedSnapshot = this.stubFactory.createArtifact(
groupId, artifactId, baseVersion, scope, type, classifier );
+
+ SnapshotTransformation tr = new SnapshotTransformation();
+ Snapshot snapshot = new Snapshot();
+ snapshot.setTimestamp( tr.getDeploymentTimestamp() );
+ snapshot.setBuildNumber( 1 );
+ RepositoryMetadata metadata = new SnapshotArtifactRepositoryMetadata(
expandedSnapshot, snapshot );
+ String newVersion = snapshot.getTimestamp() + "-" +
snapshot.getBuildNumber();
+ expandedSnapshot.setResolvedVersion( StringUtils.replace( baseVersion,
Artifact.SNAPSHOT_VERSION, newVersion ) );
+ expandedSnapshot.addMetadata( metadata );
+ return expandedSnapshot;
+ }
+
private void assertArtifactExists( Artifact artifact,
ArtifactRepository targetRepository ) {
File file = new File( targetRepository.getBasedir(),
targetRepository.getLayout().pathOf( artifact ) );
