You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/24 18:44:08 UTC

svn commit: r737402 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java

Author: bentmann
Date: Sat Jan 24 17:44:07 2009
New Revision: 737402

URL: http://svn.apache.org/viewvc?rev=737402&view=rev
Log:
[MNG-3885] Modules of Maven projects are deployed with Timestamp during reactor build when uniqueVersion is set to false in parent profile

Modified:
    maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java

Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=737402&r1=737401&r2=737402&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Sat Jan 24 17:44:07 2009
@@ -797,7 +797,7 @@
                 newDM.setRelocation( newR );
             }
 
-            RepositoryBase repo = dm.getRepository();
+            DeploymentRepository repo = dm.getRepository();
 
             if ( repo != null )
             {
@@ -807,6 +807,7 @@
                 newRepo.setLayout( repo.getLayout() );
                 newRepo.setName( repo.getName() );
                 newRepo.setUrl( repo.getUrl() );
+                newRepo.setUniqueVersion( repo.isUniqueVersion() );
 
                 newDM.setRepository( newRepo );
             }
@@ -824,7 +825,7 @@
                 newDM.setSite( newSite );
             }
 
-            RepositoryBase sRepo = dm.getSnapshotRepository();
+            DeploymentRepository sRepo = dm.getSnapshotRepository();
 
             if ( sRepo != null )
             {
@@ -834,6 +835,7 @@
                 newRepo.setLayout( sRepo.getLayout() );
                 newRepo.setName( sRepo.getName() );
                 newRepo.setUrl( sRepo.getUrl() );
+                newRepo.setUniqueVersion( sRepo.isUniqueVersion() );
 
                 newDM.setSnapshotRepository( newRepo );
             }