diff --git a/maven-artifact-ant/pom.xml b/maven-artifact-ant/pom.xml
index 7ed9b823a5..3d426dc6f8 100755
--- a/maven-artifact-ant/pom.xml
+++ b/maven-artifact-ant/pom.xml
@@ -31,25 +31,25 @@
org.apache.maven.wagon
wagon-http-lightweight
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
runtime
org.apache.maven.wagon
wagon-file
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
runtime
org.apache.maven.wagon
wagon-ssh
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
runtime
org.apache.maven.wagon
wagon-scm
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
@@ -57,7 +57,6 @@
maven-assembly-plugin
- 1.0-SNAPSHOT
src/main/assembly/dep.xml
diff --git a/maven-artifact-test/pom.xml b/maven-artifact-test/pom.xml
index 9081527ad8..2650dd04ab 100755
--- a/maven-artifact-test/pom.xml
+++ b/maven-artifact-test/pom.xml
@@ -11,7 +11,7 @@
plexus
plexus-container-default
- 1.0-alpha-2
+ 1.0-alpha-3
org.apache.maven
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 33ee58c226..993630ccf3 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -11,17 +11,17 @@
plexus
plexus-container-default
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
org.apache.maven.wagon
wagon-provider-api
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
org.apache.maven.wagon
wagon-file
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
test
diff --git a/maven-core-it/it0015/pom.xml b/maven-core-it/it0015/pom.xml
index 8db33da50b..e50aefb297 100644
--- a/maven-core-it/it0015/pom.xml
+++ b/maven-core-it/it0015/pom.xml
@@ -18,7 +18,7 @@
marmalade
marmalade-core
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 25072a9096..b44338d6f0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -12,12 +12,12 @@
org.apache.maven.wagon
wagon-provider-api
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
plexus
plexus-container-artifact
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
org.apache.maven
@@ -78,12 +78,12 @@
plexus
plexus-container-default
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
org.apache.maven.wagon
wagon-http-lightweight
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
runtime
@@ -92,18 +92,15 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 1.0-SNAPSHOT
@@ -118,7 +115,6 @@
maven-assembly-plugin
- 1.0-SNAPSHOT
src/assemble/bin.xml
maven-2.0-SNAPSHOT
diff --git a/maven-mboot2/pom.xml b/maven-mboot2/pom.xml
index bb158b6e10..f1302196b7 100644
--- a/maven-mboot2/pom.xml
+++ b/maven-mboot2/pom.xml
@@ -12,7 +12,7 @@
org.codehaus.modello
modello-plugin-xpp3
- 1.0-alpha-2-SNAPSHOT
+ 1.0-alpha-2
runtime
@@ -26,7 +26,7 @@
plexus
plexus-container-default
- 1.0-alpha-2
+ 1.0-alpha-3
runtime
diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
index 392c71835c..374b7404fe 100644
--- a/maven-mboot2/src/main/java/MBoot.java
+++ b/maven-mboot2/src/main/java/MBoot.java
@@ -288,6 +288,9 @@ public class MBoot
// Install maven-script-parent POM
installPomFile( localRepository, new File( basedir, "maven-script/pom.xml" ) );
+ // Install maven-reporting parent POM
+ installPomFile( localRepository, new File( basedir, "maven-reporting/pom.xml" ) );
+
// Install it-support POM
installPomFile( localRepository, new File( basedir, "maven-core-it-support/pom.xml" ) );
@@ -414,7 +417,6 @@ public class MBoot
// lib
// ----------------------------------------------------------------------
- // TODO: check this - we are transitively including in /lib...
File lib = new File( dist, "lib" );
lib.mkdirs();
diff --git a/maven-mboot2/src/main/java/download/ArtifactDownloader.java b/maven-mboot2/src/main/java/download/ArtifactDownloader.java
index 01f30e746f..bc8521bdf4 100644
--- a/maven-mboot2/src/main/java/download/ArtifactDownloader.java
+++ b/maven-mboot2/src/main/java/download/ArtifactDownloader.java
@@ -135,14 +135,23 @@ public class ArtifactDownloader
log( "Downloading " + metaUrl );
try
{
- HttpUtils.getFile( metaUrl, file, ignoreErrors, false, proxyHost, proxyPort, proxyUserName,
+ HttpUtils.getFile( metaUrl, file, ignoreErrors, true, proxyHost, proxyPort, proxyUserName,
proxyPassword, false );
version = FileUtils.fileRead( file );
log( "Resolved version: " + version );
dep.setResolvedVersion( version );
- String ver = version.substring( version.lastIndexOf( "-", version.lastIndexOf( "-" ) - 1 ) + 1 );
- String extension = url.substring( url.length() - 4 );
- url = getSnapshotMetadataFile( url, ver + extension );
+ if ( !version.endsWith( "SNAPSHOT" ) )
+ {
+ String ver = version.substring(
+ version.lastIndexOf( "-", version.lastIndexOf( "-" ) - 1 ) + 1 );
+ String extension = url.substring( url.length() - 4 );
+ url = getSnapshotMetadataFile( url, ver + extension );
+ }
+ else if ( destinationFile.exists() )
+ {
+ // It's already there
+ return true;
+ }
}
catch ( IOException e )
{
@@ -151,10 +160,9 @@ public class ArtifactDownloader
}
if ( !dep.getType().equals( "pom" ) )
{
+ String name = dep.getArtifactId() + "-" + dep.getResolvedVersion() + ".pom";
File file = localRepository.getMetadataFile( dep.getGroupId(), dep.getArtifactId(),
- dep.getVersion(), dep.getType(),
- dep.getArtifactId() + "-" + dep.getResolvedVersion() +
- ".pom" );
+ dep.getVersion(), dep.getType(), name );
file.getParentFile().mkdirs();
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 232cfd24e0..a285cd348b 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -20,7 +20,7 @@
org.codehaus.modello
modello-maven-plugin
- 1.0-alpha-2-SNAPSHOT
+ 1.0-alpha-2
4.0.0
maven.mdo
diff --git a/maven-plugin-descriptor/pom.xml b/maven-plugin-descriptor/pom.xml
index 42d2e69308..5d57310070 100755
--- a/maven-plugin-descriptor/pom.xml
+++ b/maven-plugin-descriptor/pom.xml
@@ -16,7 +16,7 @@
plexus
plexus-container-default
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
index 354e4fe870..f107738a55 100644
--- a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
@@ -11,7 +11,7 @@
marmalade
marmalade-core
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
org.apache.maven
diff --git a/maven-plugins/maven-assembly-plugin/pom.xml b/maven-plugins/maven-assembly-plugin/pom.xml
index a7e48687fc..fb24f51c01 100755
--- a/maven-plugins/maven-assembly-plugin/pom.xml
+++ b/maven-plugins/maven-assembly-plugin/pom.xml
@@ -26,7 +26,7 @@
org.codehaus.modello
modello-maven-plugin
- 1.0-alpha-2-SNAPSHOT
+ 1.0-alpha-2
src/main/mdo/descriptor.mdo
1.0.0
diff --git a/maven-plugins/maven-compiler-plugin/pom.xml b/maven-plugins/maven-compiler-plugin/pom.xml
index 77bb7b6f94..5ae9f30cd3 100644
--- a/maven-plugins/maven-compiler-plugin/pom.xml
+++ b/maven-plugins/maven-compiler-plugin/pom.xml
@@ -14,12 +14,12 @@
plexus
plexus-compiler-api
- 1.3-SNAPSHOT
+ 1.3
plexus
plexus-compiler-javac
- 1.3-SNAPSHOT
+ 1.3
diff --git a/maven-plugins/maven-deploy-plugin/pom.xml b/maven-plugins/maven-deploy-plugin/pom.xml
index cac77e374b..5d304bdb9c 100644
--- a/maven-plugins/maven-deploy-plugin/pom.xml
+++ b/maven-plugins/maven-deploy-plugin/pom.xml
@@ -24,13 +24,13 @@
org.apache.maven.wagon
wagon-file
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
runtime
org.apache.maven.wagon
wagon-ssh
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
runtime
diff --git a/maven-plugins/maven-eclipse-plugin/pom.xml b/maven-plugins/maven-eclipse-plugin/pom.xml
index 6affb945de..c98afb8c01 100644
--- a/maven-plugins/maven-eclipse-plugin/pom.xml
+++ b/maven-plugins/maven-eclipse-plugin/pom.xml
@@ -23,7 +23,7 @@
plexus
plexus-container-default
- 1.0-alpha-2
+ 1.0-alpha-3
test
diff --git a/maven-plugins/maven-resources-plugin/pom.xml b/maven-plugins/maven-resources-plugin/pom.xml
index 5490b7d876..26bd947f5c 100644
--- a/maven-plugins/maven-resources-plugin/pom.xml
+++ b/maven-plugins/maven-resources-plugin/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven
maven-model
- 2.0-alpha-1
+ 2.0-SNAPSHOT
diff --git a/maven-plugins/maven-site-plugin/pom.xml b/maven-plugins/maven-site-plugin/pom.xml
index 0b6934c820..f0de16869f 100644
--- a/maven-plugins/maven-site-plugin/pom.xml
+++ b/maven-plugins/maven-site-plugin/pom.xml
@@ -23,17 +23,17 @@
doxia
doxia-core
- 1.0-alpha-2-SNAPSHOT
+ 1.0-alpha-2
org.apache.maven.wagon
wagon-provider-api
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
org.apache.maven.wagon
wagon-ssh
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
diff --git a/maven-plugins/maven-source-plugin/pom.xml b/maven-plugins/maven-source-plugin/pom.xml
index 6230737fab..81a0466468 100644
--- a/maven-plugins/maven-source-plugin/pom.xml
+++ b/maven-plugins/maven-source-plugin/pom.xml
@@ -18,7 +18,7 @@
plexus
plexus-container-default
- 1.0-alpha-2
+ 1.0-alpha-3
test
diff --git a/maven-plugins/maven-surefire-plugin/pom.xml b/maven-plugins/maven-surefire-plugin/pom.xml
index 5771abf92b..b89fda780a 100644
--- a/maven-plugins/maven-surefire-plugin/pom.xml
+++ b/maven-plugins/maven-surefire-plugin/pom.xml
@@ -33,7 +33,7 @@
org.apache.maven
maven-artifact
- 2.0-alpha-1
+ 2.0-SNAPSHOT
diff --git a/maven-plugins/maven-verifier-plugin/pom.xml b/maven-plugins/maven-verifier-plugin/pom.xml
index b173da33d2..498714ac8b 100644
--- a/maven-plugins/maven-verifier-plugin/pom.xml
+++ b/maven-plugins/maven-verifier-plugin/pom.xml
@@ -39,7 +39,7 @@
org.codehaus.modello
modello-maven-plugin
- 1.0-alpha-2-SNAPSHOT
+ 1.0-alpha-2
src/main/mdo/verifications.mdo
1.0.0
diff --git a/maven-project/pom.xml b/maven-project/pom.xml
index 5bae897b62..3e217432e8 100755
--- a/maven-project/pom.xml
+++ b/maven-project/pom.xml
@@ -26,12 +26,12 @@
plexus
plexus-container-default
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
plexus
plexus-utils
- 1.0-alpha-3-SNAPSHOT
+ 1.0-alpha-3
diff --git a/maven-reporting/maven-reporting-api/pom.xml b/maven-reporting/maven-reporting-api/pom.xml
index 93131eda20..f2d93dc41f 100644
--- a/maven-reporting/maven-reporting-api/pom.xml
+++ b/maven-reporting/maven-reporting-api/pom.xml
@@ -6,8 +6,6 @@
2.0-SNAPSHOT
maven-reporting-api
- 2.0-SNAPSHOT
- 2005
org.apache.maven
@@ -17,7 +15,7 @@
doxia
doxia-core
- 1.0-alpha-2-SNAPSHOT
+ 1.0-alpha-2