You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/06 10:36:39 UTC
svn commit: r1228042 - in /camel/branches/camel-2.9.x: ./
components/camel-http/
tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/
tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/
to...
Author: davsclaus
Date: Fri Jan 6 09:36:38 2012
New Revision: 1228042
URL: http://svn.apache.org/viewvc?rev=1228042&view=rev
Log:
CAMEL-4865: Added camel-test as dependency in generated pom.xml to Camel archetypes.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 09:36:38 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540,1228015
+/camel/trunk:1227209,1227212,1227540,1228015,1228027
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 6 09:36:38 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 09:36:38 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1227209,1227212,1228015
+/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -30,16 +30,7 @@
<url>http://www.myorganization.org</url>
<dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${activemq-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-camel</artifactId>
- <version>${activemq-version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
@@ -55,6 +46,17 @@
<artifactId>camel-spring</artifactId>
<version>${camel-version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
@@ -65,6 +67,8 @@
<artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency>
+
+ <!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -80,6 +84,14 @@
<artifactId>log4j</artifactId>
<version>${log4j-version}</version>
</dependency>
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -40,6 +40,30 @@
<artifactId>camel-blueprint</artifactId>
<version>${camel-version}</version>
</dependency>
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
</dependencies>
<build>
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -40,7 +40,14 @@
<artifactId>camel-spring</artifactId>
<version>${camel-version}</version>
</dependency>
-
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -53,6 +53,13 @@
<version>${scala-version}</version>
</dependency>
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -41,6 +41,13 @@
<version>${camel-version}</version>
</dependency>
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -40,7 +40,14 @@
<artifactId>camel-spring</artifactId>
<version>${camel-version}</version>
</dependency>
-
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -56,7 +56,14 @@
<artifactId>spring-web</artifactId>
<version>${spring-version}</version>
</dependency>
-
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml?rev=1228042&r1=1228041&r2=1228042&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml Fri Jan 6 09:36:38 2012
@@ -69,7 +69,14 @@
<artifactId>camel-stream</artifactId>
<version>${camel-version}</version>
</dependency>
-
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>