You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/10/13 06:06:53 UTC
svn commit: r463556 - in /geronimo/gbuild/trunk: extensions/pom.xml
extensions/requeue-failed/pom.xml gbuild-agent/pom.xml pom.xml
Author: jdillon
Date: Thu Oct 12 21:06:51 2006
New Revision: 463556
URL: http://svn.apache.org/viewvc?view=rev&rev=463556
Log:
Using activemq 4.1
Cleaned up config to not use m1 repo
Include log4j for tests
Exclude plexus-jdo2 from plexus-core to avoid bunk error logs
Modified:
geronimo/gbuild/trunk/extensions/pom.xml
geronimo/gbuild/trunk/extensions/requeue-failed/pom.xml
geronimo/gbuild/trunk/gbuild-agent/pom.xml
geronimo/gbuild/trunk/pom.xml
Modified: geronimo/gbuild/trunk/extensions/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/extensions/pom.xml?view=diff&rev=463556&r1=463555&r2=463556
==============================================================================
--- geronimo/gbuild/trunk/extensions/pom.xml (original)
+++ geronimo/gbuild/trunk/extensions/pom.xml Thu Oct 12 21:06:51 2006
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.gbuild.extension</groupId>
<artifactId>extensions</artifactId>
- <name>GBuild Agent Extensions</name>
+ <name>GBuild Extensions</name>
<packaging>pom</packaging>
<modules>
Modified: geronimo/gbuild/trunk/extensions/requeue-failed/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/extensions/requeue-failed/pom.xml?view=diff&rev=463556&r1=463555&r2=463556
==============================================================================
--- geronimo/gbuild/trunk/extensions/requeue-failed/pom.xml (original)
+++ geronimo/gbuild/trunk/extensions/requeue-failed/pom.xml Thu Oct 12 21:06:51 2006
@@ -29,7 +29,7 @@
</parent>
<artifactId>requeue-failed</artifactId>
- <name>GBuild Extension: Requeue Failed Builds</name>
+ <name>GBuild Extensions :: Requeue Failed Builds</name>
<dependencies>
Modified: geronimo/gbuild/trunk/gbuild-agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/gbuild-agent/pom.xml?view=diff&rev=463556&r1=463555&r2=463556
==============================================================================
--- geronimo/gbuild/trunk/gbuild-agent/pom.xml (original)
+++ geronimo/gbuild/trunk/gbuild-agent/pom.xml Thu Oct 12 21:06:51 2006
@@ -32,7 +32,6 @@
<name>GBuild Agent</name>
<dependencies>
-
<dependency>
<groupId>org.apache.maven.continuum</groupId>
<artifactId>continuum-api</artifactId>
@@ -74,48 +73,15 @@
<version>1.0</version>
</dependency>
- <!-- ActiveMQ deps -->
-
<dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
- <version>3.0-beta2</version>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>2.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>2.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.1.0</version>
</dependency>
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
-
</dependencies>
-
+
</project>
Modified: geronimo/gbuild/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gbuild/trunk/pom.xml?view=diff&rev=463556&r1=463555&r2=463556
==============================================================================
--- geronimo/gbuild/trunk/pom.xml (original)
+++ geronimo/gbuild/trunk/pom.xml Thu Oct 12 21:06:51 2006
@@ -79,7 +79,6 @@
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -111,6 +110,10 @@
<groupId>javax.resource</groupId>
<artifactId>connector</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-jdo2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -133,9 +136,15 @@
</dependency>
<dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.0-RC3</version>
+ <version>4.1-incubator-SNAPSHOT</version>
</dependency>
<dependency>
@@ -157,22 +166,19 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
</dependency>
-
</dependencies>
</dependencyManagement>
-
+
<dependencies>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
</dependency>
-
</dependencies>
<build>
@@ -246,24 +252,6 @@
</snapshots>
<releases>
<enabled>false</enabled>
- </releases>
- </repository>
-
- <!--
- HACK: Need the Apache m1 snapshot repo to pick up incubator-activemq:*
- -->
- <repository>
- <id>apache-snapshots-m1</id>
- <name>Apache Maven 1 Snapshots Repository</name>
- <url>http://people.apache.org/repo/m1-snapshot-repository</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
</releases>
</repository>
</repositories>