Author: brett
Date: Tue May 10 08:04:06 2005
New Revision: 169484
URL: http://svn.apache.org/viewcvs?rev=169484&view=rev
Log:
remove default plugin versions from super POM, rely on discovery of releases.
Write out the current version during bootstrap to force its usage
(unfortunately enforcing it on other installs, however...)
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
Tue May 10 08:04:06 2005
@@ -22,6 +22,7 @@
import org.apache.maven.artifact.metadata.VersionArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactPathFormatException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
@@ -107,7 +108,7 @@
getLogger().info(
artifact.getArtifactId() + ": checking for updates
from " + remoteRepository.getId() );
- VersionArtifactMetadata remoteMetadata =
retrieveFromRemoteRepository( artifact, remoteRepository );
+ VersionArtifactMetadata remoteMetadata =
retrieveFromRemoteRepository( artifact, remoteRepository, localMetadata );
int difference = remoteMetadata.compareTo( localMetadata );
if ( difference > 0 )
@@ -171,7 +172,8 @@
}
protected abstract VersionArtifactMetadata retrieveFromRemoteRepository(
Artifact artifact,
-
ArtifactRepository remoteRepository )
+
ArtifactRepository remoteRepository,
+
VersionArtifactMetadata localMetadata )
throws ArtifactMetadataRetrievalException;
protected abstract VersionArtifactMetadata readFromLocalRepository(
Artifact artifact,
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
Tue May 10 08:04:06 2005
@@ -81,7 +81,8 @@
}
protected VersionArtifactMetadata retrieveFromRemoteRepository( Artifact
artifact,
-
ArtifactRepository remoteRepository )
+
ArtifactRepository remoteRepository,
+
VersionArtifactMetadata localMetadata )
throws ArtifactMetadataRetrievalException
{
AbstractVersionArtifactMetadata metadata = new
ReleaseArtifactMetadata( artifact );
@@ -91,7 +92,11 @@
}
catch ( ResourceDoesNotExistException e )
{
- throw new ArtifactMetadataRetrievalException( "No releases could
be detected for the artifact", e );
+ if ( localMetadata.constructVersion() == null )
+ {
+ throw new ArtifactMetadataRetrievalException( "Unable to find
release for artifact " + artifact, e );
+ }
+ // otherwise, ignore - use the local one
}
return metadata;
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
Tue May 10 08:04:06 2005
@@ -25,7 +25,6 @@
import org.apache.maven.wagon.ResourceDoesNotExistException;
import java.io.IOException;
-import java.io.File;
import java.util.List;
import java.util.regex.Matcher;
@@ -94,8 +93,8 @@
}
else if ( isSnapshot( artifact ) )
{
- SnapshotArtifactMetadata metadata = (SnapshotArtifactMetadata)
retrieveFromRemoteRepository( artifact,
-
remoteRepository );
+ SnapshotArtifactMetadata metadata = null;
+ metadata = (SnapshotArtifactMetadata)
retrieveFromRemoteRepository( artifact, remoteRepository, null );
metadata.update();
artifact.setVersion( metadata.constructVersion() );
@@ -110,7 +109,8 @@
}
protected VersionArtifactMetadata retrieveFromRemoteRepository( Artifact
artifact,
-
ArtifactRepository remoteRepository )
+
ArtifactRepository remoteRepository,
+
VersionArtifactMetadata localMetadata )
throws ArtifactMetadataRetrievalException
{
SnapshotArtifactMetadata metadata = new SnapshotArtifactMetadata(
artifact );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Tue May 10 08:04:06 2005
@@ -23,6 +23,7 @@
import org.apache.maven.execution.MavenExecutionResponse;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginManagement;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.PluginManagerException;
@@ -188,10 +189,14 @@
plugin.setArtifactId( artifactId );
plugin.setVersion( version );
- Plugin def = (Plugin)
project.getPluginManagement().getPluginsAsMap().get( key );
- if ( def != null )
+ PluginManagement pluginManagement = project.getPluginManagement();
+ if ( pluginManagement != null )
{
- modelDefaultsInjector.mergePluginWithDefaults( plugin, def );
+ Plugin def = (Plugin) pluginManagement.getPluginsAsMap().get(
key );
+ if ( def != null )
+ {
+ modelDefaultsInjector.mergePluginWithDefaults( plugin, def
);
+ }
}
project.addPlugin( plugin );
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Tue May 10
08:04:06 2005
@@ -636,8 +636,6 @@
installPom( basedir, localRepository, reader );
- String artifactId = reader.getArtifactId();
-
install( basedir, localRepository, reader, reader.getPackaging() );
return reader;
@@ -742,7 +740,6 @@
throws Exception
{
installPomFile( reader, localRepository, new File( basedir, "pom.xml"
) );
-
}
private void installPomFile( ModelReader reader, Repository
localRepository, File source )
@@ -789,6 +786,8 @@
FileUtils.copyFile( new File( basedir, BUILD_DIR + "/" + finalName +
".jar" ), file );
+ file = localRepository.getMetadataFile( groupId, artifactId, null,
type, artifactId + "-RELEASE.version.txt" );
+ IOUtil.copy( new StringReader( version ), new FileWriter( file ) );
}
private void runTests( String basedir, String classes, String testClasses,
ModelReader reader,
@@ -807,7 +806,7 @@
excludes = new ArrayList();
- excludes.add( "**/*Abstract*.java" );
+ excludes.add( "**/Abstract*Test.java" );
String reportsDir = new File( basedir, "target/surefire-reports"
).getAbsolutePath();
Modified:
maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java
(original)
+++ maven/components/trunk/maven-mboot2/src/main/java/model/Repository.java Tue
May 10 08:04:06 2005
@@ -107,7 +107,11 @@
repositoryPath = dependency.getGroupId().replace( '.', '/' );
// if ( !dependency.getType().equals( "pom" ) )
// {
- repositoryPath = repositoryPath + "/" + dependency.getArtifactId()
+ "/" + dependency.getVersion();
+ repositoryPath = repositoryPath + "/" + dependency.getArtifactId();
+ if ( version != null )
+ {
+ repositoryPath = repositoryPath + "/" +
dependency.getVersion();
+ }
// }
repositoryPath = repositoryPath + "/" + filename;
}
Modified:
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
(original)
+++
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Tue May 10 08:04:06 2005
@@ -25,6 +25,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -40,7 +41,7 @@
public class SurefirePlugin
extends AbstractMojo
{
-
+
/**
* @parameter expression="${basedir}"
* @required
@@ -68,14 +69,14 @@
/**
* Base directory where all reports are written to.
- *
+ *
* @parameter expression="${project.build.directory}/surefire-reports"
*/
private String reportsDirectory;
/**
* Specify this parameter if you want to use the test regex notation to
select tests to run.
- *
+ *
* @parameter
*/
private String test;
@@ -83,12 +84,12 @@
/**
* @parameter
*/
- private List includes;
+ private List includes = new ArrayList( Collections.singletonList(
"**/*Test.java" ) );
/**
* @parameter
*/
- private List excludes;
+ private List excludes = new ArrayList( Collections.singletonList(
"**/Abstract*Test.java" ) );
/**
* @parameter expression="${localRepository}"
Modified:
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=169484&r1=169483&r2=169484&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
(original)
+++
maven/components/trunk/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Tue May 10 08:04:06 2005
@@ -38,64 +38,6 @@
<directory>src/test/resources</directory>
</testResource>
</testResources>
- <!-- Default plugins -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- <configuration>
- <includes>
- <include
implementation="java.lang.String">**/*Test.java</include>
- </includes>
- <excludes>
- <exclude
implementation="java.lang.String">**/Abstract*Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pom-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
