Author: brett
Date: Tue Sep 6 02:52:37 2005
New Revision: 278961
URL: http://svn.apache.org/viewcvs?rev=278961&view=rev
Log:
PR: MNG-613
make sure versions are aggregated
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/LatestArtifactMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/ReleaseArtifactMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
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-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/LatestArtifactMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/LatestArtifactMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/LatestArtifactMetadata.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/LatestArtifactMetadata.java
Tue Sep 6 02:52:37 2005
@@ -116,23 +116,4 @@
return false;
}
- public int getBuildNumber()
- {
- return 0;
- }
-
- public String getTimestamp()
- {
- return null;
- }
-
- public String getLatestVersion()
- {
- return null;
- }
-
- public String getReleaseVersion()
- {
- return null;
- }
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/ReleaseArtifactMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/ReleaseArtifactMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/ReleaseArtifactMetadata.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/ReleaseArtifactMetadata.java
Tue Sep 6 02:52:37 2005
@@ -123,23 +123,4 @@
return false;
}
- public int getBuildNumber()
- {
- return 0;
- }
-
- public String getTimestamp()
- {
- return null;
- }
-
- public String getLatestVersion()
- {
- return null;
- }
-
- public String getReleaseVersion()
- {
- return null;
- }
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
Tue Sep 6 02:52:37 2005
@@ -97,11 +97,6 @@
}
}
- public String getTimestamp()
- {
- return timestamp;
- }
-
public int getBuildNumber()
{
return buildNumber;
@@ -180,13 +175,4 @@
return artifact.getBaseVersion();
}
- public String getLatestVersion()
- {
- return null;
- }
-
- public String getReleaseVersion()
- {
- return null;
- }
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
Tue Sep 6 02:52:37 2005
@@ -207,23 +207,4 @@
return null;
}
- public String getLatestVersion()
- {
- return versioning.getLatest();
- }
-
- public String getReleaseVersion()
- {
- return versioning.getRelease();
- }
-
- public int getBuildNumber()
- {
- return 0;
- }
-
- public String getTimestamp()
- {
- return null;
- }
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
Tue Sep 6 02:52:37 2005
@@ -200,23 +200,4 @@
return false;
}
- public int getBuildNumber()
- {
- return 0;
- }
-
- public String getTimestamp()
- {
- return null;
- }
-
- public String getLatestVersion()
- {
- return null;
- }
-
- public String getReleaseVersion()
- {
- return null;
- }
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
Tue Sep 6 02:52:37 2005
@@ -196,23 +196,4 @@
return artifact.isSnapshot();
}
- public int getBuildNumber()
- {
- return snapshot != null ? snapshot.getBuildNumber() : 0;
- }
-
- public String getTimestamp()
- {
- return snapshot != null ? snapshot.getTimestamp() : null;
- }
-
- public String getLatestVersion()
- {
- return null;
- }
-
- public String getReleaseVersion()
- {
- return null;
- }
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
Tue Sep 6 02:52:37 2005
@@ -21,13 +21,13 @@
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.LegacyArtifactMetadata;
-import org.apache.maven.artifact.metadata.SnapshotArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import
org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.Versioning;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -69,7 +69,7 @@
{
// TODO: can we improve on this?
ArtifactMetadata metadata = null;
- if ( artifact.isSnapshot() )
+ if ( !artifact.isSnapshot() )
{
metadata = new ArtifactRepositoryMetadata( artifact );
}
@@ -94,23 +94,23 @@
String version = selectVersion( versioning, artifact.getVersion() );
*/
- ArtifactMetadata localMetadata = null;
+ Versioning versioning = null;
for ( Iterator i = remoteRepositories.iterator(); i.hasNext(); )
{
ArtifactRepository repository = (ArtifactRepository) i.next();
- localMetadata = loadVersioningInformation( metadata, repository,
localRepository, artifact );
- if ( localMetadata != null )
+ versioning = loadVersioningInformation( metadata, repository,
localRepository, artifact );
+ if ( versioning != null )
{
artifact.setRepository( repository );
// TODO: merge instead (see above)
break;
}
}
- ArtifactMetadata m = loadVersioningInformation( metadata,
localRepository, localRepository, artifact );
- if ( m != null )
+ Versioning v = loadVersioningInformation( metadata, localRepository,
localRepository, artifact );
+ if ( v != null )
{
- localMetadata = m;
+ versioning = v;
// TODO: figure out way to avoid duplicated message
if ( getLogger().isDebugEnabled() /*&& !alreadyResolved*/ )
{
@@ -120,9 +120,9 @@
}
String version = null;
- if ( localMetadata != null )
+ if ( versioning != null )
{
- version = constructVersion( localMetadata );
+ version = constructVersion( versioning, artifact.getBaseVersion()
);
}
if ( version == null )
@@ -154,43 +154,7 @@
return version;
}
- protected int resolveLatestSnapshotBuildNumber( Artifact artifact,
ArtifactRepository localRepository,
- ArtifactRepository
remoteRepository )
- throws ArtifactMetadataRetrievalException
- {
- // TODO: can we improve on this?
- ArtifactMetadata metadata = new SnapshotArtifactRepositoryMetadata(
artifact );
-
- getLogger().info( "Retrieving previous build number from " +
remoteRepository.getId() );
- repositoryMetadataManager.resolveAlways( metadata, localRepository,
remoteRepository );
-
- ArtifactMetadata m = loadVersioningInformation( metadata,
remoteRepository, localRepository, artifact );
- int buildNumber = 0;
- if ( m == null )
- {
- try
- {
- SnapshotArtifactMetadata snapshotMetadata = new
SnapshotArtifactMetadata( artifact );
- snapshotMetadata.retrieveFromRemoteRepository(
remoteRepository, wagonManager,
-
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
- getLogger().warn( "Using old-style versioning metadata from
remote repo for " + artifact );
-
- buildNumber = snapshotMetadata.getBuildNumber();
- }
- catch ( ResourceDoesNotExistException e1 )
- {
- // safe to ignore, use default snapshot data
- getLogger().debug( "Unable to find legacy metadata - ignoring"
);
- }
- }
- else
- {
- buildNumber = m.getBuildNumber();
- }
- return buildNumber;
- }
-
- protected abstract String constructVersion( ArtifactMetadata metadata );
+ protected abstract String constructVersion( Versioning versioning, String
baseVersion );
/* TODO
private void mergeVersioning( Versioning dest, Versioning source )
@@ -349,35 +313,20 @@
return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" +
artifact.getBaseVersion();
}
- private ArtifactMetadata loadVersioningInformation( ArtifactMetadata
repoMetadata,
- ArtifactRepository
remoteRepository,
- ArtifactRepository
localRepository, Artifact artifact )
+ protected Versioning loadVersioningInformation( ArtifactMetadata
repoMetadata, ArtifactRepository remoteRepository,
+ ArtifactRepository
localRepository, Artifact artifact )
throws ArtifactMetadataRetrievalException
{
File metadataFile = new File( localRepository.getBasedir(),
localRepository.pathOfLocalRepositoryMetadata( repoMetadata, remoteRepository )
);
- ArtifactMetadata newMetadata = null;
+ Versioning versioning = null;
if ( metadataFile.exists() )
{
Metadata metadata = readMetadata( metadataFile );
- if ( metadata.getVersioning() != null )
- {
- if ( artifact.isSnapshot() )
- {
- if ( metadata.getVersioning().getSnapshot() != null )
- {
- newMetadata = new SnapshotArtifactRepositoryMetadata(
artifact,
-
metadata.getVersioning().getSnapshot() );
- }
- }
- else
- {
- newMetadata = new ArtifactRepositoryMetadata( artifact,
metadata.getVersioning() );
- }
- }
+ versioning = metadata.getVersioning();
}
- return newMetadata;
+ return versioning;
}
/**
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=278961&r1=278960&r2=278961&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
Tue Sep 6 02:52:37 2005
@@ -68,8 +68,8 @@
return metadata;
}
- protected String constructVersion( ArtifactMetadata metadata )
+ protected String constructVersion( Versioning versioning, String
baseVersion )
{
- return metadata.getLatestVersion();
+ return versioning.getLatest();
}
}
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=278961&r1=278960&r2=278961&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
Tue Sep 6 02:52:37 2005
@@ -22,6 +22,8 @@
import org.apache.maven.artifact.metadata.LegacyArtifactMetadata;
import org.apache.maven.artifact.metadata.ReleaseArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.Versioning;
import java.util.List;
@@ -54,14 +56,40 @@
public void transformForInstall( Artifact artifact, ArtifactRepository
localRepository )
throws ArtifactMetadataRetrievalException
{
- // metadata is added at install time
+ Versioning versioning = new Versioning();
+ versioning.addVersion( artifact.getVersion() );
+
+ if ( artifact.isRelease() )
+ {
+ versioning.setRelease( artifact.getVersion() );
+ }
+
+ // TODO: need to create?
+ ArtifactMetadata metadata = new ArtifactRepositoryMetadata( artifact,
versioning );
+
+ artifact.addMetadata( metadata );
}
public void transformForDeployment( Artifact artifact, ArtifactRepository
remoteRepository,
ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
- // metadata is added at deploy time
+ Versioning versioning = new Versioning();
+ versioning.addVersion( artifact.getVersion() );
+
+ if ( artifact.isRelease() )
+ {
+ versioning.setRelease( artifact.getVersion() );
+ }
+
+ // TODO: need to create?
+ ArtifactMetadata metadata = new ArtifactRepositoryMetadata( artifact,
versioning );
+
+ artifact.addMetadata( metadata );
+
+ // TODO: this should be in the part that actually merges instead
+ getLogger().info( "Retrieving previous metadata from " +
remoteRepository.getId() );
+ repositoryMetadataManager.resolveAlways( metadata, localRepository,
remoteRepository );
}
protected LegacyArtifactMetadata createLegacyMetadata( Artifact artifact )
@@ -69,8 +97,8 @@
return new ReleaseArtifactMetadata( artifact );
}
- protected String constructVersion( ArtifactMetadata metadata )
+ protected String constructVersion( Versioning versioning, String bS )
{
- return metadata.getReleaseVersion();
+ return versioning.getRelease();
}
}
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Tue Sep 6 02:52:37 2005
@@ -22,8 +22,11 @@
import org.apache.maven.artifact.metadata.LegacyArtifactMetadata;
import org.apache.maven.artifact.metadata.SnapshotArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.metadata.Snapshot;
import
org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.Versioning;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.codehaus.plexus.util.StringUtils;
import java.util.Date;
@@ -78,7 +81,9 @@
ArtifactMetadata metadata = new
SnapshotArtifactRepositoryMetadata( artifact, snapshot );
- artifact.setResolvedVersion( constructVersion( metadata ) );
+ Versioning versioning = new Versioning();
+ versioning.setSnapshot( snapshot );
+ artifact.setResolvedVersion( constructVersion( versioning,
artifact.getBaseVersion() ) );
artifact.addMetadata( metadata );
}
@@ -98,21 +103,62 @@
return new SnapshotArtifactMetadata( artifact );
}
- protected String constructVersion( ArtifactMetadata metadata )
+ protected String constructVersion( Versioning versioning, String
baseVersion )
{
- String version = metadata.getBaseVersion();
- if ( metadata.getTimestamp() != null && metadata.getBuildNumber() > 0 )
+ String version = baseVersion;
+ Snapshot snapshot = versioning.getSnapshot();
+ if ( snapshot != null )
{
- String newVersion = metadata.getTimestamp() + "-" +
metadata.getBuildNumber();
- if ( version != null )
+ if ( snapshot.getTimestamp() != null && snapshot.getBuildNumber()
> 0 )
{
- version = StringUtils.replace( version, "SNAPSHOT", newVersion
);
+ String newVersion = snapshot.getTimestamp() + "-" +
snapshot.getBuildNumber();
+ if ( version != null )
+ {
+ version = StringUtils.replace( version, "SNAPSHOT",
newVersion );
+ }
+ else
+ {
+ version = newVersion;
+ }
}
- else
+ }
+ return version;
+ }
+
+ private int resolveLatestSnapshotBuildNumber( Artifact artifact,
ArtifactRepository localRepository,
+ ArtifactRepository
remoteRepository )
+ throws ArtifactMetadataRetrievalException
+ {
+ // TODO: can we improve on this?
+ ArtifactMetadata metadata = new SnapshotArtifactRepositoryMetadata(
artifact );
+
+ getLogger().info( "Retrieving previous build number from " +
remoteRepository.getId() );
+ repositoryMetadataManager.resolveAlways( metadata, localRepository,
remoteRepository );
+
+ Versioning versioning = loadVersioningInformation( metadata,
remoteRepository, localRepository, artifact );
+ int buildNumber = 0;
+ if ( versioning == null )
+ {
+ try
+ {
+ SnapshotArtifactMetadata snapshotMetadata = new
SnapshotArtifactMetadata( artifact );
+ snapshotMetadata.retrieveFromRemoteRepository(
remoteRepository, wagonManager,
+
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
+ getLogger().warn( "Using old-style versioning metadata from
remote repo for " + artifact );
+
+ buildNumber = snapshotMetadata.getBuildNumber();
+ }
+ catch ( ResourceDoesNotExistException e1 )
{
- version = newVersion;
+ // safe to ignore, use default snapshot data
+ getLogger().debug( "Unable to find legacy metadata - ignoring"
);
}
}
- return version;
+ else if ( versioning.getSnapshot() != null )
+ {
+ buildNumber = versioning.getSnapshot().getBuildNumber();
+ }
+ return buildNumber;
}
+
}
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=278961&r1=278960&r2=278961&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
Tue Sep 6 02:52:37 2005
@@ -49,7 +49,7 @@
String SCOPE_RUNTIME = "runtime";
String SCOPE_PROVIDED = "provided";
-
+
String SCOPE_SYSTEM = "system";
String getGroupId();
@@ -141,4 +141,8 @@
* @todo remove, a quick hack for the lifecycle executor
*/
void setArtifactHandler( ArtifactHandler handler );
+
+ boolean isRelease();
+
+ void setRelease( boolean release );
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Tue Sep 6 02:52:37 2005
@@ -74,6 +74,8 @@
private boolean resolved;
+ private boolean release = false;
+
public DefaultArtifact( String groupId, String artifactId, VersionRange
versionRange, String scope, String type,
String classifier, ArtifactHandler artifactHandler
)
{
@@ -462,4 +464,13 @@
this.artifactHandler = artifactHandler;
}
+ public void setRelease( boolean release )
+ {
+ this.release = release;
+ }
+
+ public boolean isRelease()
+ {
+ return release;
+ }
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
Tue Sep 6 02:52:37 2005
@@ -74,11 +74,4 @@
*/
String getRemoteFilename();
- int getBuildNumber();
-
- String getTimestamp();
-
- String getLatestVersion();
-
- String getReleaseVersion();
}
Modified:
maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
Tue Sep 6 02:52:37 2005
@@ -21,8 +21,6 @@
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
@@ -129,15 +127,10 @@
artifact.addMetadata( metadata );
}
- // TODO: clean up
- Versioning versioning = new Versioning();
- versioning.addVersion( artifact.getVersion() );
if ( updateReleaseInfo )
{
- versioning.setRelease( artifact.getVersion() );
+ artifact.setRelease( true );
}
- ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata(
artifact, versioning );
- artifact.addMetadata( metadata );
try
{
Modified:
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Tue Sep 6 02:52:37 2005
@@ -19,8 +19,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
@@ -88,6 +86,7 @@
public void execute()
throws MojoExecutionException
{
+ // TODO: push into transformation
boolean isPomArtifact = "pom".equals( packaging );
File pom = new File( basedir, "pom.xml" );
@@ -97,15 +96,10 @@
artifact.addMetadata( metadata );
}
- // TODO: clean up
- Versioning versioning = new Versioning();
- versioning.addVersion( artifact.getVersion() );
if ( updateReleaseInfo )
{
- versioning.setRelease( artifact.getVersion() );
+ artifact.setRelease( true );
}
- ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata(
artifact, versioning );
- artifact.addMetadata( metadata );
try
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
Tue Sep 6 02:52:37 2005
@@ -250,4 +250,14 @@
{
return "active project artifact:\n\tartifact = " + artifact +
";\n\tproject: " + project;
}
+
+ public boolean isRelease()
+ {
+ return artifact.isRelease();
+ }
+
+ public void setRelease( boolean release )
+ {
+ artifact.setResolved( release );
+ }
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java?rev=278961&r1=278960&r2=278961&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
Tue Sep 6 02:52:37 2005
@@ -146,23 +146,4 @@
return artifact.isSnapshot();
}
- public String getLatestVersion()
- {
- return null;
- }
-
- public String getReleaseVersion()
- {
- return null;
- }
-
- public int getBuildNumber()
- {
- return 0;
- }
-
- public String getTimestamp()
- {
- return null;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
