commit 961aab540cc7d2ab5e41189d55f660fa4f384eab
author John Dennis Casey <jdcasey@apache.org> Mon Jun 18 14:56:37 2007 +0000
committer John Dennis Casey <jdcasey@apache.org> Mon Jun 18 14:56:37 2007 +0000
tree 86d4945efd75dda95e77a1a265013a4d9a572ee4
parent 7e1c0f1b17552964fa42c145ef866e7d762bdc60

Attempting to fix assembly of snapshot artifacts and use POM files from parent MavenProject instances where possible. This may not be complete, but wanted to get this in before it gets stale.

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@548374 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

diff --git a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
index ead08bf..588a6e2 100755
--- a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
+++ b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
@@ -271,6 +271,7 @@
                     // We need to flip it back to not being resolved so we can
                     // look for it again!
                     a.setResolved( false );
+                    a.setVersion( a.getBaseVersion() );
 
                     artifactResolver.resolve( a, project.getRemoteArtifactRepositories(), localRepository );
 
@@ -302,59 +303,63 @@
                                      Map groupVersionAlignments )
         throws RepositoryAssemblyException
     {
-        if ( !"pom".equals( artifact.getType() ) )
-        {
-            artifact = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
+        artifact = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
 
-            MavenProject p;
+        MavenProject p;
+        try
+        {
+            p = projectBuilder.buildFromRepository( artifact,
+                                                                 remoteArtifactRepositories,
+                                                                 localRepository );
+        }
+        catch ( ProjectBuildingException e )
+        {
+            throw new RepositoryAssemblyException( "Error reading POM: " + artifact.getId(), e );
+        }
+
+        // if we're dealing with a POM artifact, then we've already copied the POM itself; only process ancestry.
+        if ( "pom".equals( artifact.getType() ) )
+        {
+            p = p.getParent();
+        }
+
+        while( p != null )
+        {
+            File sourceFile = p.getFile();
+
+            artifact = artifactFactory.createProjectArtifact( p.getGroupId(), p.getArtifactId(), p
+                .getVersion() );
+
+            setAlignment( artifact, groupVersionAlignments );
+
+//            File sourceFile = new File( localRepository.getBasedir(), localRepository.pathOf( artifact ) );
+//
+//            if ( !sourceFile.exists() )
+//            {
+//                break;
+//            }
+//
+            File targetFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
+
             try
             {
-                p = projectBuilder.buildFromRepository( artifact,
-                                                                     remoteArtifactRepositories,
-                                                                     localRepository );
+                FileUtils.copyFile( sourceFile, targetFile );
             }
-            catch ( ProjectBuildingException e )
+            catch ( IOException e )
             {
-                throw new RepositoryAssemblyException( "Error reading POM: " + artifact.getId(), e );
+                throw new RepositoryAssemblyException( "Error writing POM metdata: " + artifact.getId(), e );
             }
 
-            do
+            try
             {
-                artifact = artifactFactory.createProjectArtifact( p.getGroupId(), p.getArtifactId(), p
-                    .getVersion() );
-
-                setAlignment( artifact, groupVersionAlignments );
-
-                File sourceFile = new File( localRepository.getBasedir(), localRepository.pathOf( artifact ) );
-
-                if ( !sourceFile.exists() )
-                {
-                    break;
-                }
-
-                File targetFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-
-                try
-                {
-                    FileUtils.copyFile( sourceFile, targetFile );
-                }
-                catch ( IOException e )
-                {
-                    throw new RepositoryAssemblyException( "Error writing POM metdata: " + artifact.getId(), e );
-                }
-
-                try
-                {
-                    writeChecksums( targetFile );
-                }
-                catch ( IOException e )
-                {
-                    throw new RepositoryAssemblyException( "Error writing checksums for POM: " + artifact.getId(), e );
-                }
-
-                p = p.getParent();
+                writeChecksums( targetFile );
             }
-            while ( p != null );
+            catch ( IOException e )
+            {
+                throw new RepositoryAssemblyException( "Error writing checksums for POM: " + artifact.getId(), e );
+            }
+
+            p = p.getParent();
         }
     }