You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/05/22 09:18:44 UTC
[camel] branch master updated (a04d6aa -> bb99a59)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a04d6aa Archetypes: Avoid usage of camel-parent, archetype java8
new 3a6b781 Archetypes: Avoid usage of camel-parent, camel-archetype-main
new bb99a59 Camel-archetype-main: Added log4j2.properties file and avoid logback
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/archetype-resources/pom.xml | 20 ++++-----------
.../src/main}/resources/log4j2.properties | 0
.../src/main/resources/logback.xml | 30 ----------------------
3 files changed, 5 insertions(+), 45 deletions(-)
copy {components/camel-salesforce/camel-salesforce-maven-plugin/src/test => archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main}/resources/log4j2.properties (100%)
delete mode 100644 archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/logback.xml
[camel] 01/02: Archetypes: Avoid usage of camel-parent,
camel-archetype-main
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3a6b781800f9b543eee6799e0d00b991c5913cb1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri May 22 11:17:28 2020 +0200
Archetypes: Avoid usage of camel-parent, camel-archetype-main
---
.../src/main/resources/archetype-resources/pom.xml | 20 ++++-----------
.../src/main/resources/logback.xml | 30 ----------------------
2 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml
index 8010911..fd1b010 100644
--- a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/pom.xml
@@ -30,6 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <log4j2-version>2.13.3</log4j2-version>
</properties>
<dependencyManagement>
@@ -42,13 +43,6 @@
<scope>import</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${camel-version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -81,14 +75,10 @@
<!-- logging -->
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback-version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>runtime</scope>
+ <version>${log4j2-version}</version>
</dependency>
<!-- testing -->
diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/logback.xml b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/logback.xml
deleted file mode 100644
index a798d0b..0000000
--- a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/logback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="STDOUT" />
- </root>
-</configuration>
[camel] 02/02: Camel-archetype-main: Added log4j2.properties file
and avoid logback
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bb99a59b61a53c1049dce484ecb01ce15c74ad06
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri May 22 11:18:03 2020 +0200
Camel-archetype-main: Added log4j2.properties file and avoid logback
---
.../src/main/resources/log4j2.properties | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..d9f0508
--- /dev/null
+++ b/archetypes/camel-archetype-main/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
@@ -0,0 +1,23 @@
+## ---------------------------------------------------------------------------
+## 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
+rootLogger.level = INFO
+rootLogger.appenderRef.out.ref = out