Author: brett
Date: Fri Aug 26 00:26:03 2005
New Revision: 240175
URL: http://svn.apache.org/viewcvs?rev=240175&view=rev
Log:
PR: MNG-761
fallback to deployment repository for snapshots when there is no snapshot
repository
Added:
maven/components/trunk/maven-core-it/it0062/ (with props)
maven/components/trunk/maven-core-it/it0062/expected-results.txt (with
props)
maven/components/trunk/maven-core-it/it0062/goals.txt (with props)
maven/components/trunk/maven-core-it/it0062/pom.xml (with props)
maven/components/trunk/maven-core-it/it0062/src/
maven/components/trunk/maven-core-it/it0062/src/main/
maven/components/trunk/maven-core-it/it0062/src/main/java/
maven/components/trunk/maven-core-it/it0062/src/main/java/org/
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/Person.java
(with props)
Modified:
maven/components/trunk/maven-core-it/README.txt
maven/components/trunk/maven-core-it/integration-tests.txt
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/components/trunk/maven-core-it/README.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=240175&r1=240174&r2=240175&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/README.txt (original)
+++ maven/components/trunk/maven-core-it/README.txt Fri Aug 26 00:26:03 2005
@@ -175,6 +175,9 @@
results in a groupId directory of 'the.full.group.id' instead of
'the/full/group/id'.
+it0062: Test that a deployment of a snapshot falls back to a non-snapshot
repository if no snapshot repository is
+ specified.
+
-------------------------------------------------------------------------------
- generated sources
Modified: maven/components/trunk/maven-core-it/integration-tests.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=240175&r1=240174&r2=240175&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Fri Aug 26
00:26:03 2005
@@ -1,3 +1,4 @@
+it0062
it0061
it0060
it0059
Propchange: maven/components/trunk/maven-core-it/it0062/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 26 00:26:03 2005
@@ -0,0 +1,2 @@
+target
+log.txt
Added: maven/components/trunk/maven-core-it/it0062/expected-results.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0062/expected-results.txt?rev=240175&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0062/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it0062/expected-results.txt Fri Aug 26
00:26:03 2005
@@ -0,0 +1,3 @@
+target/classes/org/apache/maven/it0062/Person.class
+target/maven-core-it0062-1.0-SNAPSHOT.jar
+target/test-repo/org/apache/maven/maven-core-it0062/1.0-SNAPSHOT/maven-core-it0062-1.0-SNAPSHOT.version.txt
Propchange: maven/components/trunk/maven-core-it/it0062/expected-results.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0062/expected-results.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0062/goals.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0062/goals.txt?rev=240175&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0062/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it0062/goals.txt Fri Aug 26 00:26:03
2005
@@ -0,0 +1 @@
+deploy
Propchange: maven/components/trunk/maven-core-it/it0062/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0062/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0062/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0062/pom.xml?rev=240175&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0062/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0062/pom.xml Fri Aug 26 00:26:03 2005
@@ -0,0 +1,12 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core-it0062</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <distributionManagement>
+ <repository>
+ <id>repo</id>
+ <url>file://localhost/${project.basedir}/target/test-repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0062/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0062/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/Person.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/Person.java?rev=240175&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/Person.java
(added)
+++
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/Person.java
Fri Aug 26 00:26:03 2005
@@ -0,0 +1,16 @@
+package org.apache.maven.it0062;
+
+public class Person
+{
+ private String name;
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+}
Propchange:
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/Person.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it0062/src/main/java/org/apache/maven/it0062/Person.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=240175&r1=240174&r2=240175&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Fri Aug 26 00:26:03 2005
@@ -181,12 +181,12 @@
this.profileProperties = new Properties( project.profileProperties );
this.model = ModelUtils.cloneModel( project.model );
-
+
if ( project.originalModel != null )
{
this.originalModel = ModelUtils.cloneModel( project.originalModel
);
}
-
+
this.snapshotDeploymentVersion = project.snapshotDeploymentVersion;
this.snapshotDeploymentBuildNumber =
project.snapshotDeploymentBuildNumber;
@@ -825,7 +825,7 @@
public void setBuild( Build build )
{
this.buildOverlay = new BuildOverlay( build );
-
+
model.setBuild( build );
}
@@ -835,10 +835,10 @@
{
buildOverlay = new BuildOverlay( model.getBuild() );
}
-
+
return buildOverlay;
}
-
+
public List getResources()
{
return getBuild().getResources();
@@ -951,22 +951,22 @@
{
this.extensionArtifacts = extensionArtifacts;
}
-
+
public Set getExtensionArtifacts()
{
return this.extensionArtifacts;
}
-
+
public Map getExtensionArtifactMap()
{
if ( extensionArtifactMap == null )
{
extensionArtifactMap = ArtifactUtils.artifactMapByVersionlessId(
getExtensionArtifacts() );
}
-
+
return extensionArtifactMap;
}
-
+
public void setParentArtifact( Artifact parentArtifact )
{
this.parentArtifact = parentArtifact;
@@ -1062,7 +1062,8 @@
public ArtifactRepository getDistributionManagementArtifactRepository()
{
- return getArtifact().isSnapshot() ? snapshotArtifactRepository :
releaseArtifactRepository;
+ return getArtifact().isSnapshot() && snapshotArtifactRepository !=
null ? snapshotArtifactRepository
+ : releaseArtifactRepository;
}
public List getPluginRepositories()
@@ -1330,27 +1331,27 @@
public void assembleProfilePropertiesInheritance()
{
Stack propertyStack = new Stack();
-
+
MavenProject current = this;
- while( current != null )
+ while ( current != null )
{
Properties toAdd = current.profileProperties;
-
+
if ( toAdd != null && !toAdd.isEmpty() )
{
propertyStack.push( toAdd );
}
-
+
current = current.getParent();
}
-
+
Properties newProfilesProperties = new Properties();
-
- while( !propertyStack.isEmpty() )
+
+ while ( !propertyStack.isEmpty() )
{
newProfilesProperties.putAll( (Properties) propertyStack.pop() );
}
-
+
this.profileProperties = newProfilesProperties;
}
@@ -1362,7 +1363,7 @@
{
this.snapshotDeploymentVersion = deploymentVersion;
}
-
+
public String getSnapshotDeploymentVersion()
{
if ( snapshotDeploymentVersion == null )
@@ -1374,15 +1375,15 @@
return snapshotDeploymentVersion;
}
}
-
+
public void setSnapshotDeploymentBuildNumber( int deploymentBuildNumber )
{
this.snapshotDeploymentBuildNumber = deploymentBuildNumber;
}
-
+
public int getSnapshotDeploymentBuildNumber()
{
return snapshotDeploymentBuildNumber;
}
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
