You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2009/04/22 09:25:32 UTC
svn commit: r767397 [1/2] - in /continuum/branches/continuum-1.3.x: ./
continuum-api/ continuum-base/continuum-configuration/
continuum-base/continuum-configuration/src/test/resources/
continuum-base/continuum-scm/ continuum-base/continuum-scm/src/test...
Author: brett
Date: Wed Apr 22 07:25:29 2009
New Revision: 767397
URL: http://svn.apache.org/viewvc?rev=767397&view=rev
Log:
[CONTINUUM-2187] centralise logging through slf4j and perform a full POM and dependency review based on dependency:analyze
Removed:
continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/test/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-base/continuum-scm/src/test/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-builder/src/test/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-commons/src/test/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-commons/src/test/resources/org/apache/maven/continuum/configuration/
continuum/branches/continuum-1.3.x/continuum-core/src/test/resources/applicationContextSlf4jPlexusLogger.xml
continuum/branches/continuum-1.3.x/continuum-core/src/test/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-core/src/test/resources/plexus.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/src/main/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-purge/src/main/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-reports/src/test/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-store/src/test/resources/log4j.xml
continuum/branches/continuum-1.3.x/continuum-webapp/src/test/resources/log4j.xml
Modified:
continuum/branches/continuum-1.3.x/continuum-api/pom.xml
continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/pom.xml
continuum/branches/continuum-1.3.x/continuum-base/continuum-scm/pom.xml
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/pom.xml
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/pom.xml
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/META-INF/plexus/application.xml
continuum/branches/continuum-1.3.x/continuum-buildagent/pom.xml
continuum/branches/continuum-1.3.x/continuum-builder/pom.xml
continuum/branches/continuum-1.3.x/continuum-commons/pom.xml
continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/utils/ContinuumUrlValidatorTest.java
continuum/branches/continuum-1.3.x/continuum-core/pom.xml
continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionServiceTest.java
continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
continuum/branches/continuum-1.3.x/continuum-data-management/continuum-legacy/pom.xml
continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/pom.xml
continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DataManagementCli.java
continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml
continuum/branches/continuum-1.3.x/continuum-data-management/data-management-jdo/pom.xml
continuum/branches/continuum-1.3.x/continuum-data-management/data-management-redback-jdo/pom.xml
continuum/branches/continuum-1.3.x/continuum-data-management/pom.xml
continuum/branches/continuum-1.3.x/continuum-data-management/redback-legacy/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/pom.xml
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml
continuum/branches/continuum-1.3.x/continuum-distributed/pom.xml
continuum/branches/continuum-1.3.x/continuum-docs/pom.xml
continuum/branches/continuum-1.3.x/continuum-jetty/pom.xml
continuum/branches/continuum-1.3.x/continuum-model/pom.xml
continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-api/pom.xml
continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-irc/pom.xml
continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-jabber/pom.xml
continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-msn/pom.xml
continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-wagon/pom.xml
continuum/branches/continuum-1.3.x/continuum-purge/pom.xml
continuum/branches/continuum-1.3.x/continuum-release/pom.xml
continuum/branches/continuum-1.3.x/continuum-reports/pom.xml
continuum/branches/continuum-1.3.x/continuum-security/pom.xml
continuum/branches/continuum-1.3.x/continuum-store/pom.xml
continuum/branches/continuum-1.3.x/continuum-store/src/test/resources/org/apache/maven/continuum/store/ContinuumStoreTest.xml
continuum/branches/continuum-1.3.x/continuum-test/pom.xml
continuum/branches/continuum-1.3.x/continuum-webapp-test/pom.xml
continuum/branches/continuum-1.3.x/continuum-webapp/pom.xml
continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml
continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-client/pom.xml
continuum/branches/continuum-1.3.x/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
continuum/branches/continuum-1.3.x/continuum-xmlrpc/pom.xml
continuum/branches/continuum-1.3.x/pom.xml
Modified: continuum/branches/continuum-1.3.x/continuum-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-api/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-api/pom.xml Wed Apr 22 07:25:29 2009
@@ -33,18 +33,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>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-jdo2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-taskqueue</artifactId>
</dependency>
<dependency>
@@ -57,24 +49,23 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-common</artifactId>
- <version>${archiva.version}</version>
+ <artifactId>archiva-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>
- <version>${archiva.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</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.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/pom.xml Wed Apr 22 07:25:29 2009
@@ -84,36 +84,22 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-simple</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-test</artifactId>
- <scope>test</scope>
- </dependency>
<dependency> <!-- added since depMgt doesn't override imported dependencies -->
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus.registry</groupId>
- <artifactId>plexus-registry-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus.registry</groupId>
- <artifactId>plexus-registry-commons</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-base/continuum-scm/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-base/continuum-scm/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-base/continuum-scm/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-base/continuum-scm/pom.xml Wed Apr 22 07:25:29 2009
@@ -26,22 +26,32 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>continuum-scm</artifactId>
<name>Continuum :: SCM</name>
- <!-- TODO: move versions to dependency management -->
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>${maven-scm.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -50,29 +60,20 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.0</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svnexe</artifactId>
- <version>${maven-scm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvsjava</artifactId>
- <version>${maven-scm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvsexe</artifactId>
- <version>${maven-scm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/pom.xml Wed Apr 22 07:25:29 2009
@@ -25,9 +25,7 @@
<version>1.3.3-SNAPSHOT</version>
</parent>
- <groupId>org.apache.continuum</groupId>
<artifactId>continuum-buildagent-api</artifactId>
- <packaging>jar</packaging>
<name>Continuum :: Distributed Build :: Build Agent API</name>
<build>
@@ -75,22 +73,6 @@
</build>
<dependencies>
<dependency>
- <groupId>net.java.dev.stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- <version>20060502</version>
- <exclusions>
- <exclusion>
- <groupId>com.bea.xml</groupId>
- <artifactId>jsr173-ri</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/pom.xml Wed Apr 22 07:25:29 2009
@@ -24,14 +24,20 @@
<version>1.3.3-SNAPSHOT</version>
</parent>
- <groupId>org.apache.continuum</groupId>
<artifactId>continuum-buildagent-core</artifactId>
- <packaging>jar</packaging>
<name>Continuum :: Distributed Build :: Build Agent :: Core</name>
<dependencies>
<dependency>
<groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
<artifactId>continuum-buildagent-api</artifactId>
</dependency>
<dependency>
@@ -39,6 +45,10 @@
<artifactId>continuum-scm</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-release</artifactId>
<exclusions>
@@ -61,6 +71,14 @@
<artifactId>file-management</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
@@ -71,35 +89,34 @@
<dependency>
<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>
<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.release</groupId>
<artifactId>maven-release-manager</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.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -109,16 +126,6 @@
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-slf4j-logging</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-jetty/pom.xml Wed Apr 22 07:25:29 2009
@@ -31,12 +31,10 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>start</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
@@ -47,92 +45,59 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-naming</artifactId>
- <version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
- <version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.0</artifactId>
- <version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-plus</artifactId>
- <version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>5.5.15</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>5.5.15</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.15</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
<build>
@@ -140,7 +105,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.0-beta-2</version>
<configuration>
<daemons>
<daemon>
@@ -235,7 +199,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -251,7 +214,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<id>config</id>
@@ -272,12 +234,6 @@
</plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>codehaus.org</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- </pluginRepository>
- </pluginRepositories>
<properties>
<jetty.version>6.1.11</jetty.version>
</properties>
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/pom.xml Wed Apr 22 07:25:29 2009
@@ -24,28 +24,36 @@
<version>1.3.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.continuum</groupId>
<artifactId>continuum-buildagent-webapp</artifactId>
<packaging>war</packaging>
<name>Continuum :: Distributed Build :: Build Agent :: Webapp</name>
- <url>http://continuum.apache.org</url>
<dependencies>
<dependency>
<groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-buildagent-core</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-slave-server</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-master-client</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-buildagent-core</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-taskqueue</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.5.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -68,10 +76,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
+ <groupId>com.atlassian.xmlrpc</groupId>
+ <artifactId>atlassian-xmlrpc-binder-server-spring</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
@@ -80,7 +87,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.11</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<contextPath>/</contextPath>
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/META-INF/plexus/application.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/resources/META-INF/plexus/application.xml Wed Apr 22 07:25:29 2009
@@ -61,4 +61,4 @@
</lifecycle-handler>
</lifecycle-handlers>
</lifecycle-handler-manager>
-</plexus>
\ No newline at end of file
+</plexus>
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/pom.xml Wed Apr 22 07:25:29 2009
@@ -25,7 +25,6 @@
<version>1.3.3-SNAPSHOT</version>
</parent>
- <groupId>org.apache.continuum</groupId>
<artifactId>continuum-buildagent</artifactId>
<packaging>pom</packaging>
<name>Continuum :: Distributed Build :: Build Agent</name>
Modified: continuum/branches/continuum-1.3.x/continuum-builder/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-builder/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-builder/pom.xml Wed Apr 22 07:25:29 2009
@@ -27,7 +27,6 @@
</parent>
<artifactId>continuum-builder</artifactId>
<name>Continuum :: Builder</name>
- <url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.apache.continuum</groupId>
@@ -45,30 +44,35 @@
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-commons</artifactId>
+ <artifactId>continuum-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-store</artifactId>
+ <artifactId>continuum-commons</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-slave-client</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-test</artifactId>
- <scope>test</scope>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-taskqueue</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
</dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-commons/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-commons/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-commons/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-commons/pom.xml Wed Apr 22 07:25:29 2009
@@ -33,35 +33,59 @@
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-store</artifactId>
+ <artifactId>continuum-model</artifactId>
</dependency>
+ <!-- required because Sprint pre-instantiates them, and we have no stubs -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-configuration</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- required because Sprint pre-instantiates them, and we have no stubs -->
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-store</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-configuration</artifactId>
- </dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-spring</artifactId>
+ <artifactId>plexus-component-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.release</groupId>
- <artifactId>maven-release-manager</artifactId>
- <version>1.0-alpha-3</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- === Testing Dependencies === -->
<dependency>
<groupId>hsqldb</groupId>
@@ -73,10 +97,5 @@
<artifactId>continuum-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/utils/ContinuumUrlValidatorTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/utils/ContinuumUrlValidatorTest.java?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/utils/ContinuumUrlValidatorTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/utils/ContinuumUrlValidatorTest.java Wed Apr 22 07:25:29 2009
@@ -136,7 +136,7 @@
public void testValidateFile()
throws Exception
{
- File rootPom = getTestFile( "src/test/resources/log4j.xml" );
+ File rootPom = getTestFile( "src/test/resources/META-INF/continuum/continuum-configuration.xml" );
assertTrue( rootPom.exists() );
assertTrue( getContinuumUrlValidator().validate( rootPom.toURL().toExternalForm() ) );
}
Modified: continuum/branches/continuum-1.3.x/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/pom.xml Wed Apr 22 07:25:29 2009
@@ -28,6 +28,15 @@
<name>Continuum :: Core</name>
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-quartz</artifactId>
</dependency>
@@ -40,6 +49,10 @@
<artifactId>maven-settings</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-notifier-api</artifactId>
</dependency>
@@ -70,13 +83,6 @@
<dependency>
<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.codehaus.plexus</groupId>
@@ -87,10 +93,6 @@
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
</dependency>
@@ -99,27 +101,16 @@
<artifactId>maven-project</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-jdo2</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
<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>
@@ -130,12 +121,28 @@
<artifactId>jpox</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-store</artifactId>
+ <artifactId>continuum-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
@@ -143,10 +150,6 @@
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.continuum</groupId>
<artifactId>continuum-scm</artifactId>
</dependency>
<dependency>
@@ -158,84 +161,84 @@
<artifactId>continuum-purge</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-common</artifactId>
- <version>${archiva.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-repository-layer</artifactId>
- <version>${archiva.version}</version>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- <scope>provided</scope>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-builder</artifactId>
</dependency>
- <!-- === Testing Dependencies === -->
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-distributed-slave-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-test</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.maven.release</groupId>
+ <artifactId>maven-release-manager</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-security</artifactId>
- <scope>test</scope>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <!-- contains redback-core.xml that is needed to instantiate some test classes -->
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-struts2-integration</artifactId>
+ <scope>runtime</scope>
</dependency>
+ <!-- contains redback.xml that is needed to pass some test classes -->
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-configuration</artifactId>
+ <artifactId>continuum-security</artifactId>
+ <scope>runtime</scope>
</dependency>
+ <!-- A test that goes way too deep into the stack requires this -->
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-local</artifactId>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
<scope>test</scope>
</dependency>
+ <!-- === Testing Dependencies === -->
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-struts2-integration</artifactId>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-local</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-rbac-memory</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-slf4j-logging</artifactId>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-rbac-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -244,38 +247,30 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit3</artifactId>
<scope>test</scope>
</dependency>
+ <!-- dependency of jmock3 -->
<dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<scope>test</scope>
</dependency>
+ <!-- dependency of jmock3 -->
<dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <artifactId>jmock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionServiceTest.java?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionServiceTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionServiceTest.java Wed Apr 22 07:25:29 2009
@@ -21,12 +21,13 @@
import java.util.List;
import org.apache.continuum.dao.DaoUtils;
-import org.apache.log4j.Logger;
import org.apache.maven.continuum.AbstractContinuumTest;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
@@ -36,7 +37,7 @@
public class DefaultBuildDefinitionServiceTest
extends AbstractContinuumTest
{
- private static final Logger logger = Logger.getLogger( DefaultBuildDefinitionServiceTest.class );
+ private static final Logger logger = LoggerFactory.getLogger( DefaultBuildDefinitionServiceTest.class );
private Project project;
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Wed Apr 22 07:25:29 2009
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
import org.apache.maven.continuum.AbstractContinuumTest;
import org.apache.maven.continuum.builddefinition.BuildDefinitionService;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants;
@@ -38,6 +37,8 @@
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -46,7 +47,7 @@
public class MavenTwoContinuumProjectBuilderTest
extends AbstractContinuumTest
{
- private static final Logger logger = Logger.getLogger( MavenTwoContinuumProjectBuilderTest.class );
+ private static final Logger logger = LoggerFactory.getLogger( MavenTwoContinuumProjectBuilderTest.class );
public void testGetEmailAddressWhenTypeIsSetToEmail()
throws Exception
@@ -359,6 +360,7 @@
ContinuumProjectBuildingResult result;
result = projectBuilder.buildProjectsFromMetadata( url, null, null, false, bdt );
+ assertFalse( result.hasErrors() );
assertEquals( 5, service.getAllBuildDefinitionTemplate().size() );
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/continuum-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/continuum-legacy/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/continuum-legacy/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/continuum-legacy/pom.xml Wed Apr 22 07:25:29 2009
@@ -71,7 +71,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jpox-maven-plugin</artifactId>
- <version>1.1.6</version>
<executions>
<execution>
<goals>
@@ -127,13 +126,6 @@
<dependency>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
- <version>20060502</version>
- <exclusions>
- <exclusion>
- <groupId>com.bea.xml</groupId>
- <artifactId>jsr173-ri</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -142,7 +134,6 @@
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0.1</version>
</dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/pom.xml Wed Apr 22 07:25:29 2009
@@ -29,70 +29,67 @@
<name>Continuum :: Data Management :: CLI</name>
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-20</version>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>data-management-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>data-management-api</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>data-management-jdo</artifactId>
- <!-- Ensures correct build order -->
- <scope>provided</scope>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>data-management-redback-jdo</artifactId>
- <!-- Ensures correct build order -->
- <scope>provided</scope>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.code.cli-parser</groupId>
<artifactId>cli</artifactId>
- <version>7</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-jdo2</artifactId>
+ <artifactId>plexus-classworlds</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-slf4j-logging</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- </dependency>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <scope>runtime</scope>
+ <artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1-dev</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlbeans-jsr173-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>runtime</scope>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>
<build>
@@ -101,7 +98,6 @@
<plugin>
<artifactId>shade-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.0-alpha-7</version>
<executions>
<execution>
<goals>
@@ -114,7 +110,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
<configuration>
<descriptor>src/assembly/app.xml</descriptor>
<archive>
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DataManagementCli.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DataManagementCli.java?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DataManagementCli.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DataManagementCli.java Wed Apr 22 07:25:29 2009
@@ -36,6 +36,8 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.DebugResolutionListener;
+import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.settings.MavenSettingsBuilder;
@@ -162,6 +164,7 @@
else
{
Logger.getRootLogger().setLevel( Level.INFO );
+ Logger.getLogger( "JPOX" ).setLevel( Level.WARN );
}
if ( command.buildsJdbcUrl != null )
@@ -218,6 +221,7 @@
!"continuum-legacy".equals( id ) && !"continuum-model".equals( id ) &&
!"redback-legacy".equals( id ) )
{
+ LOGGER.debug( "[IDE Help] Adding '" + id + "' as an exclusion and using one from classpath" );
exclusions.add( "org.apache.continuum:" + id );
jars.add( new File( url.getPath() ) );
}
@@ -226,6 +230,7 @@
// Sometimes finds its way into the IDE. Make sure it is loaded in the extra classloader too
if ( urlEF.contains( "jpox-enhancer" ) )
{
+ LOGGER.debug( "[IDE Help] Adding 'jpox-enhancer' as an exclusion and using one from classpath" );
jars.add( new File( url.getPath() ) );
}
}
@@ -237,11 +242,13 @@
{
if ( a.getVersion().equals( databaseFormat.getJpoxVersion() ) )
{
+ LOGGER.debug( "Adding artifact: " + a.getFile() );
jars.add( a.getFile() );
}
}
else if ( filter.include( a ) )
{
+ LOGGER.debug( "Adding artifact: " + a.getFile() );
jars.add( a.getFile() );
}
}
@@ -393,16 +400,26 @@
exclusions.add( "org.apache.continuum:data-management-api" );
exclusions.add( "org.codehaus.plexus:plexus-component-api" );
exclusions.add( "org.codehaus.plexus:plexus-container-default" );
- exclusions.add( "stax:stax-api" );
+ exclusions.add( "org.slf4j:slf4j-api" );
exclusions.add( "log4j:log4j" );
ArtifactFilter filter = new ExcludesArtifactFilter( exclusions );
+ List<? extends ResolutionListener> listeners;
+ if ( LOGGER.isDebugEnabled() )
+ {
+ listeners = Collections.singletonList( new DebugResolutionListener( container.getLogger() ) );
+ }
+ else
+ {
+ listeners = Collections.emptyList();
+ }
+
ArtifactMetadataSource source =
(ArtifactMetadataSource) container.lookup( ArtifactMetadataSource.ROLE, "maven" );
- ArtifactResolutionResult result = resolver.resolveTransitively( Collections.singleton( artifact ),
- dummyArtifact, localRepository,
- remoteRepositories, source, filter );
+ ArtifactResolutionResult result =
+ resolver.resolveTransitively( Collections.singleton( artifact ), dummyArtifact, Collections.emptyMap(),
+ localRepository, remoteRepositories, source, filter, listeners );
return result.getArtifacts();
}
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml Wed Apr 22 07:25:29 2009
@@ -20,6 +20,12 @@
<plexus>
<components>
<component>
+ <role>org.codehaus.plexus.logging.LoggerManager</role>
+ <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
+ <lifecycle-handler>basic</lifecycle-handler>
+ </component>
+
+ <component>
<role>org.codehaus.plexus.jdo.JdoFactory</role>
<role-hint>continuum</role-hint>
<implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
@@ -76,5 +82,62 @@
</configuration>
</component>
+ <component>
+ <role>org.codehaus.plexus.jdo.JdoFactory</role>
+ <role-hint>users</role-hint>
+ <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
+ <configuration>
+ <!-- Database Configuration -->
+ <!--
+ <driverName>org.hsqldb.jdbcDriver</driverName>
+ <url>jdbc:hsqldb:mem:database</url>
+ <userName>sa</userName>
+ <password></password>
+ -->
+ <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+
+ <otherProperties>
+ <property>
+ <name>org.jpox.autoCreateSchema</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jpox.validateTables</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateConstraints</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateColumns</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.autoStartMechanism</name>
+ <value>None</value>
+ </property>
+ <property>
+ <name>org.jpox.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
+ <property>
+ <name>org.jpox.poid.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
+ <property>
+ <name>org.jpox.rdbms.dateTimezone</name>
+ <value>JDK_DEFAULT_TIMEZONE</value>
+ </property>
+ <!--
+ <property>
+ <name>org.jpox.identifier.case</name>
+ <value>PreserveCase</value>
+ </property>
+ -->
+ </otherProperties>
+ </configuration>
+ </component>
+
</components>
</plexus>
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/data-management-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/data-management-jdo/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/data-management-jdo/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/data-management-jdo/pom.xml Wed Apr 22 07:25:29 2009
@@ -29,11 +29,33 @@
<name>Continuum :: Data Management :: JDO</name>
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>data-management-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo2-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId>
</dependency>
<dependency>
@@ -53,6 +75,10 @@
<artifactId>continuum-commons</artifactId>
</dependency>
<dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-store</artifactId>
<scope>runtime</scope>
@@ -78,12 +104,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
@@ -91,30 +111,16 @@
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
- <version>1.1.1-dev</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlbeans-jsr173-api</artifactId>
- </exclusion>
- </exclusions>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/data-management-redback-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/data-management-redback-jdo/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/data-management-redback-jdo/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/data-management-redback-jdo/pom.xml Wed Apr 22 07:25:29 2009
@@ -33,10 +33,28 @@
<artifactId>data-management-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo2-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus.security</groupId>
+ <artifactId>plexus-security-authorization-rbac-model</artifactId>
+ <version>1.0-alpha-5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus.security</groupId>
+ <artifactId>plexus-security-user-management-api</artifactId>
+ <version>1.0-alpha-5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>redback-legacy</artifactId>
</dependency>
@@ -44,5 +62,21 @@
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-data-management</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-rbac-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-users-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-keys-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/pom.xml Wed Apr 22 07:25:29 2009
@@ -31,13 +31,14 @@
<artifactId>continuum-data-management</artifactId>
<name>Continuum :: Data Management :: Parent</name>
<modules>
- <module>data-management-cli</module>
<module>data-management-api</module>
<module>continuum-legacy</module>
<module>data-management-jdo</module>
<!-- TODO: move to redback data management -->
<module>redback-legacy</module>
<module>data-management-redback-jdo</module>
+ <!-- Must come after the above since we are not using dependencies to control build order -->
+ <module>data-management-cli</module>
</modules>
<build>
<plugins>
Modified: continuum/branches/continuum-1.3.x/continuum-data-management/redback-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-data-management/redback-legacy/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-data-management/redback-legacy/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-data-management/redback-legacy/pom.xml Wed Apr 22 07:25:29 2009
@@ -170,7 +170,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jpox-maven-plugin</artifactId>
- <version>1.1.6</version>
<executions>
<execution>
<goals>
@@ -185,18 +184,10 @@
<dependency>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
- <version>20060502</version>
- <exclusions>
- <exclusion>
- <groupId>com.bea.xml</groupId>
- <artifactId>jsr173-ri</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/pom.xml Wed Apr 22 07:25:29 2009
@@ -30,8 +30,7 @@
<dependencies>
<dependency>
<groupId>com.atlassian.xmlrpc</groupId>
- <artifactId>atlassian-xmlrpc-binder-server-spring</artifactId>
- <version>0.8.2</version>
+ <artifactId>atlassian-xmlrpc-binder-annotations</artifactId>
</dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/pom.xml Wed Apr 22 07:25:29 2009
@@ -35,7 +35,10 @@
<dependency>
<groupId>com.atlassian.xmlrpc</groupId>
<artifactId>atlassian-xmlrpc-binder</artifactId>
- <version>0.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/pom.xml Wed Apr 22 07:25:29 2009
@@ -29,6 +29,10 @@
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-distributed-master-api</artifactId>
</dependency>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/pom.xml Wed Apr 22 07:25:29 2009
@@ -30,12 +30,7 @@
<dependencies>
<dependency>
<groupId>com.atlassian.xmlrpc</groupId>
- <artifactId>atlassian-xmlrpc-binder-server-spring</artifactId>
- <version>0.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>atlassian-xmlrpc-binder-annotations</artifactId>
</dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/pom.xml Wed Apr 22 07:25:29 2009
@@ -35,11 +35,10 @@
<dependency>
<groupId>com.atlassian.xmlrpc</groupId>
<artifactId>atlassian-xmlrpc-binder</artifactId>
- <version>0.8.2</version>
</dependency>
<dependency>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-buildagent-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/pom.xml Wed Apr 22 07:25:29 2009
@@ -36,5 +36,9 @@
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-buildagent-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/pom.xml Wed Apr 22 07:25:29 2009
@@ -21,30 +21,28 @@
<parent>
<artifactId>continuum-distributed</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-tests</artifactId>
+ <artifactId>continuum-distributed-tests</artifactId>
<packaging>war</packaging>
<name>Continuum :: Distributed Build :: Transport :: Tests</name>
- <url>http://continuum.apache.org</url>
<dependencies>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-slave-server</artifactId>
+ <artifactId>continuum-distributed-slave-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-slave-client</artifactId>
+ <artifactId>continuum-distributed-slave-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-master-server</artifactId>
+ <artifactId>continuum-distributed-master-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-master-client</artifactId>
+ <artifactId>continuum-distributed-master-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
@@ -53,9 +51,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.5.4</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -69,12 +72,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -83,7 +80,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.11</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<contextPath>/</contextPath>
@@ -127,7 +123,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<skip>true</skip>
</configuration>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml Wed Apr 22 07:25:29 2009
@@ -61,4 +61,4 @@
</lifecycle-handler>
</lifecycle-handlers>
</lifecycle-handler-manager>
-</plexus>
\ No newline at end of file
+</plexus>
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/pom.xml Wed Apr 22 07:25:29 2009
@@ -32,33 +32,4 @@
<module>continuum-distributed-slave</module>
<!-- <module>continuum-distributed-tests</module> -->
</modules>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
Modified: continuum/branches/continuum-1.3.x/continuum-docs/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-docs/pom.xml?rev=767397&r1=767396&r2=767397&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-docs/pom.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-docs/pom.xml Wed Apr 22 07:25:29 2009
@@ -25,8 +25,7 @@
<version>1.3.3-SNAPSHOT</version>
</parent>
<artifactId>continuum-docs</artifactId>
- <groupId>org.apache.continuum</groupId>
- <name>Continuum :: docs</name>
+ <name>Continuum :: Documentation</name>
<packaging>pom</packaging>
<url>http://continuum.apache.org/docs/${project.version}</url>
<distributionManagement>
@@ -35,25 +34,17 @@
<url>scpexe://people.apache.org/www/continuum.apache.org/docs/${project.version}</url>
</site>
</distributionManagement>
- <build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7</version>
<configuration>
<templateDirectory>${basedir}/src/site</templateDirectory>
<template>continuum-site.vm</template>
</configuration>
</plugin>
</plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>${wagon.version}</version>
- </extension>
- </extensions>
</build>
<reporting>
<excludeDefaults>true</excludeDefaults>