You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/04/28 08:13:14 UTC
svn commit: r769260 - in
/maven/components/branches/maven-3.0-mercury-763966: ./ maven-core/
maven-mercury/ maven-project/ maven-repository-mercury/
maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/
maven-repository-mercury/sr...
Author: ogusakov
Date: Tue Apr 28 06:13:12 2009
New Revision: 769260
URL: http://svn.apache.org/viewvc?rev=769260&view=rev
Log:
adjusted this branch for mercury alpha-8 snapshot
Removed:
maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
Modified:
maven/components/branches/maven-3.0-mercury-763966/build-mercury.xml
maven/components/branches/maven-3.0-mercury-763966/maven-core/pom.xml
maven/components/branches/maven-3.0-mercury-763966/maven-mercury/pom.xml
maven/components/branches/maven-3.0-mercury-763966/maven-project/pom.xml
maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/pom.xml
maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java
maven/components/branches/maven-3.0-mercury-763966/maven-repository/pom.xml
maven/components/branches/maven-3.0-mercury-763966/pom.xml
Modified: maven/components/branches/maven-3.0-mercury-763966/build-mercury.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/build-mercury.xml?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/build-mercury.xml (original)
+++ maven/components/branches/maven-3.0-mercury-763966/build-mercury.xml Tue Apr 28 06:13:12 2009
@@ -143,8 +143,8 @@
<property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/>
- <replace file="${basedir}/dependencies.xml" token="<!--bootstrap-start-comment-->" value="<!--"/>
- <replace file="${basedir}/dependencies.xml" token="<!--bootstrap-end-comment-->" value="-->"/>
+ <replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/>
+ <replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/>
<mercury:local-repository location="${maven.repo.local}"/>
<mercury:remote-repository id="central" location="${maven.repo.central}" updatePolicy="${maven.repo.update.policy}"/>
@@ -349,12 +349,12 @@
<jvmarg value="-Dsurefire.useFile=${surefire.useFile}"/>
<!--
<debug-the-bootstrap>
--->
+
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
<jvmarg value="-Djava.compiler=NONE"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>
-<!--
+
</debug-the-bootstrap>
-->
</java>
Modified: maven/components/branches/maven-3.0-mercury-763966/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/maven-core/pom.xml?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/maven-core/pom.xml (original)
+++ maven/components/branches/maven-3.0-mercury-763966/maven-core/pom.xml Tue Apr 28 06:13:12 2009
@@ -39,6 +39,14 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/maven-3.0-mercury-763966/maven-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/maven-mercury/pom.xml?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/maven-mercury/pom.xml (original)
+++ maven/components/branches/maven-3.0-mercury-763966/maven-mercury/pom.xml Tue Apr 28 06:13:12 2009
@@ -29,6 +29,11 @@
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-project-builder</artifactId>
</dependency>
@@ -44,13 +49,14 @@
<!-- test dependencies -->
+<!--
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+ -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: maven/components/branches/maven-3.0-mercury-763966/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/maven-project/pom.xml?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/maven-project/pom.xml (original)
+++ maven/components/branches/maven-3.0-mercury-763966/maven-project/pom.xml Tue Apr 28 06:13:12 2009
@@ -49,6 +49,10 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/pom.xml?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/pom.xml (original)
+++ maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/pom.xml Tue Apr 28 06:13:12 2009
@@ -30,24 +30,13 @@
<name>Mercury Repository implementation</name>
<description>Mercury implementation for the Maven Repository System</description>
- <properties>
- <mercury.version>1.0-alpha-7-SNAPSHOT</mercury.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository</artifactId>
- <version>${project.version}</version>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-legacy</artifactId>
- <version>${project.version}</version>
</dependency>
- -->
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
@@ -65,82 +54,22 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-external</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-sat</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-api</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-m2</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-remote-m2</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-virtual</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-artifact</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
+ <artifactId>mercury-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-plexus</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- <version>${mercury.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository</artifactId>
- <version>${project.version}</version>
+ <artifactId>mercury-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+ -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
Modified: maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java (original)
+++ maven/components/branches/maven-3.0-mercury-763966/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java Tue Apr 28 06:13:12 2009
@@ -46,7 +46,6 @@
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.api.RepositoryException;
import org.apache.maven.mercury.util.Util;
-import org.apache.maven.model.Dependency;
import org.apache.maven.repository.LegacyRepositorySystem;
import org.apache.maven.repository.MetadataGraph;
import org.apache.maven.repository.MetadataResolutionRequest;
Modified: maven/components/branches/maven-3.0-mercury-763966/maven-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/maven-repository/pom.xml?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/maven-repository/pom.xml (original)
+++ maven/components/branches/maven-3.0-mercury-763966/maven-repository/pom.xml Tue Apr 28 06:13:12 2009
@@ -44,7 +44,17 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
Modified: maven/components/branches/maven-3.0-mercury-763966/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0-mercury-763966/pom.xml?rev=769260&r1=769259&r2=769260&view=diff
==============================================================================
--- maven/components/branches/maven-3.0-mercury-763966/pom.xml (original)
+++ maven/components/branches/maven-3.0-mercury-763966/pom.xml Tue Apr 28 06:13:12 2009
@@ -248,6 +248,7 @@
<module>maven-toolchain</module>
<module>maven-compat</module>
<module>maven-repository</module>
+ <module>maven-repository-mercury</module>
</modules>
<!--start-->
<dependencies>
@@ -464,7 +465,7 @@
</dependency>
- <!-- Mercury test dependencies -->
+ <!-- Mercury test dependencies
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-core</artifactId>
@@ -472,8 +473,8 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+-->
<dependency>
-
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-plugin-manager</artifactId>
<version>${plexusPluginManagerVersion}</version>