camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/7] camel git commit: CAMEL-11868: Polished
Date Mon, 16 Oct 2017 18:50:43 GMT
CAMEL-11868: Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3f2ef737
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3f2ef737
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3f2ef737

Branch: refs/heads/master
Commit: 3f2ef7371189c03e9ffdb2b79e919ca782cf831c
Parents: 037aee4
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Oct 16 20:37:45 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Oct 16 20:37:45 2017 +0200

----------------------------------------------------------------------
 components/camel-elasticsearch5-rest/pom.xml    |  8 +----
 .../src/test/resources/log4j2.properties        | 31 ++++++++++++++++----
 2 files changed, 27 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3f2ef737/components/camel-elasticsearch5-rest/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch5-rest/pom.xml b/components/camel-elasticsearch5-rest/pom.xml
index ed28b69..2f5ae47 100644
--- a/components/camel-elasticsearch5-rest/pom.xml
+++ b/components/camel-elasticsearch5-rest/pom.xml
@@ -27,14 +27,12 @@
     <version>2.21.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.camel</groupId>
   <artifactId>camel-elasticsearch5-rest</artifactId>
   <packaging>jar</packaging>
   <name>Camel :: ElasticSearch5 :: REST</name>
   <description>Camel ElasticSearch 5.x REST support</description>
 
   <properties>
-    <elasticsearch.version>${elasticsearch5-version}</elasticsearch.version>
     <camel.osgi.export.pkg>org.apache.camel.component.elasticsearch5.*;${camel.osgi.version}</camel.osgi.export.pkg>
     <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=elasticsearch-rest</camel.osgi.export.service>
   </properties>
@@ -44,6 +42,7 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.elasticsearch.client</groupId>
       <artifactId>elasticsearch-rest-high-level-client</artifactId>
@@ -95,11 +94,6 @@
       <artifactId>log4j-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-1.2-api</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/camel/blob/3f2ef737/components/camel-elasticsearch5-rest/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch5-rest/src/test/resources/log4j2.properties b/components/camel-elasticsearch5-rest/src/test/resources/log4j2.properties
index 328db35..8f3f866 100644
--- a/components/camel-elasticsearch5-rest/src/test/resources/log4j2.properties
+++ b/components/camel-elasticsearch5-rest/src/test/resources/log4j2.properties
@@ -1,7 +1,28 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
 
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-elasticsearch5-rest-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.stdout.type = Console
+appender.stdout.name = stdout
+appender.stdout.layout.type = PatternLayout
+appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
 rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out
+rootLogger.appenderRef.file.ref = file


Mime
View raw message