continuum-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brett Porter <br...@apache.org>
Subject Re: svn commit: r679646 - in /continuum/trunk: ./ continuum-api/ continuum-core/ continuum-data-management/continuum-legacy/ continuum-data-management/data-management-jdo/ continuum-data-management/redback-legacy/ continuum-model/ continuum-notifiers
Date Sat, 26 Jul 2008 02:24:24 GMT
Cool - I found the same bug in Maven 2.1, btw.

- Brett

On 26/07/2008, at 8:55 AM, Olivier Lamy wrote:

> Oups sorry too fast send click :-)
>
> And mvn compile -X displays :
>
> /local/olamy/.m2/repository/org/codehaus/plexus/plexus-component-api/ 
> 1.0-alpha-20/plexus-component-api-1.0-alpha-20.j
> ar
>
> I will add an explicit dependency on this to be sure I can work with
> eclipse (and add an issue in MECLIPSE ;-) ).
>
> --
> Olivier
>
> 2008/7/26 Olivier Lamy <olamy@apache.org>:
>> Hi
>> org.codehaus.plexus.PlexusConstants is used in the following  
>> modules :
>> - continuum-core : DefaultContinuum and DefaultMavenBuilderHelper
>> - continuum-notifier-wagon : WagonContinuumNotifier
>>
>> The weird issue is : all build fine with mvn but the .classpath
>> generated by the maven-eclipse-plugin contains only an entry to
>> plexus-component-api-1.0-alpha-16 (this means it failed with eclipse)
>> .
>>
>> And dependency:tree in continuum-core only one version in the tree to
>> component-api-1.0-alpha-20.
>>
>>
>>
>> 2008/7/25  <brett@apache.org>:
>>> Author: brett
>>> Date: Thu Jul 24 19:27:30 2008
>>> New Revision: 679646
>>>
>>> URL: http://svn.apache.org/viewvc?rev=679646&view=rev
>>> Log:
>>> weed out the plexus container - last remaining use is in xmlrpc- 
>>> server
>>>
>>> Modified:
>>>   continuum/trunk/continuum-api/pom.xml
>>>   continuum/trunk/continuum-core/pom.xml
>>>   continuum/trunk/continuum-data-management/continuum-legacy/pom.xml
>>>   continuum/trunk/continuum-data-management/data-management-jdo/ 
>>> pom.xml
>>>   continuum/trunk/continuum-data-management/redback-legacy/pom.xml
>>>   continuum/trunk/continuum-model/pom.xml
>>>   continuum/trunk/continuum-notifiers/continuum-notifier-jabber/ 
>>> pom.xml
>>>   continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml
>>>   continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/ 
>>> test/java/org/apache/maven/continuum/wagon/ 
>>> WagonContinuumNotifierTest.java
>>>   continuum/trunk/continuum-release/pom.xml
>>>   continuum/trunk/continuum-reports/src/test/java/org/apache/maven/ 
>>> continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java
>>>   continuum/trunk/continuum-store/pom.xml
>>>   continuum/trunk/continuum-store/src/test/java/org/apache/maven/ 
>>> continuum/store/AbstractContinuumStoreTestCase.java
>>>   continuum/trunk/continuum-store/src/test/resources/org/apache/ 
>>> maven/continuum/store/ContinuumStoreTest.xml
>>>   continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
>>>   continuum/trunk/pom.xml
>>>
>>> Modified: continuum/trunk/continuum-api/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-api/pom.xml (original)
>>> +++ continuum/trunk/continuum-api/pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -37,6 +37,10 @@
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.codehaus.plexus</groupId>
>>> +      <artifactId>plexus-spring</artifactId>
>>> +    </dependency>
>>> +    <dependency>
>>> +      <groupId>org.codehaus.plexus</groupId>
>>>      <artifactId>plexus-utils</artifactId>
>>>    </dependency>
>>>    <dependency>
>>> @@ -56,4 +60,4 @@
>>>      <artifactId>maven-artifact</artifactId>
>>>    </dependency>
>>>  </dependencies>
>>> -</project>
>>> \ No newline at end of file
>>> +</project>
>>>
>>> Modified: continuum/trunk/continuum-core/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-core/pom.xml (original)
>>> +++ continuum/trunk/continuum-core/pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -79,6 +79,12 @@
>>>      <groupId>org.codehaus.plexus</groupId>
>>>      <artifactId>plexus-command-line</artifactId>
>>>      <version>1.0-alpha-2</version>
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.maven</groupId>
>>> @@ -112,6 +118,12 @@
>>>      <groupId>org.codehaus.plexus</groupId>
>>>      <artifactId>plexus-action</artifactId>
>>>      <version>1.0-alpha-6</version>
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.codehaus.plexus</groupId>
>>> @@ -126,15 +138,6 @@
>>>      <artifactId>continuum-store</artifactId>
>>>    </dependency>
>>>    <dependency>
>>> -      <groupId>org.apache.maven.scm</groupId>
>>> -      <artifactId>maven-scm-manager-plexus</artifactId>
>>> -    </dependency>
>>> -    <dependency>
>>> -      <groupId>velocity</groupId>
>>> -      <artifactId>velocity</artifactId>
>>> -      <version>1.4</version>
>>> -    </dependency>
>>> -    <dependency>
>>>      <groupId>org.apache.continuum</groupId>
>>>      <artifactId>continuum-release</artifactId>
>>>    </dependency>
>>> @@ -214,7 +217,7 @@
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.codehaus.plexus</groupId>
>>> -      <artifactId>plexus-log4j-logging</artifactId>
>>> +      <artifactId>plexus-slf4j-logging</artifactId>
>>>      <scope>test</scope>
>>>    </dependency>
>>>    <dependency>
>>>
>>> Modified: continuum/trunk/continuum-data-management/continuum- 
>>> legacy/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/continuum-legacy/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-data-management/continuum-legacy/ 
>>> pom.xml (original)
>>> +++ continuum/trunk/continuum-data-management/continuum-legacy/ 
>>> pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -136,9 +136,13 @@
>>>      </exclusions>
>>>    </dependency>
>>>    <dependency>
>>> +      <groupId>org.codehaus.plexus</groupId>
>>> +      <artifactId>plexus-utils</artifactId>
>>> +    </dependency>
>>> +    <dependency>
>>>      <groupId>stax</groupId>
>>>      <artifactId>stax-api</artifactId>
>>>      <version>1.0.1</version>
>>>    </dependency>
>>>  </dependencies>
>>> -</project>
>>> \ No newline at end of file
>>> +</project>
>>>
>>> Modified: continuum/trunk/continuum-data-management/data- 
>>> management-jdo/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-jdo/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-data-management/data-management-jdo/ 
>>> pom.xml (original)
>>> +++ continuum/trunk/continuum-data-management/data-management-jdo/ 
>>> pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -66,6 +66,18 @@
>>>      <!-- Temporary while we have the OID patch in there
>>>            <scope>test</scope>
>>>      -->
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>javax.transaction</groupId>
>>> +          <artifactId>jta</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>> +    </dependency>
>>> +    <dependency>
>>> +      <groupId>org.slf4j</groupId>
>>> +      <artifactId>slf4j-simple</artifactId>
>>> +      <version>1.5.0</version>
>>> +      <scope>runtime</scope>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>hsqldb</groupId>
>>>
>>> Modified: continuum/trunk/continuum-data-management/redback-legacy/ 
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-data-management/redback-legacy/ 
>>> pom.xml (original)
>>> +++ continuum/trunk/continuum-data-management/redback-legacy/ 
>>> pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -199,19 +199,41 @@
>>>      <version>1.0.1</version>
>>>    </dependency>
>>>    <dependency>
>>> +      <groupId>org.codehaus.plexus</groupId>
>>> +      <artifactId>plexus-utils</artifactId>
>>> +    </dependency>
>>> +    <dependency>
>>>      <groupId>org.codehaus.plexus.security</groupId>
>>>      <artifactId>plexus-security-keys-api</artifactId>
>>>      <version>1.0-alpha-5</version>
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.codehaus.plexus.security</groupId>
>>>      <artifactId>plexus-security-authorization-rbac-model</ 
>>> artifactId>
>>>      <version>1.0-alpha-5</version>
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.codehaus.plexus.security</groupId>
>>>      <artifactId>plexus-security-user-management-api</artifactId>
>>>      <version>1.0-alpha-5</version>
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>>    </dependency>
>>>  </dependencies>
>>> -</project>
>>> \ No newline at end of file
>>> +</project>
>>>
>>> Modified: continuum/trunk/continuum-model/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-model/pom.xml (original)
>>> +++ continuum/trunk/continuum-model/pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -99,5 +99,9 @@
>>>      <artifactId>stax-api</artifactId>
>>>      <version>1.0.1</version>
>>>    </dependency>
>>> +    <dependency>
>>> +      <groupId>org.codehaus.plexus</groupId>
>>> +      <artifactId>plexus-utils</artifactId>
>>> +    </dependency>
>>>  </dependencies>
>>> </project>
>>>
>>> Modified: continuum/trunk/continuum-notifiers/continuum-notifier- 
>>> jabber/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/ 
>>> pom.xml (original)
>>> +++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/ 
>>> pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -36,6 +36,12 @@
>>>      <groupId>org.codehaus.plexus</groupId>
>>>      <artifactId>plexus-jabber</artifactId>
>>>      <version>1.0-alpha-4</version>
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>>    </dependency>
>>>  </dependencies>
>>> -</project>
>>> \ No newline at end of file
>>> +</project>
>>>
>>> Modified: continuum/trunk/continuum-notifiers/continuum-notifier- 
>>> msn/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-notifiers/continuum-notifier-msn/ 
>>> pom.xml (original)
>>> +++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/ 
>>> pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -31,6 +31,12 @@
>>>      <groupId>org.codehaus.plexus</groupId>
>>>      <artifactId>plexus-msn</artifactId>
>>>      <version>1.0-alpha-2</version>
>>> +      <exclusions>
>>> +        <exclusion>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>> +        </exclusion>
>>> +      </exclusions>
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.continuum</groupId>
>>> @@ -38,4 +44,4 @@
>>>      <version>${pom.version}</version>
>>>    </dependency>
>>>  </dependencies>
>>> -</project>
>>> \ No newline at end of file
>>> +</project>
>>>
>>> Modified: continuum/trunk/continuum-notifiers/continuum-notifier- 
>>> wagon/src/test/java/org/apache/maven/continuum/wagon/ 
>>> WagonContinuumNotifierTest.java
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.java?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/ 
>>> src/test/java/org/apache/maven/continuum/wagon/ 
>>> WagonContinuumNotifierTest.java (original)
>>> +++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/ 
>>> src/test/java/org/apache/maven/continuum/wagon/ 
>>> WagonContinuumNotifierTest.java Thu Jul 24 19:27:30 2008
>>> @@ -26,13 +26,13 @@
>>> import org.apache.maven.continuum.notification.MessageContext;
>>> import org.apache.maven.continuum.notification.Notifier;
>>> import org.apache.maven.continuum.project.ContinuumProjectState;
>>> -import org.codehaus.plexus.PlexusTestCase;
>>> +import org.codehaus.plexus.spring.PlexusInSpringTestCase;
>>>
>>> /**
>>> * @author <a href="mailto:nramirez@exist">Napoleon Esmundo C.  
>>> Ramirez</a>
>>> */
>>> public class WagonContinuumNotifierTest
>>> -    extends PlexusTestCase
>>> +    extends PlexusInSpringTestCase
>>> {
>>>    private ServletServer server;
>>>
>>>
>>> Modified: continuum/trunk/continuum-release/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-release/pom.xml (original)
>>> +++ continuum/trunk/continuum-release/pom.xml Thu Jul 24 19:27:30  
>>> 2008
>>> @@ -72,8 +72,8 @@
>>>      <version>1.0-alpha-3</version>
>>>      <exclusions>
>>>        <exclusion>
>>> -          <groupId>classworlds</groupId>
>>> -          <artifactId>classworlds</artifactId>
>>> +          <groupId>org.codehaus.plexus</groupId>
>>> +          <artifactId>plexus-container-default</artifactId>
>>>        </exclusion>
>>>      </exclusions>
>>>    </dependency>
>>> @@ -88,11 +88,6 @@
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.apache.maven.scm</groupId>
>>> -      <artifactId>maven-scm-manager-plexus</artifactId>
>>> -      <version>${maven-scm.version}</version>
>>> -    </dependency>
>>> -    <dependency>
>>> -      <groupId>org.apache.maven.scm</groupId>
>>>      <artifactId>maven-scm-provider-bazaar</artifactId>
>>>      <version>${maven-scm.version}</version>
>>>    </dependency>
>>>
>>> Modified: continuum/trunk/continuum-reports/src/test/java/org/ 
>>> apache/maven/continuum/reports/surefire/ 
>>> DefaultReportTestSuiteGeneratorTest.java
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-reports/src/test/java/org/apache/maven/continuum/reports/surefire/DefaultReportTestSuiteGeneratorTest.java?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-reports/src/test/java/org/apache/ 
>>> maven/continuum/reports/surefire/ 
>>> DefaultReportTestSuiteGeneratorTest.java (original)
>>> +++ continuum/trunk/continuum-reports/src/test/java/org/apache/ 
>>> maven/continuum/reports/surefire/ 
>>> DefaultReportTestSuiteGeneratorTest.java Thu Jul 24 19:27:30 2008
>>> @@ -21,7 +21,7 @@
>>> import java.io.File;
>>> import java.util.List;
>>>
>>> -import org.codehaus.plexus.PlexusTestCase;
>>> +import org.codehaus.plexus.spring.PlexusInSpringTestCase;
>>>
>>> /**
>>> * @author <a href="mailto:olamy@apache.org">olamy</a>
>>> @@ -29,7 +29,7 @@
>>> * @version $Id$
>>> */
>>> public class DefaultReportTestSuiteGeneratorTest
>>> -    extends PlexusTestCase
>>> +    extends PlexusInSpringTestCase
>>> {
>>>
>>>    private File getReportsDirectory( String pathDir )
>>>
>>> Modified: continuum/trunk/continuum-store/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-store/pom.xml (original)
>>> +++ continuum/trunk/continuum-store/pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -58,6 +58,11 @@
>>>      <groupId>org.codehaus.plexus</groupId>
>>>      <artifactId>plexus-utils</artifactId>
>>>    </dependency>
>>> +    <dependency>
>>> +      <groupId>org.codehaus.plexus</groupId>
>>> +      <artifactId>plexus-slf4j-logging</artifactId>
>>> +      <scope>test</scope>
>>> +    </dependency>
>>>  </dependencies>
>>>  <build>
>>>    <plugins>
>>> @@ -85,4 +90,4 @@
>>>      </plugin>
>>>    </plugins>
>>>  </build>
>>> -</project>
>>> \ No newline at end of file
>>> +</project>
>>>
>>> Modified: continuum/trunk/continuum-store/src/test/java/org/apache/ 
>>> maven/continuum/store/AbstractContinuumStoreTestCase.java
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTestCase.java?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-store/src/test/java/org/apache/maven/ 
>>> continuum/store/AbstractContinuumStoreTestCase.java (original)
>>> +++ continuum/trunk/continuum-store/src/test/java/org/apache/maven/ 
>>> continuum/store/AbstractContinuumStoreTestCase.java Thu Jul 24  
>>> 19:27:30 2008
>>> @@ -34,9 +34,9 @@
>>> import org.apache.maven.continuum.model.system.Installation;
>>> import org.apache.maven.continuum.model.system.Profile;
>>> import org.apache.maven.continuum.model.system.SystemConfiguration;
>>> -import org.codehaus.plexus.PlexusTestCase;
>>> import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
>>> import org.codehaus.plexus.jdo.JdoFactory;
>>> +import org.codehaus.plexus.spring.PlexusInSpringTestCase;
>>>
>>> import java.util.ArrayList;
>>> import java.util.HashMap;
>>> @@ -48,7 +48,7 @@
>>> * Base class for tests using the continuum store.
>>> */
>>> public abstract class AbstractContinuumStoreTestCase
>>> -    extends PlexusTestCase
>>> +    extends PlexusInSpringTestCase
>>> {
>>>    protected ContinuumStore store;
>>>
>>>
>>> Modified: continuum/trunk/continuum-store/src/test/resources/org/ 
>>> apache/maven/continuum/store/ContinuumStoreTest.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/test/resources/org/apache/maven/continuum/store/ContinuumStoreTest.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-store/src/test/resources/org/apache/ 
>>> maven/continuum/store/ContinuumStoreTest.xml (original)
>>> +++ continuum/trunk/continuum-store/src/test/resources/org/apache/ 
>>> maven/continuum/store/ContinuumStoreTest.xml Thu Jul 24 19:27:30  
>>> 2008
>>> @@ -60,5 +60,12 @@
>>>        </otherProperties>
>>>      </configuration>
>>>    </component>
>>> +
>>> +    <component>
>>> +      <role>org.codehaus.plexus.logging.LoggerManager</role>
>>> +       
>>> < 
>>> implementation 
>>> >org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</ 
>>> implementation>
>>> +      <lifecycle-handler>basic</lifecycle-handler>
>>> +    </component>
>>> +
>>>  </components>
>>> </component-set>
>>>
>>> Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/ 
>>> pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/ 
>>> pom.xml (original)
>>> +++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/ 
>>> pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -50,6 +50,11 @@
>>>    </dependency>
>>>    <dependency>
>>>      <groupId>org.codehaus.plexus</groupId>
>>> +      <artifactId>plexus-container-default</artifactId>
>>> +      <version>1.0-alpha-20</version>
>>> +    </dependency>
>>> +    <dependency>
>>> +      <groupId>org.codehaus.plexus</groupId>
>>>      <artifactId>plexus-xwork-integration</artifactId>
>>>    </dependency>
>>>    <dependency>
>>>
>>> Modified: continuum/trunk/pom.xml
>>> URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=679646&r1=679645&r2=679646&view=diff
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> --- continuum/trunk/pom.xml (original)
>>> +++ continuum/trunk/pom.xml Thu Jul 24 19:27:30 2008
>>> @@ -120,6 +120,35 @@
>>>    </pluginManagement>
>>>    <plugins>
>>>      <plugin>
>>> +        <groupId>org.apache.maven.plugins</groupId>
>>> +        <artifactId>maven-enforcer-plugin</artifactId>
>>> +        <version>1.0-alpha-3</version>
>>> +        <executions>
>>> +          <execution>
>>> +            <goals>
>>> +              <goal>enforce</goal>
>>> +            </goals>
>>> +            <configuration>
>>> +              <rules>
>>> +                <bannedDependencies>
>>> +                  <excludes>
>>> +<!--
>>> +                    <exclude>org.codehaus.plexus:plexus-container- 
>>> default</exclude>
>>> +-->
>>> +                    <exclude>velocity:velocity-dep</exclude>
>>> +                    <exclude>classworlds:classworlds</exclude>
>>> +                    <exclude>javax.transaction:jta</exclude>
>>> +                    <exclude>javax.sql:jdbc-stdext</exclude>
>>> +                    <exclude>ant:ant-optional</exclude>
>>> +                    <exclude>xom:xom</exclude>
>>> +                  </excludes>
>>> +                </bannedDependencies>
>>> +              </rules>
>>> +            </configuration>
>>> +          </execution>
>>> +        </executions>
>>> +      </plugin>
>>> +      <plugin>
>>>        <groupId>org.codehaus.mojo</groupId>
>>>        <artifactId>buildnumber-maven-plugin</artifactId>
>>>        <version>1.0-beta-1</version>
>>> @@ -171,19 +200,9 @@
>>>    <module>continuum-docs</module>
>>>    <module>continuum-jetty</module>
>>>  </modules>
>>> +  <!-- TODO: confirm whether these are needed -->
>>>  <repositories>
>>>    <repository>
>>> -      <id>snapshots.codehaus.org</id>
>>> -      <name>Codehaus Snapshot Development Repository</name>
>>> -      <url>http://snapshots.repository.codehaus.org/</url>
>>> -      <releases>
>>> -        <enabled>false</enabled>
>>> -      </releases>
>>> -      <snapshots>
>>> -        <enabled>true</enabled>
>>> -      </snapshots>
>>> -    </repository>
>>> -    <repository>
>>>      <id>maven2-repository.dev.java.net</id>
>>>      <name>Java.net Repository for Maven</name>
>>>      <url>http://download.java.net/maven/2/</url>
>>> @@ -206,40 +225,7 @@
>>>        <enabled>false</enabled>
>>>      </snapshots>
>>>    </repository>
>>> -    <!-- comment when parent is released -->
>>> -    <repository>
>>> -      <id>people.apache.org</id>
>>> -      <name>Apache Snapshot Development Repository</name>
>>> -      <url>http://people.apache.org/repo/m2-snapshot-repository</ 
>>> url>
>>> -      <releases>
>>> -        <enabled>false</enabled>
>>> -      </releases>
>>> -      <snapshots>
>>> -        <enabled>true</enabled>
>>> -      </snapshots>
>>> -    </repository>
>>>  </repositories>
>>> -  <!--
>>> -  uncomment if snapshot plugins are needed
>>> -  <pluginRepositories>
>>> -    <pluginRepository>
>>> -      <id>codehaus.org</id>
>>> -      <name>Codehaus Snapshot Development Repository</name>
>>> -      <url>http://snapshots.repository.codehaus.org/</url>
>>> -      <releases>
>>> -        <enabled>false</enabled>
>>> -      </releases>
>>> -    </pluginRepository>
>>> -    <pluginRepository>
>>> -      <id>people.apache.org</id>
>>> -      <name>Apache Snapshot Development Repository</name>
>>> -      <url>http://people.apache.org/repo/m2-snapshot-repository</ 
>>> url>
>>> -      <releases>
>>> -        <enabled>false</enabled>
>>> -      </releases>
>>> -    </pluginRepository>
>>> -  </pluginRepositories>
>>> -  -->
>>>  <dependencies>
>>>    <dependency>
>>>      <groupId>junit</groupId>
>>> @@ -260,16 +246,6 @@
>>>      <version>2.4.0</version>
>>>      <scope>test</scope>
>>>    </dependency>
>>> -    <dependency>
>>> -      <groupId>org.codehaus.plexus</groupId>
>>> -      <artifactId>plexus-component-api</artifactId>
>>> -      <version>1.0-alpha-20</version>
>>> -    </dependency>
>>> -    <dependency>
>>> -      <groupId>org.codehaus.plexus</groupId>
>>> -      <artifactId>plexus-container-default</artifactId>
>>> -      <version>1.0-alpha-20</version>
>>> -    </dependency>
>>>  </dependencies>
>>>  <dependencyManagement>
>>>    <dependencies>
>>> @@ -282,32 +258,66 @@
>>>            <groupId>classworlds</groupId>
>>>            <artifactId>classworlds</artifactId>
>>>          </exclusion>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>>        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.apache.maven</groupId>
>>>        <artifactId>maven-model</artifactId>
>>>        <version>${maven.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.apache.maven</groupId>
>>>        <artifactId>maven-artifact</artifactId>
>>>        <version>${maven.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.apache.maven</groupId>
>>>        <artifactId>maven-artifact-manager</artifactId>
>>>        <version>${maven.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.apache.maven</groupId>
>>>        <artifactId>maven-project</artifactId>
>>>        <version>${maven.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.apache.maven</groupId>
>>>        <artifactId>maven-settings</artifactId>
>>>        <version>${maven.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.apache.maven.scm</groupId>
>>> @@ -565,11 +575,23 @@
>>>        <groupId>org.apache.maven.shared</groupId>
>>>        <artifactId>file-management</artifactId>
>>>        <version>1.1</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.registry</groupId>
>>>        <artifactId>plexus-registry-api</artifactId>
>>>        <version>1.0-alpha-3</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.registry</groupId>
>>> @@ -577,6 +599,10 @@
>>>        <version>1.0-alpha-3</version>
>>>        <exclusions>
>>>          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +          <exclusion>
>>>            <groupId>ant</groupId>
>>>            <artifactId>ant-optional</artifactId>
>>>          </exclusion>
>>> @@ -644,6 +670,12 @@
>>>        <groupId>org.codehaus.plexus</groupId>
>>>        <artifactId>plexus-jdo2</artifactId>
>>>        <version>1.0-alpha-8</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus</groupId>
>>> @@ -651,6 +683,10 @@
>>>        <version>1.0-beta-13</version>
>>>        <exclusions>
>>>          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +          <exclusion>
>>>            <groupId>ognl</groupId>
>>>            <artifactId>ognl</artifactId>
>>>          </exclusion>
>>> @@ -660,6 +696,12 @@
>>>        <groupId>org.codehaus.plexus</groupId>
>>>        <artifactId>plexus-velocity</artifactId>
>>>        <version>1.1.4</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>velocity</groupId>
>>> +            <artifactId>velocity-dep</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus</groupId>
>>> @@ -683,15 +725,14 @@
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus</groupId>
>>> -        <artifactId>plexus-log4j-logging</artifactId>
>>> -        <version>1.1-alpha-2</version>
>>> -      </dependency>
>>> -      <dependency>
>>> -        <groupId>org.codehaus.plexus</groupId>
>>>        <artifactId>plexus-slf4j-logging</artifactId>
>>>        <version>1.1-alpha-1</version>
>>>        <exclusions>
>>>          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +          <exclusion>
>>>            <groupId>org.slf4j</groupId>
>>>            <artifactId>slf4j-simple</artifactId>
>>>          </exclusion>
>>> @@ -736,6 +777,10 @@
>>>            <groupId>velocity</groupId>
>>>            <artifactId>velocity-dep</artifactId>
>>>          </exclusion>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>>        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>> @@ -766,6 +811,12 @@
>>>        <artifactId>redback-rbac-memory</artifactId>
>>>        <version>${redback.version}</version>
>>>        <scope>test</scope>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>> @@ -793,6 +844,12 @@
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>>        <artifactId>redback-rbac-role-manager</artifactId>
>>>        <version>${redback.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>> @@ -803,28 +860,40 @@
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>>        <artifactId>redback-system</artifactId>
>>>        <version>${redback.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>>        <artifactId>redback-taglib</artifactId>
>>>        <version>${redback.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>>        <artifactId>redback-xwork-content</artifactId>
>>>        <version>${redback.version}</version>
>>>        <type>war</type>
>>> -        <exclusions>
>>> -          <exclusion>
>>> -            <groupId>classworlds</groupId>
>>> -            <artifactId>classworlds</artifactId>
>>> -          </exclusion>
>>> -        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>>        <artifactId>redback-xwork-integration</artifactId>
>>>        <version>${redback.version}</version>
>>> +        <exclusions>
>>> +          <exclusion>
>>> +            <groupId>org.codehaus.plexus</groupId>
>>> +            <artifactId>plexus-container-default</artifactId>
>>> +          </exclusion>
>>> +        </exclusions>
>>>      </dependency>
>>>      <dependency>
>>>        <groupId>org.codehaus.plexus.redback</groupId>
>>>
>>>
>>>
>>

--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/


Mime
View raw message