Author: jvanzyl
Date: Wed Apr 15 17:24:22 2009
New Revision: 765273
URL: http://svn.apache.org/viewvc?rev=765273&view=rev
Log:
o localizing mercury into the mercury repository implementation
Added:
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
(contents, props changed)
- copied, changed from r765246,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
Removed:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java
Modified:
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/maven-repository/pom.xml
Modified: maven/components/trunk/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=765273&r1=765272&r2=765273&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Wed Apr 15 17:24:22 2009
@@ -75,67 +75,7 @@
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-jetty6</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.spice</groupId>
- <artifactId>plexus-webdav</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-event</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: maven/components/trunk/maven-repository/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/pom.xml?rev=765273&r1=765272&r2=765273&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/pom.xml (original)
+++ maven/components/trunk/maven-repository/pom.xml Wed Apr 15 17:24:22 2009
@@ -54,53 +54,7 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-jetty6</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.spice</groupId>
- <artifactId>plexus-webdav</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-event</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
Copied:
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
(from r765246,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java?p2=maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java&p1=maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java&r1=765246&r2=765273&rev=765273&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
(original)
+++
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
Wed Apr 15 17:24:22 2009
@@ -1,50 +1,36 @@
/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
package org.apache.maven.repository;
-import java.io.IOException;
-
+import org.codehaus.plexus.PlexusTestCase;
/**
- *
- *
+ *
+ *
* @author Oleg Gusakov
* @version $Id$
- *
+ *
*/
public class LegacyMavenRepositorySystemTest
-extends AbstractMavenRepositorySystemTest
+ extends PlexusTestCase
{
- protected void setUp()
+ public void testLookup()
throws Exception
{
- super.setUp();
-
- _mrs = getContainer().lookup( RepositorySystem.class, "default" );
- }
-
- // TODO: 2009-03-Oleg : turned it off till we figure out which methods
work, which don't
- @Override
- public void testRetrieve()
- throws IOException
- {
-// super.testRetrieve();
+ // Yes I'm relying on the integration tests, but I'm really hoping
this just goes away shortly.
+ //lookup( RepositorySystem.class, "default" );
}
}
Propchange:
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 15 17:24:22 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:738757-738972
+/maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:688587-696625,696644-699681
