Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to released versions 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169961 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-05-13 07:01:57 +00:00
parent eea8266a65
commit 7ed8a746d3
25 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-artifact-ant/pom.xml
View File

@ -31,25 +31,25 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-scm</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<!-- temporarily compile time scope>runtime</scope -->
</dependency>
</dependencies>
@ -57,7 +57,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<descriptor>src/main/assembly/dep.xml</descriptor>
</configuration>

2
maven-artifact-test/pom.xml
View File

@ -11,7 +11,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-2</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>

6
maven-artifact/pom.xml
View File

@ -11,17 +11,17 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<scope>test</scope>
</dependency>
</dependencies>

2
maven-core-it/it0015/pom.xml
View File

@ -18,7 +18,7 @@
<dependency>
<groupId>marmalade</groupId>
<artifactId>marmalade-core</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
</dependencies>
<build>

12
maven-core/pom.xml
View File

@ -12,12 +12,12 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-artifact</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@ -78,12 +78,12 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@ -92,18 +92,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</plugin>
-->
</plugins>
@ -118,7 +115,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<configuration>
<descriptor>src/assemble/bin.xml</descriptor>
<finalName>maven-2.0-SNAPSHOT</finalName>

4
maven-mboot2/pom.xml
View File

@ -12,7 +12,7 @@
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-plugin-xpp3</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
<version>1.0-alpha-2</version>
<scope>runtime</scope>
</dependency>
@ -26,7 +26,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-2</version>
<version>1.0-alpha-3</version>
<scope>runtime</scope>
</dependency>
</dependencies>

4
maven-mboot2/src/main/java/MBoot.java
View File

@ -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();

22
maven-mboot2/src/main/java/download/ArtifactDownloader.java
View File

@ -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();

2
maven-model/pom.xml
View File

@ -20,7 +20,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
<version>1.0-alpha-2</version>
<configuration>
<version>4.0.0</version>
<model>maven.mdo</model>

2
maven-plugin-descriptor/pom.xml
View File

@ -16,7 +16,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
</dependencies>
</project>

2
maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
View File

@ -11,7 +11,7 @@
<dependency>
<groupId>marmalade</groupId>
<artifactId>marmalade-core</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>

2
maven-plugins/maven-assembly-plugin/pom.xml
View File

@ -26,7 +26,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
<version>1.0-alpha-2</version>
<configuration>
<model>src/main/mdo/descriptor.mdo</model>
<version>1.0.0</version>

4
maven-plugins/maven-compiler-plugin/pom.xml
View File

@ -14,12 +14,12 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.3</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-compiler-javac</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.3</version>
</dependency>
</dependencies>
</model>

4
maven-plugins/maven-deploy-plugin/pom.xml
View File

@ -24,13 +24,13 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
<scope>runtime</scope>
</dependency>
</dependencies>

2
maven-plugins/maven-eclipse-plugin/pom.xml
View File

@ -23,7 +23,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-2</version>
<version>1.0-alpha-3</version>
<scope>test</scope>
</dependency>
</dependencies>

2
maven-plugins/maven-resources-plugin/pom.xml
View File

@ -13,7 +13,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-alpha-1</version>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
</model>

6
maven-plugins/maven-site-plugin/pom.xml
View File

@ -23,17 +23,17 @@
<dependency>
<groupId>doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
<version>1.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
</dependencies>
</project>

2
maven-plugins/maven-source-plugin/pom.xml
View File

@ -18,7 +18,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-2</version>
<version>1.0-alpha-3</version>
<scope>test</scope>
</dependency>
</dependencies>

2
maven-plugins/maven-surefire-plugin/pom.xml
View File

@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-alpha-1</version>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
</model>

2
maven-plugins/maven-verifier-plugin/pom.xml
View File

@ -39,7 +39,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
<version>1.0-alpha-2</version>
<configuration>
<model>src/main/mdo/verifications.mdo</model>
<version>1.0.0</version>

4
maven-project/pom.xml
View File

@ -26,12 +26,12 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
</dependencies>
</model>

4
maven-reporting/maven-reporting-api/pom.xml
View File

@ -6,8 +6,6 @@
<version>2.0-SNAPSHOT</version>
</parent>
<artifactId>maven-reporting-api</artifactId>
<version>2.0-SNAPSHOT</version>
<inceptionYear>2005</inceptionYear>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@ -17,7 +15,7 @@
<dependency>
<groupId>doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
<version>1.0-alpha-2</version>
</dependency>
</dependencies>
<!-- build>

1
maven-reporting/pom.xml
View File

@ -9,7 +9,6 @@
<artifactId>maven-reporting</artifactId>
<packaging>pom</packaging>
<name>Maven Reporting</name>
<version>2.0-SNAPSHOT</version>
<inceptionYear>2005</inceptionYear>
<modules>
<module>maven-reporting-api</module>

4
maven-script/maven-script-marmalade/pom.xml
View File

@ -16,12 +16,12 @@
<dependency>
<groupId>marmalade</groupId>
<artifactId>marmalade-core</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-marmalade-factory</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
<version>1.0-alpha-3</version>
</dependency>
</dependencies>
</model>

2
maven-settings/pom.xml
View File

@ -19,7 +19,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
<version>1.0-alpha-2</version>
<goals>
<goal>
<id>xpp3-writer</id>