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 2008/12/04 00:19:53 UTC
svn commit: r723125 - in /maven/mercury/trunk:
mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/
mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/
mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/...
Author: ogusakov
Date: Wed Dec 3 15:19:50 2008
New Revision: 723125
URL: http://svn.apache.org/viewvc?rev=723125&view=rev
Log:
preping to drop maven dependencies: MERCURY-47
Added:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java (contents, props changed)
- copied, changed from r722647, maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
Removed:
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/Messages.properties
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2Test.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java Wed Dec 3 15:19:50 2008
@@ -29,6 +29,7 @@
import junit.framework.TestCase;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
@@ -90,11 +91,11 @@
reps = new ArrayList<Repository>();
- localRepo = new LocalRepositoryM2( "testLocalRepo", repoDir );
+ localRepo = new LocalRepositoryM2( "testLocalRepo", repoDir, new MavenDependencyProcessor() );
reps.add( localRepo );
Server server = new Server( "testRemoteRepo", new URL(repoUrl) );
- remoteRepo = new RemoteRepositoryM2(server);
+ remoteRepo = new RemoteRepositoryM2(server, new MavenDependencyProcessor());
reps.add( remoteRepo );
// Server central = new Server("central", new URL("http://repo1.maven.org/maven2") );
@@ -222,11 +223,11 @@
reps.clear();
File pluginRepo = new File( "./target/repoPlugin" );
- localRepo = new LocalRepositoryM2( "testLocalPluginRepo", pluginRepo );
+ localRepo = new LocalRepositoryM2( "testLocalPluginRepo", pluginRepo, new MavenDependencyProcessor() );
reps.add( localRepo );
Server server = new Server( "id", new URL(centralUrl) );
- remoteRepo = new RemoteRepositoryM2(server);
+ remoteRepo = new RemoteRepositoryM2(server, new MavenDependencyProcessor());
remoteRepo.setUpdatePolicy( RepositoryUpdateIntervalPolicy.UPDATE_POLICY_NEVER );
reps.add( remoteRepo );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java Wed Dec 3 15:19:50 2008
@@ -21,6 +21,7 @@
import java.io.File;
import java.util.ArrayList;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
@@ -47,7 +48,7 @@
server = new Server( "test", new File("./target/test-classes/repo").toURL() );
- repo = new LocalRepositoryM2( server );
+ repo = new LocalRepositoryM2( server, new MavenDependencyProcessor() );
repo.setDependencyProcessor( mdProcessor );
reader = repo.getReader();
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java Wed Dec 3 15:19:50 2008
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.HashSet;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
@@ -73,7 +74,7 @@
factories.add( new SHA1VerifierFactory(false,false) );
server.setWriterStreamVerifierFactories(factories);
- repo = new LocalRepositoryM2( server );
+ repo = new LocalRepositoryM2( server, new MavenDependencyProcessor() );
mdProcessor = new MetadataProcessorMock();
repo.setDependencyProcessor( mdProcessor );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java Wed Dec 3 15:19:50 2008
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
@@ -86,7 +87,7 @@
port = String.valueOf( httpServer.getPort() );
server = new Server( "test", new URL("http://localhost:"+port+"/repo") );
- rr = new RemoteRepositoryM2( "testRepo", server );
+ rr = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
mdProcessor = new MetadataProcessorMock();
rr.setDependencyProcessor( mdProcessor );
@@ -97,7 +98,7 @@
localRepoBase.mkdir();
log.info("local repo is in "+localRepoBase);
- lr = new LocalRepositoryM2( "lr", localRepoBase );
+ lr = new LocalRepositoryM2( "lr", localRepoBase, new MavenDependencyProcessor() );
writer = lr.getWriter();
query = new ArrayList<ArtifactBasicMetadata>();
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java Wed Dec 3 15:19:50 2008
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
import org.apache.maven.mercury.repository.api.RemoteRepository;
@@ -83,7 +84,7 @@
RepositoryUpdatePolicy up = new RepositoryUpdateIntervalPolicy( RepositoryUpdateIntervalPolicy.UPDATE_POLICY_NAME_DAILY );
- repo = new RemoteRepositoryM2( "testRepo", server );
+ repo = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
((RemoteRepository)repo).setUpdatePolicy( up );
repo.setDependencyProcessor( new MetadataProcessorMock() );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java Wed Dec 3 15:19:50 2008
@@ -28,6 +28,7 @@
import java.util.HashSet;
import java.util.List;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
import org.apache.maven.mercury.repository.api.RepositoryException;
@@ -75,7 +76,7 @@
query = new ArrayList<ArtifactBasicMetadata>();
server = new Server( "test", new URL("http://localhost:"+_port+"/repo") );
- repo = new RemoteRepositoryM2( "testRepo", server );
+ repo = new RemoteRepositoryM2( "testRepo", server, new MavenDependencyProcessor() );
repo.setDependencyProcessor( mdProcessor );
reader = repo.getReader();
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java Wed Dec 3 15:19:50 2008
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.HashSet;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
@@ -91,7 +92,7 @@
server = new Server( "nexusTest", new URL(nexusSnapshotsTestUrl), false, false, user );
- repo = new RemoteRepositoryM2( "testNexusRepo", server );
+ repo = new RemoteRepositoryM2( "testNexusRepo", server, new MavenDependencyProcessor() );
mdProcessor = new MetadataProcessorMock();
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java Wed Dec 3 15:19:50 2008
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
@@ -80,11 +81,11 @@
DependencyProcessor mdProcessor = new MetadataProcessorMock();
Server server = new Server( "testRemoteRepo", new URL("http://localhost:"+_port+"/repo") );
- _remoteRepo = new RemoteRepositoryM2( server );
+ _remoteRepo = new RemoteRepositoryM2( server, new MavenDependencyProcessor() );
_remoteRepo.setUpdatePolicy( new RepositoryUpdateIntervalPolicy("interval2").setInterval( 2000L ) );
_remoteRepo.setDependencyProcessor( mdProcessor );
- _localRepo = new LocalRepositoryM2( "testLocalRepo", _localRepoBase );
+ _localRepo = new LocalRepositoryM2( "testLocalRepo", _localRepoBase, new MavenDependencyProcessor() );
_localRepo.setDependencyProcessor( mdProcessor );
List<Repository> reps = new ArrayList<Repository>();
Copied: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java (from r722647, maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java?p2=maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java&p1=maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java&r1=722647&r2=723125&rev=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java Wed Dec 3 15:19:50 2008
@@ -29,6 +29,7 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.DefaultArtifact;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.event.MercuryEvent;
import org.apache.maven.mercury.event.MercuryEventListener;
import org.apache.maven.mercury.event.MercuryEvent.EventMask;
@@ -38,6 +39,7 @@
import org.apache.maven.mercury.repository.api.RemoteRepository;
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
+import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.util.FileUtil;
@@ -78,11 +80,11 @@
if( !_testBase.exists() || !_testBase.isDirectory() )
throw new Exception( "cannot create clean folder " + _testBase.getAbsolutePath() );
- _localRepo = new LocalRepositoryM2( _localRepoId, _testBase );
+ _localRepo = new LocalRepositoryM2( _localRepoId, _testBase, new MetadataProcessorMock() );
_server = new Server( _remoteRepoId, new URL(_remoteUrl) );
- _remoteRepo = new RemoteRepositoryM2( _server.getId(), _server );
+ _remoteRepo = new RemoteRepositoryM2( _server.getId(), _server, new MetadataProcessorMock() );
List<Repository> rl = new ArrayList<Repository>();
rl.add( _localRepo );
Propchange: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml Wed Dec 3 15:19:50 2008
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-pom</artifactId>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
+ </parent>
<groupId>org.sonatype.maven.plugins</groupId>
<artifactId>mercury-compare-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Mercury Maven resolusion comparisson</name>
- <version>1.0</version>
- <description>Mercury Maven resolusion comparisson</description>
+ <name>Mercury Maven resolution comparison</name>
+ <description>Mercury Maven resolution comparison</description>
<prerequisites />
<inceptionYear>2008</inceptionYear>
@@ -35,8 +40,7 @@
</developers>
<properties>
- <mercury.version>1.0.0-alpha-2-SNAPSHOT</mercury.version>
- <maven.version>2.0.9</maven.version>
+ <test.maven.version>2.0.9</test.maven.version>
</properties>
<dependencies>
@@ -44,19 +48,19 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
+ <version>${test.maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>${maven.version}</version>
+ <version>${test.maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-compare-mdo</artifactId>
- <version>${mercury.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml Wed Dec 3 15:19:50 2008
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.mercury</groupId>
+
<artifactId>mercury-compare-mdo</artifactId>
- <name>Mercury Compare MDO: ${project.version}</name>
+ <name>Mercury Compare MDO</name>
<description />
<parent>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml Wed Dec 3 15:19:50 2008
@@ -1,13 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury</artifactId>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
+ </parent>
+
<groupId>org.sonatype.maven.plugins</groupId>
<artifactId>mercury-compare-mercury</artifactId>
+
<packaging>maven-plugin</packaging>
<name>Mercury Maven resolusion comparisson</name>
- <version>1.0-test</version>
<description>Mercury Maven resolusion comparisson</description>
<prerequisites />
+
<inceptionYear>2008</inceptionYear>
<build>
@@ -34,27 +42,27 @@
</developer>
</developers>
- <properties>
- <mercury.version>1.0.0-alpha-2-SNAPSHOT</mercury.version>
- </properties>
-
<dependencies>
+
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-sat</artifactId>
- <version>${mercury.version}</version>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-mercury</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-md-sat</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-compare-mdo</artifactId>
- <version>${mercury.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <version>${mercury.version}</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java Wed Dec 3 15:19:50 2008
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
@@ -100,7 +101,7 @@
if( !targetDirFile.exists() )
targetDirFile.mkdirs();
- lRepo = new LocalRepositoryM2( "localMercury", new File(localRepoDir) );
+ lRepo = new LocalRepositoryM2( "localMercury", new File(localRepoDir), new MavenDependencyProcessor() );
repos.add( lRepo );
MercuryResolve mc = new MercuryResolve();
@@ -113,7 +114,7 @@
for( Object key : rep.keySet() )
{
Server server = new Server( (String)key, new URL(rep.getProperty( (String)key )) );
- RemoteRepositoryM2 repo = new RemoteRepositoryM2( server );
+ RemoteRepositoryM2 repo = new RemoteRepositoryM2( server, new MavenDependencyProcessor() );
repo.setUpdatePolicy( RepositoryUpdateIntervalPolicy.UPDATE_POLICY_NEVER );
repos.add( repo );
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Wed Dec 3 15:19:50 2008
@@ -61,8 +61,7 @@
throws Exception
{
processor = new MetadataProcessorMock();
- localRepo = new LocalRepositoryM2( "local", repoDir );
-// localRepo.setDependencyProcessor( new MetadataProcessorMock() );
+ localRepo = new LocalRepositoryM2( "local", repoDir, new MetadataProcessorMock() );
reps = new ArrayList<Repository>(4);
reps.add( localRepo );
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Wed Dec 3 15:19:50 2008
@@ -36,6 +36,7 @@
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.crypto.api.StreamObserverFactory;
import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
@@ -57,6 +58,8 @@
import org.apache.maven.mercury.transport.api.Credentials;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.util.Util;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -75,13 +78,44 @@
{
private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DefaultPlexusMercury.class );
private static final Language _lang = new DefaultLanguage( DefaultPlexusMercury.class );
+
+ /**
+ *
+ * @component
+ */
+ PlexusContainer plexus;
//---------------------------------------------------------------
public void initialize()
throws InitializationException
{
}
-
+ //---------------------------------------------------------------
+ public DependencyProcessor findDependencyProcessor( String hint )
+ throws RepositoryException
+ {
+ if( plexus == null )
+ throw new RepositoryException( _lang.getMessage( "no.plexus.injected" ) );
+
+ DependencyProcessor dp = null;
+
+ try
+ {
+ dp = plexus.lookup( DependencyProcessor.class, hint );
+
+ return dp;
+ }
+ catch( ComponentLookupException e )
+ {
+ throw new RepositoryException( e.getMessage() );
+ }
+ }
+ //---------------------------------------------------------------
+ public DependencyProcessor findDependencyProcessor()
+ throws RepositoryException
+ {
+ return findDependencyProcessor( "default" );
+ }
//---------------------------------------------------------------
public RemoteRepositoryM2 constructRemoteRepositoryM2(
String id
@@ -117,12 +151,11 @@
server.setProxyCredentials( cred );
}
}
-
- RemoteRepositoryM2 repo = new RemoteRepositoryM2( id, server );
+
+ RemoteRepositoryM2 repo = new RemoteRepositoryM2( id, server, findDependencyProcessor() );
return repo;
}
-
//---------------------------------------------------------------
public LocalRepositoryM2 constructLocalRepositoryM2(
String id,
@@ -149,7 +182,7 @@
server.setWriterStreamObserverFactories( writerStreamObservers );
server.setWriterStreamVerifierFactories( writerStreamVerifiers );
- LocalRepositoryM2 repo = new LocalRepositoryM2( server );
+ LocalRepositoryM2 repo = new LocalRepositoryM2( server, findDependencyProcessor() );
return repo;
}
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/Messages.properties
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/Messages.properties?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/Messages.properties (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/Messages.properties Wed Dec 3 15:19:50 2008
@@ -18,3 +18,4 @@
#
null.repo=cannot do anything with null repository
no.artifacts=no Artifacts supplied - null or empty collection
+no.plexus.injected=Plexus framework did not inject plexus container, cannot proceed
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java Wed Dec 3 15:19:50 2008
@@ -31,6 +31,7 @@
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.crypto.api.StreamObserverFactory;
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
@@ -50,6 +51,27 @@
public static String ROLE = PlexusMercury.class.getName();
/**
+ * lookup dependency processor in plexus and return the "default" implementation
+ *
+ * @return the dependency processor
+ * @throws RepositoryException
+ */
+ public DependencyProcessor findDependencyProcessor()
+ throws RepositoryException
+ ;
+
+ /**
+ * lookup dependency processor in plexus and return the requested implementation
+ *
+ * @param hint the plexus hint to lookup by
+ * @return the dependency processor
+ * @throws RepositoryException
+ */
+ public DependencyProcessor findDependencyProcessor( String hint )
+ throws RepositoryException
+ ;
+
+ /**
* create PGP factory to configure into repository reader for signature verification
*
* @param lenient
Modified: maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Wed Dec 3 15:19:50 2008
@@ -126,7 +126,7 @@
localRepoDir.delete();
localRepoDir.mkdir();
- localRepo = new LocalRepositoryM2( "testLocalRepo", localRepoDir );
+ localRepo = new LocalRepositoryM2( "testLocalRepo", localRepoDir, pm.findDependencyProcessor() );
repos = new ArrayList<Repository>();
repos.add( localRepo );
@@ -197,7 +197,7 @@
Server central = new Server( "central", new URL("http://repo1.maven.org/maven2") );
// Server central = new Server( "central", new URL("http://repository.sonatype.org/content/groups/public") );
- repos.add( new RemoteRepositoryM2(central) );
+ repos.add( new RemoteRepositoryM2(central, pm.findDependencyProcessor()) );
String artifactId = "asm:asm-xml:3.0";
@@ -220,7 +220,7 @@
Server central = new Server( "central", new URL("http://repo1.maven.org/maven2") );
// Server central = new Server( "central", new URL("http://repository.sonatype.org/content/groups/public") );
- repos.add( new RemoteRepositoryM2(central) );
+ repos.add( new RemoteRepositoryM2(central, pm.findDependencyProcessor()) );
String artifactId = "asm:asm-xml:3.0";
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java Wed Dec 3 15:19:50 2008
@@ -92,6 +92,7 @@
throws RepositoryException;
/**
+ * get protocol specific reader, if any
*
* @param protocol
* @return reader instance for the specified protocol
@@ -100,7 +101,6 @@
RepositoryReader getReader( String protocol )
throws RepositoryException;
-
/**
* get default writer, if any
*
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml Wed Dec 3 15:19:50 2008
@@ -12,11 +12,6 @@
</parent>
<dependencies>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-mercury</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java Wed Dec 3 15:19:50 2008
@@ -20,7 +20,7 @@
import java.io.File;
-import org.apache.maven.mercury.MavenDependencyProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.LocalRepository;
import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
@@ -48,29 +48,29 @@
this.directory = directory;
}
//----------------------------------------------------------------------------------
- public LocalRepositoryM2( Server server )
+ public LocalRepositoryM2( Server server, DependencyProcessor dependencyProcessor )
{
super( server.getId(), DEFAULT_REPOSITORY_TYPE );
setDirectory( new File( server.getURL().getFile() ) );
this.server = server;
- setDependencyProcessor( new MavenDependencyProcessor() );
+ setDependencyProcessor( dependencyProcessor );
}
//----------------------------------------------------------------------------------
- public LocalRepositoryM2( String id, File directory )
+ public LocalRepositoryM2( String id, File directory, DependencyProcessor dependencyProcessor )
{
super( id, DEFAULT_REPOSITORY_TYPE );
setDirectory( directory );
- setDependencyProcessor( new MavenDependencyProcessor() );
+ setDependencyProcessor( dependencyProcessor );
}
//----------------------------------------------------------------------------------
- public LocalRepositoryM2( String id, File directory, String type )
+ public LocalRepositoryM2( String id, File directory, String type, DependencyProcessor dependencyProcessor )
{
super( id, type );
setDirectory( directory );
- setDependencyProcessor( new MavenDependencyProcessor() );
+ setDependencyProcessor( dependencyProcessor );
}
//----------------------------------------------------------------------------------
public File getDirectory()
@@ -83,13 +83,11 @@
return new LocalRepositoryReaderM2( this, getDependencyProcessor() );
}
//----------------------------------------------------------------------------------
- // TODO oleg: what happens in multi-threaded execution??
public RepositoryReader getReader( String protocol )
{
return getReader();
}
//----------------------------------------------------------------------------------
- // TODO oleg: what happens in multi-threaded execution??
public RepositoryWriter getWriter()
{
return new LocalRepositoryWriterM2(this);
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2Test.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2Test.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2Test.java Wed Dec 3 15:19:50 2008
@@ -49,10 +49,16 @@
{
dir = new File("./target/test-classes/repo");
- repo = new LocalRepositoryM2( "test", dir );
+ repo = new LocalRepositoryM2( "test", dir, new MetadataProcessorMock() );
}
+
+ /**
+ * this does not fully test this use case, full test belongs to ITs. See http://jira.codehaus.org/browse/MERCURY-47
+ *
+ * @throws Exception
+ */
public void testReadTwice()
throws Exception
{
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml Wed Dec 3 15:19:50 2008
@@ -33,11 +33,6 @@
<artifactId>mercury-repo-local-m2</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-mercury</artifactId>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java Wed Dec 3 15:19:50 2008
@@ -18,7 +18,7 @@
*/
package org.apache.maven.mercury.repository.remote.m2;
-import org.apache.maven.mercury.MavenDependencyProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
import org.apache.maven.mercury.repository.api.RemoteRepository;
@@ -42,16 +42,16 @@
private RepositoryUpdatePolicy _updatePolicy = new RepositoryUpdateIntervalPolicy( RepositoryUpdateIntervalPolicy.DEFAULT_UPDATE_POLICY );
//----------------------------------------------------------------------------------
- public RemoteRepositoryM2( Server server )
+ public RemoteRepositoryM2( Server server, DependencyProcessor dependencyProcessor )
{
- this( server.getId(), server );
+ this( server.getId(), server, dependencyProcessor );
}
//----------------------------------------------------------------------------------
- public RemoteRepositoryM2( String id, Server server )
+ public RemoteRepositoryM2( String id, Server server, DependencyProcessor dependencyProcessor )
{
super( id, DEFAULT_REPOSITORY_TYPE );
this._server = server;
- setDependencyProcessor( new MavenDependencyProcessor() );
+ setDependencyProcessor( dependencyProcessor );
}
//----------------------------------------------------------------------------------
public Server getServer()
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Wed Dec 3 15:19:50 2008
@@ -141,7 +141,7 @@
if( localRepos == null || localRepos.isEmpty() )
{
_localRepos = new ArrayList<LocalRepository>(1);
- _localRepos.add( new LocalRepositoryM2("temp", _defaultRoot ) );
+ _localRepos.add( new LocalRepositoryM2("temp", _defaultRoot, getDependencyProcessor() ) );
}
else
_localRepos = localRepos;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml?rev=723125&r1=723124&r2=723125&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml Wed Dec 3 15:19:50 2008
@@ -1,16 +1,50 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.mercury</groupId>
+
<artifactId>mercury-repo-virtual</artifactId>
+
<name>Mercury Virtual Repository</name>
<description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
+
+
+<!-- had to move all tests to IT: http://jira.codehaus.org/browse/MERCURY-47
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+-->
+
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-cache-fs</artifactId>
@@ -25,6 +59,13 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-m2</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
<scope>test</scope>
</dependency>