You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2016/08/29 11:44:02 UTC
camel git commit: Fix log4j2 issues in examples
Repository: camel
Updated Branches:
refs/heads/master 01a1cbddf -> c07557607
Fix log4j2 issues in examples
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0755760
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0755760
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0755760
Branch: refs/heads/master
Commit: c075576076f2b5d8e35e7af86e334a3865315eaa
Parents: 01a1cbd
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Aug 29 13:43:08 2016 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Aug 29 13:43:40 2016 +0200
----------------------------------------------------------------------
examples/camel-example-cdi-rest-servlet/pom.xml | 16 ++++++++++++++++
examples/camel-example-reportincident/pom.xml | 10 ++++++++++
examples/camel-example-restlet-jdbc/pom.xml | 10 ++++++++++
examples/camel-example-spring-ws/pom.xml | 12 +++++++++++-
examples/camel-example-swagger-xml/pom.xml | 16 ++++++++++++++++
parent/pom.xml | 5 +++++
6 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c0755760/examples/camel-example-cdi-rest-servlet/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index acc36da..0dab9af 100755
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -50,6 +50,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- logging -->
@@ -68,6 +74,16 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- test -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c0755760/examples/camel-example-reportincident/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index b6de5f9..95ae81c 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -115,6 +115,16 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- cxf web container for unit testing -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/c0755760/examples/camel-example-restlet-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-restlet-jdbc/pom.xml b/examples/camel-example-restlet-jdbc/pom.xml
index 3a3ce40..31fd625 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -90,6 +90,16 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/camel/blob/c0755760/examples/camel-example-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index 6a4abf2..1d9efbf 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -74,6 +74,16 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- for testing -->
<dependency>
@@ -106,7 +116,7 @@
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
- </configuration>
+ </configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/camel/blob/c0755760/examples/camel-example-swagger-xml/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-xml/pom.xml b/examples/camel-example-swagger-xml/pom.xml
index dbb9d8e..d730dc7 100755
--- a/examples/camel-example-swagger-xml/pom.xml
+++ b/examples/camel-example-swagger-xml/pom.xml
@@ -51,6 +51,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- swagger api -->
@@ -87,6 +93,16 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/camel/blob/c0755760/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c0c2802..534e498 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3389,6 +3389,11 @@
<artifactId>log4j-jul</artifactId>
<version>${log4j2-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>${log4j2-version}</version>
+ </dependency>
<!-- commons-logging needed by Spring -->
<dependency>
<groupId>commons-logging</groupId>