Author: jstrachan
Date: Thu Oct 16 10:04:26 2008
New Revision: 705284
URL: http://svn.apache.org/viewvc?rev=705284&view=rev
Log:
switching to guiceyfruit release
Modified:
activemq/camel/trunk/components/camel-guice/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/components/camel-guice/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/pom.xml?rev=705284&r1=705283&r2=705284&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/pom.xml (original)
+++ activemq/camel/trunk/components/camel-guice/pom.xml Thu Oct 16 10:04:26 2008
@@ -37,33 +37,6 @@
<camel.osgi.export.pkg>org.apache.camel.guice.*</camel.osgi.export.pkg>
</properties>
- <repositories>
- <repository>
- <id>guiceyfruit.release</id>
- <name>GuiceyFruit Release Repository</name>
- <url>http://guiceyfruit.googlecode.com/svn/repo/releases/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
-
- <!-- TODO remove with real release when we switch from SNAPSHOT version -->
- <repository>
- <id>guiceyfruit.snapshot</id>
- <name>GuiceyFruit Snapshot Repository</name>
- <url>http://guiceyfruit.googlecode.com/svn/repo/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
@@ -73,7 +46,6 @@
<dependency>
<groupId>org.guiceyfruit</groupId>
<artifactId>guiceyfruit-core</artifactId>
- <version>2.0-SNAPSHOT</version>
</dependency>
<!-- testing -->
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=705284&r1=705283&r2=705284&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Thu Oct 16 10:04:26 2008
@@ -42,6 +42,7 @@
<compiler.fork>false</compiler.fork>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.1.0</activemq-version>
+ <apacheds-version>1.5.4</apacheds-version>
<cxf-version>2.1.2</cxf-version>
<felix-version>1.4.1</felix-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
@@ -64,18 +65,18 @@
<commons-collections-version>3.2.1</commons-collections-version>
<commons-pool-version>1.4</commons-pool-version>
<commons-dbcp-version>1.2.2</commons-dbcp-version>
+ <derby-version>10.4.2.0</derby-version>
<easymock-version>2.4</easymock-version>
+ <hamcrest-version>1.2-dev1</hamcrest-version>
<hibernate-version>3.2.6.ga</hibernate-version>
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>1.8.0.7</hsqldb-version>
<groovy-version>1.5.6</groovy-version>
- <derby-version>10.4.2.0</derby-version>
- <xbean-spring-version>3.4</xbean-spring-version>
+ <guiceyfruit-version>2.0-beta-1</guiceyfruit-version>
<junit-version>3.8.2</junit-version>
- <testng-version>5.7</testng-version>
- <hamcrest-version>1.1</hamcrest-version>
<saxon-version>9.1.0.1</saxon-version>
- <apacheds-version>1.5.4</apacheds-version>
+ <testng-version>5.7</testng-version>
+ <xbean-spring-version>3.4</xbean-spring-version>
<!-- Repositories -->
<m1-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-repo-url>
@@ -147,6 +148,34 @@
</site>
</distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>guiceyfruit.release</id>
+ <name>GuiceyFruit Release Repository</name>
+ <url>http://guiceyfruit.googlecode.com/svn/repo/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+<!--
+ <repository>
+ <id>guiceyfruit.snapshot</id>
+ <name>GuiceyFruit Snapshot Repository</name>
+ <url>http://guiceyfruit.googlecode.com/svn/repo/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+-->
+ </repositories>
+
<modules>
<module>buildingtools</module>
<module>camel-core</module>
@@ -710,6 +739,13 @@
<version>1.0</version>
</dependency>
+ <!-- optional guice dependencies -->
+ <dependency>
+ <groupId>org.guiceyfruit</groupId>
+ <artifactId>guiceyfruit-core</artifactId>
+ <version>${guiceyfruit-version}</version>
+ </dependency>
+
<!-- optional mina dependencies -->
<dependency>
<groupId>org.apache.mina</groupId>
