Author: brett
Date: Wed Sep 28 06:07:53 2005
New Revision: 292172
URL: http://svn.apache.org/viewcvs?rev=292172&view=rev
Log:
PR: MNG-916
ensure RELEASE is not selected as is
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=292172&r1=292171&r2=292172&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
Wed Sep 28 06:07:53 2005
@@ -32,11 +32,14 @@
if ( Artifact.LATEST_VERSION.equals( artifact.getVersion() ) )
{
String version = resolveVersion( artifact, localRepository,
remoteRepositories );
- if ( version != null && !version.equals( artifact.getVersion() ) )
+ if ( Artifact.LATEST_VERSION.equals( version ) )
{
- artifact.setBaseVersion( version );
- artifact.updateVersion( version, localRepository );
+ throw new ArtifactMetadataRetrievalException(
+ "Unable to determine the latest version for artifact " +
artifact );
}
+
+ artifact.setBaseVersion( version );
+ artifact.updateVersion( version, localRepository );
}
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=292172&r1=292171&r2=292172&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
Wed Sep 28 06:07:53 2005
@@ -34,20 +34,21 @@
public class ReleaseArtifactTransformation
extends AbstractVersionTransformation
{
- public static final String RELEASE_VERSION = "RELEASE";
-
public void transformForResolve( Artifact artifact, List
remoteRepositories, ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
- if ( RELEASE_VERSION.equals( artifact.getVersion() ) )
+ if ( Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) )
{
String version = resolveVersion( artifact, localRepository,
remoteRepositories );
- if ( version != null && !version.equals( artifact.getVersion() ) )
+ if ( Artifact.RELEASE_VERSION.equals( version ) )
{
- artifact.setBaseVersion( version );
- artifact.updateVersion( version, localRepository );
+ throw new ArtifactMetadataRetrievalException(
+ "Unable to determine the release version for artifact " +
artifact );
}
+
+ artifact.setBaseVersion( version );
+ artifact.updateVersion( version, localRepository );
}
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?rev=292172&r1=292171&r2=292172&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
Wed Sep 28 06:07:53 2005
@@ -53,6 +53,8 @@
String SCOPE_SYSTEM = "system";
+ String RELEASE_VERSION = "RELEASE";
+
String getGroupId();
String getArtifactId();
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=292172&r1=292171&r2=292172&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Wed Sep 28 06:07:53 2005
@@ -22,7 +22,6 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.transform.ReleaseArtifactTransformation;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.model.Plugin;
@@ -91,7 +90,7 @@
* @deprecated Make private, use resolveReportPluginVersion(..) or
resolvePluginVersion(..) instead.
*/
public String resolvePluginVersion( String groupId, String artifactId,
MavenProject project, Settings settings,
- ArtifactRepository localRepository,
boolean resolveAsReportPlugin )
+ ArtifactRepository localRepository,
boolean resolveAsReportPlugin )
throws PluginVersionResolutionException
{
// first pass...if the plugin is specified in the pom, try to retrieve
the version from there.
@@ -127,8 +126,7 @@
( !Boolean.FALSE.equals( pluginUpdateOverride ) &&
shouldCheckForUpdates( groupId, artifactId ) ) )
{
updatedVersion = resolveMetaVersion( groupId, artifactId,
project.getPluginArtifactRepositories(),
- localRepository,
-
ReleaseArtifactTransformation.RELEASE_VERSION );
+ localRepository,
Artifact.RELEASE_VERSION );
if ( StringUtils.isNotEmpty( updatedVersion ) &&
!updatedVersion.equals( version ) )
{
@@ -188,7 +186,7 @@
{
// 1. resolve the version to be used
version = resolveMetaVersion( groupId, artifactId,
project.getPluginArtifactRepositories(), localRepository,
-
ReleaseArtifactTransformation.RELEASE_VERSION );
+ Artifact.RELEASE_VERSION );
if ( version != null )
{
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml?rev=292172&r1=292171&r2=292172&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml
(original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/pom.xml Wed Sep
28 06:07:53 2005
@@ -25,7 +25,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>RELEASE</version>
<executions>
<execution>
<goals>
@@ -58,4 +57,4 @@
<version>2.0-beta-1</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
