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/02 07:10:36 UTC
svn commit: r722384 - in /maven/mercury/trunk: ./
mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/
mercury-it/
mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/
mercury-it/src/test/java/org/apache/maven/mercury/re...
Author: ogusakov
Date: Mon Dec 1 22:10:35 2008
New Revision: 722384
URL: http://svn.apache.org/viewvc?rev=722384&view=rev
Log:
moved all dependencies to the depMan of the parent - MERCURY-45. Upgraded to the M3 version of plexus container for tests and plexus component.
Added:
maven/mercury/trunk/CodingRulesReadme.txt
Modified:
maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml
maven/mercury/trunk/mercury-event/pom.xml
maven/mercury/trunk/mercury-external/pom.xml
maven/mercury/trunk/mercury-it/pom.xml
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/AbstractRepositoryWriterM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java
maven/mercury/trunk/mercury-md/pom.xml
maven/mercury/trunk/mercury-plexus/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml
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/RemoteRepositoryWriterM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml
maven/mercury/trunk/mercury-repo/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
maven/mercury/trunk/mercury-transport/pom.xml
maven/mercury/trunk/mercury-util/pom.xml
maven/mercury/trunk/mercury-wagon/pom.xml
maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java
maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java
maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java
maven/mercury/trunk/pom.xml
Added: maven/mercury/trunk/CodingRulesReadme.txt
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/CodingRulesReadme.txt?rev=722384&view=auto
==============================================================================
--- maven/mercury/trunk/CodingRulesReadme.txt (added)
+++ maven/mercury/trunk/CodingRulesReadme.txt Mon Dec 1 22:10:35 2008
@@ -0,0 +1,2 @@
+* all dependencies are declared in the depManagement section of the parent POM
+*
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Mon Dec 1 22:10:35 2008
@@ -10,21 +10,22 @@
</parent>
<dependencies>
+
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
- <version>140</version>
</dependency>
+
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcpg-jdk15</artifactId>
- <version>140</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-event/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/pom.xml (original)
+++ maven/mercury/trunk/mercury-event/pom.xml Mon Dec 1 22:10:35 2008
@@ -13,7 +13,6 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-external/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-external/pom.xml (original)
+++ maven/mercury/trunk/mercury-external/pom.xml Mon Dec 1 22:10:35 2008
@@ -11,10 +11,11 @@
</parent>
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>${project.version}</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Mon Dec 1 22:10:35 2008
@@ -1,22 +1,17 @@
<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>
+
<artifactId>mercury-it</artifactId>
<name>Mercury Integration Tests</name>
<description>Mercury Integration Tests</description>
<properties>
- <mercury.version>1.0.0-alpha-2-SNAPSHOT</mercury.version>
- <maven.version>3.0-SNAPSHOT</maven.version>
- <plexus.appbooter.version>1.4</plexus.appbooter.version>
- <plexus.container.version>1.0-alpha-47</plexus.container.version>
- <nexus.version>1.0.1</nexus.version>
- <nexus.client.version>1.1-M1</nexus.client.version>
- <jetty.version>6.1.12.rc2</jetty.version>
<nexus-security-enabled>false</nexus-security-enabled>
@@ -131,118 +126,105 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-event</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-virtual</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-sat</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
-
+
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <scope>test</scope>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.appbooter</groupId>
<artifactId>plexus-forked-app-booter</artifactId>
- <version>${plexus.appbooter.version}</version>
</dependency>
<dependency>
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus-rest-api</artifactId>
- <version>${nexus.client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus-rest-client-java</artifactId>
- <version>${nexus.client.version}</version>
</dependency>
<dependency>
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus-webapp</artifactId>
- <version>${nexus.version}</version>
<classifier>bundle</classifier>
<type>zip</type>
<scope>provided</scope>
@@ -251,26 +233,21 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-servlet-tester</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
- <version>${maven.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
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=722384&r1=722383&r2=722384&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 Mon Dec 1 22:10:35 2008
@@ -34,6 +34,8 @@
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.event.DumbListener;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.metadata.DependencyBuilder;
import org.apache.maven.mercury.metadata.DependencyBuilderFactory;
import org.apache.maven.mercury.metadata.MetadataTreeException;
@@ -56,7 +58,7 @@
public class DependencyTreeBuilderTest
extends TestCase
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( DependencyTreeBuilderTest.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DependencyTreeBuilderTest.class );
String repoUrl = "http://repo1.maven.org/maven2";
// String repoUrl = "http://repository.sonatype.org/content/groups/public";
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java Mon Dec 1 22:10:35 2008
@@ -32,6 +32,8 @@
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
import org.apache.maven.mercury.crypto.sha.SHA1VerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.api.RepositoryReader;
import org.apache.maven.mercury.repository.api.RepositoryWriter;
@@ -52,7 +54,7 @@
public abstract class AbstractRepositoryWriterM2Test
extends PlexusTestCase
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( AbstractRepositoryWriterM2Test.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( AbstractRepositoryWriterM2Test.class );
Repository repo;
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=722384&r1=722383&r2=722384&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 Mon Dec 1 22:10:35 2008
@@ -29,6 +29,8 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.ArtifactResults;
import org.apache.maven.mercury.repository.api.LocalRepository;
import org.apache.maven.mercury.repository.api.RemoteRepository;
@@ -38,6 +40,7 @@
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.repository.remote.m2.RemoteRepositoryWriterM2;
import org.apache.maven.mercury.spi.http.server.HttpTestServer;
import org.apache.maven.mercury.transport.api.Server;
@@ -51,7 +54,7 @@
public class ReadWriteTest
extends TestCase
{
- private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger( ReadWriteTest.class );
+ private static final IMercuryLogger log = MercuryLoggerManager.getLogger( ReadWriteTest.class );
File remoteRepoBase = new File("./target/test-classes/repo");
public String port;
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml Mon Dec 1 22:10:35 2008
@@ -9,13 +9,6 @@
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
- <properties>
-
- <sat4j.version>2.0.4</sat4j.version>
- <commons.digester.version>1.8</commons.digester.version>
-
- </properties>
-
<build>
<plugins>
<plugin>
@@ -39,48 +32,48 @@
<dependency>
<groupId>org.sat4j</groupId>
<artifactId>org.sat4j.core</artifactId>
- <version>${sat4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.sat4j</groupId>
<artifactId>org.sat4j.pb</artifactId>
- <version>${sat4j.version}</version>
</dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>${commons.digester.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-virtual</artifactId>
- <version>${project.version}</version>
</dependency>
+
<!-- test deps -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml Mon Dec 1 22:10:35 2008
@@ -59,24 +59,25 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>${project.version}</version>
</dependency>
- <!-- for some reason transitive does not work - have to copy deps from mercury-util -->
+ <!--
+ | for some reason transitive does not work - have to copy deps from mercury-util
+ | but it works fine under m2eclipse
+ -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>mercury-crypto-basic</artifactId>
</dependency>
+
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-shared/src/test/java/org/apache/maven/mercury/repository/metadata/MetadataBuilderTest.java Mon Dec 1 22:10:35 2008
@@ -41,7 +41,7 @@
*
*/
public class MetadataBuilderTest
- extends TestCase
+extends TestCase
{
MetadataBuilder mb;
File testBase = new File("./target/test-classes/controlledRepo");
Modified: maven/mercury/trunk/mercury-md/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/pom.xml Mon Dec 1 22:10:35 2008
@@ -20,13 +20,11 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-event</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-plexus/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/pom.xml (original)
+++ maven/mercury/trunk/mercury-plexus/pom.xml Mon Dec 1 22:10:35 2008
@@ -40,38 +40,32 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-virtual</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-sat</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
- <version>3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml Mon Dec 1 22:10:35 2008
@@ -12,30 +12,31 @@
</parent>
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-external</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-event</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>${project.version}</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml Mon Dec 1 22:10:35 2008
@@ -36,10 +36,12 @@
</build>
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
</dependencies>
+
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml Mon Dec 1 22:10:35 2008
@@ -3,7 +3,7 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-flat</artifactId>
<name>Mercury Local Flat Repository</name>
- <description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
@@ -11,32 +11,34 @@
</parent>
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.8</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
+
</project>
\ No newline at end of file
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=722384&r1=722383&r2=722384&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 Mon Dec 1 22:10:35 2008
@@ -1,51 +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-local-m2</artifactId>
<name>Mercury Local M2 Repository</name>
<description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
- <properties>
- <maven.version>3.0-SNAPSHOT</maven.version>
- </properties>
-
<dependencies>
+
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-mercury</artifactId>
</dependency>
+
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <scope>test</scope>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-mercury</artifactId>
- <version>${maven.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
+
</project>
\ No newline at end of file
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=722384&r1=722383&r2=722384&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 Mon Dec 1 22:10:35 2008
@@ -1,44 +1,43 @@
<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-remote-m2</artifactId>
<name>Mercury Remote M2 Repository</name>
<description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
- <properties>
- <maven.version>3.0-SNAPSHOT</maven.version>
- </properties>
-
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
- <version>${maven.version}</version>
</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/RemoteRepositoryWriterM2.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/RemoteRepositoryWriterM2.java?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java Mon Dec 1 22:10:35 2008
@@ -75,7 +75,7 @@
Server _server;
RepositoryReader _reader;
- // TODO og: 2008-08-22 should be replaced with real transport
+ // TODO og: 2008-08-22 should be replaced with real transport implementation
DefaultDeployer _transport;
//---------------------------------------------------------------------------------------------------------------
public RemoteRepositoryWriterM2( RemoteRepository repo )
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=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml Mon Dec 1 22:10:35 2008
@@ -14,20 +14,18 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-cache-fs</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Test deps -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: maven/mercury/trunk/mercury-repo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/pom.xml Mon Dec 1 22:10:35 2008
@@ -24,7 +24,6 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml Mon Dec 1 22:10:35 2008
@@ -10,11 +10,12 @@
</parent>
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml Mon Dec 1 22:10:35 2008
@@ -31,22 +31,23 @@
<dependencies>
+
<!-- Mercury Dependencies -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
</dependency>
+
</dependencies>
</project>
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml Mon Dec 1 22:10:35 2008
@@ -9,10 +9,6 @@
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
- <properties>
- <jetty.version>6.1.12</jetty.version>
- </properties>
-
<build>
<plugins>
@@ -33,34 +29,35 @@
</build>
<dependencies>
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty.version}</version>
</dependency>
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
- <version>${jetty.version}</version>
</dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-servlet-tester</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
+
<!-- Mercury Dependencies -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>${project.version}</version>
</dependency>
+
</dependencies>
</project>
Modified: maven/mercury/trunk/mercury-transport/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/pom.xml Mon Dec 1 22:10:35 2008
@@ -21,7 +21,6 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-util/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/pom.xml (original)
+++ maven/mercury/trunk/mercury-util/pom.xml Mon Dec 1 22:10:35 2008
@@ -67,27 +67,24 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>mercury-logging</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
+ <artifactId>mercury-crypto-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-wagon/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/pom.xml (original)
+++ maven/mercury/trunk/mercury-wagon/pom.xml Mon Dec 1 22:10:35 2008
@@ -1,21 +1,18 @@
<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">
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>mercury-wagon</artifactId>
<name>Mercury Wagon provider</name>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<properties>
<mercury.version>${project.version}</mercury.version>
- <plexus.appbooter.version>1.4</plexus.appbooter.version>
- <plexus.container.version>1.0-alpha-47</plexus.container.version>
- <plexus.utils.version>1.5.1</plexus.utils.version>
-
<distMgmtSnapshotsId>apache.snapshots</distMgmtSnapshotsId>
<distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
@@ -111,43 +108,32 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>1.0-beta-4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-test</artifactId>
- <version>1.0-beta-4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
- <version>${mercury.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>${mercury.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>${plexus.container.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>${plexus.utils.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java (original)
+++ maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/MercuryWagon.java Mon Dec 1 22:10:35 2008
@@ -35,6 +35,8 @@
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
import org.apache.maven.mercury.spi.http.client.deploy.DefaultDeployRequest;
import org.apache.maven.mercury.spi.http.client.deploy.DefaultDeployer;
@@ -57,8 +59,6 @@
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* plexus.component
@@ -74,6 +74,9 @@
extends AbstractWagon
implements Wagon
{
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( MercuryWagon.class );
+ private static final Language _lang = new DefaultLanguage( MercuryWagon.class );
+
public static final String SYSTEM_PARAMETER_DEBUG_TRANSFER = "maven.mercury.wagon.debug.transfer";
private boolean debugTransfer = Boolean.parseBoolean( System.getProperty( SYSTEM_PARAMETER_DEBUG_TRANSFER, "false" ) );
@@ -92,9 +95,6 @@
, {"mttp:", "http:"}
, {"mttps:", "https:"}
};
-
- private static final Logger _log = LoggerFactory.getLogger(MercuryWagon.class);
- private static final Language _lang = new DefaultLanguage( MercuryWagon.class );
private Server server;
private DefaultRetriever retriever;
Modified: maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java (original)
+++ maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/StupidWagonObserverAdapter.java Mon Dec 1 22:10:35 2008
@@ -20,9 +20,9 @@
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.crypto.api.StreamObserverException;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.wagon.events.TransferEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
@@ -34,7 +34,8 @@
public class StupidWagonObserverAdapter
implements StreamObserver
{
- private static final Logger _log = LoggerFactory.getLogger(StupidWagonObserverAdapter.class);
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( StupidWagonObserverAdapter.class );
+
byte [] buf = new byte[2048];
MercuryWagon wagon;
Modified: maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java (original)
+++ maven/mercury/trunk/mercury-wagon/src/main/java/org/apache/maven/wagon/mercury/TransferEventDebugger.java Mon Dec 1 22:10:35 2008
@@ -18,10 +18,10 @@
*/
package org.apache.maven.wagon.mercury;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.events.TransferListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
@@ -36,7 +36,7 @@
public static final String SYSTEM_PARAMETER_DEBUG_TRANSFER_BYTES = "maven.mercury.wagon.debug.transfer.bytes";
private boolean debugTransferBytes = Boolean.parseBoolean( System.getProperty( SYSTEM_PARAMETER_DEBUG_TRANSFER_BYTES, "false" ) );
- private static final Logger _log = LoggerFactory.getLogger(TransferEventDebugger.class);
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( TransferEventDebugger.class );
public void debug( String message )
{
Modified: maven/mercury/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=722384&r1=722383&r2=722384&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Mon Dec 1 22:10:35 2008
@@ -13,7 +13,7 @@
<packaging>pom</packaging>
<name>Mercury</name>
<version>1.0.0-alpha-2-SNAPSHOT</version>
- <description>Maven Mercury is a replacement for the Maven Artifact subsystem, and a complete replacement for the HTTP and DAV portions of the existing transport.</description>
+ <description>Maven Mercury is a replacement for the Maven Artifact subsystem, and a complete replacement for the HTTP/HTTPS/DAV/DAVS portions of the existing transport.</description>
<developers>
<developer>
@@ -33,16 +33,6 @@
</developer>
</developers>
- <properties>
- <distMgmtSnapshotsId>apache.snapshots</distMgmtSnapshotsId>
- <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
- <distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
-
- <distMgmtReleasesId>apache.staging</distMgmtReleasesId>
- <distMgmtReleasesName>Apache Development Staging Repository</distMgmtReleasesName>
- <distMgmtReleasesUrl>scp://people.apache.org/~/repos/staging</distMgmtReleasesUrl>
- </properties>
-
<modules>
<module>mercury-artifact</module>
<module>mercury-md</module>
@@ -57,36 +47,304 @@
<module>mercury-wagon</module>
</modules>
- <dependencies>
+ <properties>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-43</version>
- </dependency>
+ <mercury.version>${project.version}</mercury.version>
+
+ <maven.version>3.0-SNAPSHOT</maven.version>
+
+ <plexus.appbooter.version>1.4</plexus.appbooter.version>
+ <plexus.container.version>1.0-beta-3.0.1</plexus.container.version>
+ <classworlds.version>1.3</classworlds.version>
+ <plexus.utils.version>1.5.5</plexus.utils.version>
+ <plexus.lang.version>1.1</plexus.lang.version>
+
+ <nexus.version>1.0.1</nexus.version>
+ <nexus.client.version>1.1-M1</nexus.client.version>
+
+ <commons.digester.version>1.8</commons.digester.version>
+ <commons.cli.version>1.1</commons.cli.version>
+
+ <jetty.version>6.1.12</jetty.version>
+ <junit.version>3.8.1</junit.version>
+ <bouncy.castle.version>140</bouncy.castle.version>
+ <sat4j.version>2.0.4</sat4j.version>
+
+ <!-- mercury-wagon -->
+ <wagon.provider.api.version>1.0-beta-4</wagon.provider.api.version>
+
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons.digester.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons.cli.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>${bouncy.castle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcpg-jdk15</artifactId>
+ <version>${bouncy.castle.version}</version>
+ </dependency>
+
+ <!-- SAT solver used to calculate viable ranges when dependencies are expressed pseudo boolean form -->
+ <dependency>
+ <groupId>org.sat4j</groupId>
+ <artifactId>org.sat4j.core</artifactId>
+ <version>${sat4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sat4j</groupId>
+ <artifactId>org.sat4j.pb</artifactId>
+ <version>${sat4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.appbooter</groupId>
+ <artifactId>plexus-forked-app-booter</artifactId>
+ <version>${plexus.appbooter.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-rest-api</artifactId>
+ <version>${nexus.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-rest-client-java</artifactId>
+ <version>${nexus.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-webapp</artifactId>
+ <version>${nexus.version}</version>
+ <classifier>bundle</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-servlet-tester</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>${plexus.container.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>${plexus.utils.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-lang</artifactId>
+ <version>${plexus.lang.version}</version>
+ </dependency>
+
+ <!-- Mercury deps -->
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-artifact</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-external</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-event</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-util</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-md-shared</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-crypto-api</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-crypto-basic</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-api</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-m2</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-m2</artifactId>
+ <classifier>tests</classifier>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-remote-m2</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-virtual</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-cache-fs</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-md-sat</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-api</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ <classifier>tests</classifier>
+ <version>${mercury.version}</version>
+ </dependency>
+
+ <!-- Maven dependencies -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-mercury</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>${wagon.provider.api.version}</version>
</dependency>
- <!-- Test Dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-test</artifactId>
+ <version>${wagon.provider.api.version}</version>
<scope>test</scope>
</dependency>
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ </dependencyManagement>
+
+
+ <dependencies>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-lang</artifactId>
- <version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
</dependencies>
+
+
<build>
<defaultGoal>install</defaultGoal>
<resources>
@@ -145,7 +403,34 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
-
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <id>enforce</id>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>*:plexus-component-api</exclude>
+ </excludes>
+ <message> plexus-component-api conflicts with newer plexus-container-default. You probably added a dependency
+ that is plexus component made
+ with older plexus container. </message>
+ </bannedDependencies>
+ <!-- <requirePluginVersions>
+ <banSnapshots>false</banSnapshots>
+ </requirePluginVersions>-->
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -293,11 +578,14 @@
<url>${distMgmtSnapshotsUrl}</url>
</snapshotRepository>
</distributionManagement>
+
<url>http://maven.apache.org/mercury/</url>
+
<issueManagement>
<system>jira</system>
<url>http://jira.codehaus.org/browse/MERCURY</url>
</issueManagement>
+
<ciManagement>
<system>hudson</system>
<url>https://ci.sonatype.org/view/Maven%20Artifact/job/mercury/</url>