You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/08/27 13:42:51 UTC
svn commit: r240405 - in /maven/components/trunk:
maven-archiver/src/main/java/org/apache/maven/archiver/
maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/
maven-artifact/src/main/java/org/apache/maven/artifact/repository/metada...
Author: brett
Date: Sat Aug 27 04:42:30 2005
New Revision: 240405
URL: http://svn.apache.org/viewcvs?rev=240405&view=rev
Log:
repair snapshot build numbering (previous code makes it get stuck at 1).
Modified:
maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.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/repository/metadata/RepositoryMetadata.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified: maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=240405&r1=240404&r2=240405&view=diff
==============================================================================
--- maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java (original)
+++ maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java Sat Aug 27 04:42:30 2005
@@ -63,6 +63,7 @@
Artifact projectArtifact = project.getArtifact();
+/* TODO: rethink this, it wasn't working
if ( projectArtifact.isSnapshot() )
{
Manifest.Attribute buildNumberAttr = new Manifest.Attribute( "Build-Number", "" +
@@ -70,6 +71,7 @@
m.addConfiguredAttribute( buildNumberAttr );
}
+*/
if ( config.getPackageName() != null )
{
Manifest.Attribute packageAttr = new Manifest.Attribute( "Package", config.getPackageName() );
@@ -231,7 +233,7 @@
if ( workingProject.getArtifact().isSnapshot() )
{
- workingProject.setVersion( workingProject.getSnapshotDeploymentVersion() );
+ workingProject.setVersion( workingProject.getArtifact().getVersion() );
}
String groupId = workingProject.getGroupId();
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=240405&r1=240404&r2=240405&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Sat Aug 27 04:42:30 2005
@@ -12,7 +12,7 @@
{
private List artifactTransformations;
-
+
private SnapshotTransformation snapshotTransformation;
public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
@@ -43,21 +43,6 @@
ArtifactTransformation transform = (ArtifactTransformation) i.next();
transform.transformForDeployment( artifact, remoteRepository );
}
- }
-
- public String getSnapshotDeploymentTimestamp()
- {
- return snapshotTransformation.getDeploymentTimestamp();
- }
-
- public int getSnapshotDeploymentBuildNumber( Artifact artifact )
- {
- return snapshotTransformation.getDeploymentBuildNumber( artifact);
- }
-
- public String getSnapshotDeploymentVersion( Artifact snapshotArtifact )
- {
- return snapshotTransformation.getDeploymentVersion( snapshotArtifact );
}
}
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=240405&r1=240404&r2=240405&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 Sat Aug 27 04:42:30 2005
@@ -17,7 +17,6 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.metadata.AbstractVersionArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.SnapshotArtifactMetadata;
@@ -26,9 +25,7 @@
import org.apache.maven.wagon.ResourceDoesNotExistException;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -41,10 +38,6 @@
{
private String deploymentTimestamp;
- private int deploymentBuildNumber = 1;
-
- private Map buildNumbers = new HashMap();
-
public void transformForResolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactMetadataRetrievalException
{
@@ -76,20 +69,17 @@
{
metadata = (SnapshotArtifactMetadata) retrieveFromRemoteRepository( artifact, remoteRepository, null,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE );
-
- updateDeploymentBuildNumber( artifact, metadata.getTimestamp(), metadata.getBuildNumber() );
}
catch ( ResourceDoesNotExistException e )
{
- getLogger().debug(
- "Snapshot version metadata for: " + artifact.getId()
- + " not found. Creating a new metadata instance.", e );
-
+ getLogger().debug( "Snapshot version metadata for: " + artifact.getId() +
+ " not found. Creating a new metadata instance.", e );
+
// ignore. We'll be creating this metadata if it doesn't exist...
metadata = (SnapshotArtifactMetadata) createMetadata( artifact );
}
- metadata.setVersion( getDeploymentTimestamp(), deploymentBuildNumber );
+ metadata.setVersion( getDeploymentTimestamp(), metadata.getBuildNumber() + 1 );
artifact.setResolvedVersion( metadata.constructVersion() );
@@ -97,24 +87,6 @@
}
}
- private void updateDeploymentBuildNumber( Artifact artifact, String timestamp, int buildNumberFromMetadata )
- {
- // we only have to handle bumping the build number if we're on the same timestamp, somehow...miraculously
- if ( deploymentTimestamp.equals( timestamp ) )
- {
- String artifactKey = ArtifactUtils.versionlessKey( artifact );
-
- Integer buildNum = (Integer) buildNumbers.get( artifactKey );
-
- if ( buildNum == null || buildNum.intValue() <= buildNumberFromMetadata )
- {
- buildNum = new Integer( buildNumberFromMetadata + 1 );
-
- buildNumbers.put( artifactKey, buildNum );
- }
- }
- }
-
public String getDeploymentTimestamp()
{
if ( deploymentTimestamp == null )
@@ -123,36 +95,10 @@
}
return deploymentTimestamp;
}
-
- public int getDeploymentBuildNumber( Artifact artifact )
- {
- String artifactKey = ArtifactUtils.versionlessKey( artifact );
-
- Integer buildNum = (Integer) buildNumbers.get( artifactKey );
-
- if ( buildNum == null )
- {
- buildNum = new Integer( 1 );
- buildNumbers.put( artifactKey, buildNum );
- }
-
- return buildNum.intValue();
- }
protected AbstractVersionArtifactMetadata createMetadata( Artifact artifact )
{
return new SnapshotArtifactMetadata( artifact );
- }
-
- public String getDeploymentVersion( Artifact artifact )
- {
- int buildnum = getDeploymentBuildNumber( artifact );
-
- SnapshotArtifactMetadata metadata = (SnapshotArtifactMetadata) createMetadata( artifact );
-
- metadata.setVersion( getDeploymentTimestamp(), buildnum );
-
- return metadata.constructVersion();
}
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java?rev=240405&r1=240404&r2=240405&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java Sat Aug 27 04:42:30 2005
@@ -1,14 +1,30 @@
package org.apache.maven.artifact.repository.metadata;
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.io.File;
public interface RepositoryMetadata
{
-
+
String getRepositoryPath();
-
+
File getFile();
-
+
void setFile( File file );
}
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java?rev=240405&r1=240404&r2=240405&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java Sat Aug 27 04:42:30 2005
@@ -1,5 +1,21 @@
package org.apache.maven.artifact.transform;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -43,20 +59,5 @@
*/
void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository )
throws ArtifactMetadataRetrievalException;
-
- /**
- * Return the timestamp which will be used to deploy artifacts from this build.
- */
- String getSnapshotDeploymentTimestamp();
-
- /**
- * Return the buildnumber which will be used to deploy artifacts from this build.
- */
- int getSnapshotDeploymentBuildNumber( Artifact snapshotArtifact );
-
- /**
- * Return the artifact-version which will be used to deploy artifacts from this build.
- */
- String getSnapshotDeploymentVersion( Artifact snapshotArtifact );
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=240405&r1=240404&r2=240405&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Sat Aug 27 04:42:30 2005
@@ -605,15 +605,6 @@
project.getVersion(), project.getPackaging() );
project.setArtifact( projectArtifact );
- if ( projectArtifact.isSnapshot() )
- {
- project.setSnapshotDeploymentVersion(
- transformationManager.getSnapshotDeploymentVersion( projectArtifact ) );
-
- project.setSnapshotDeploymentBuildNumber(
- transformationManager.getSnapshotDeploymentBuildNumber( projectArtifact ) );
- }
-
project.setPluginArtifactRepositories( ProjectUtils.buildArtifactRepositories( model.getPluginRepositories(),
artifactRepositoryFactory,
container ) );
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=240405&r1=240404&r2=240405&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 Sat Aug 27 04:42:30 2005
@@ -137,10 +137,6 @@
private Build buildOverlay;
- private String snapshotDeploymentVersion;
-
- private int snapshotDeploymentBuildNumber = -1;
-
public MavenProject( Model model )
{
this.model = model;
@@ -187,9 +183,6 @@
this.originalModel = ModelUtils.cloneModel( project.originalModel );
}
- this.snapshotDeploymentVersion = project.snapshotDeploymentVersion;
- this.snapshotDeploymentBuildNumber = project.snapshotDeploymentBuildNumber;
-
// TODO: need to clone this too?
this.artifact = project.artifact;
}
@@ -481,7 +474,7 @@
// {
// list.add( a );
// }
-
+
list.add( a );
}
}
@@ -510,7 +503,7 @@
// Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
// {
// }
-
+
Dependency dependency = new Dependency();
dependency.setArtifactId( a.getArtifactId() );
@@ -1357,33 +1350,6 @@
public void attachArtifact( String type, String classifier, File file )
{
- }
-
- public void setSnapshotDeploymentVersion( String deploymentVersion )
- {
- this.snapshotDeploymentVersion = deploymentVersion;
- }
-
- public String getSnapshotDeploymentVersion()
- {
- if ( snapshotDeploymentVersion == null )
- {
- return getVersion();
- }
- else
- {
- return snapshotDeploymentVersion;
- }
- }
-
- public void setSnapshotDeploymentBuildNumber( int deploymentBuildNumber )
- {
- this.snapshotDeploymentBuildNumber = deploymentBuildNumber;
- }
-
- public int getSnapshotDeploymentBuildNumber()
- {
- return snapshotDeploymentBuildNumber;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org