Author: davsclaus
Date: Wed Oct 19 12:31:43 2011
New Revision: 1186169
URL: http://svn.apache.org/viewvc?rev=1186169&view=rev
Log:
CAMEL-4559 specify the sl4j-api version in the camel maven archetypes pom
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
svn:mergeinfo = /camel/trunk:1186106
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -64,6 +64,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -43,16 +43,23 @@
<version>${camel-version}</version>
<scope>test</scope>
</dependency>
- <!-- logging -->
+ <!-- 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>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
+ <version>${log4j-version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -44,6 +44,11 @@
<!-- 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>
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -56,6 +56,11 @@
<!-- 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>
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -44,6 +44,11 @@
<!-- 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>
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -44,6 +44,11 @@
<!-- 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>
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -60,6 +60,11 @@
<!-- 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>
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml?rev=1186169&r1=1186168&r2=1186169&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
Wed Oct 19 12:31:43 2011
@@ -73,6 +73,11 @@
<!-- 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>
