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 2021/12/02 14:17:22 UTC
[camel] branch main updated (779281e -> b35e56d)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 779281e Regen for commit a53b483bfad67d9ef0d78f9098afdd8dff7c2a6c (#6495)
new 06aa209 CAMEL-17239: camel-jbang - Use color logging
new b35e56d CAMEL-17239: camel-jbang - Use color logging
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:
camel-dependencies/pom.xml | 1 +
dsl/camel-jbang/camel-jbang-core/pom.xml | 5 +++++
.../org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java | 3 +--
.../camel-jbang-core/src/main}/resources/log4j2.properties | 13 ++++++-------
parent/pom.xml | 1 +
5 files changed, 14 insertions(+), 9 deletions(-)
copy {tests/camel-typeconverterscan-test/src/test => dsl/camel-jbang/camel-jbang-core/src/main}/resources/log4j2.properties (78%)
[camel] 02/02: CAMEL-17239: camel-jbang - Use color logging
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b35e56d7931bf40b92b3589ae69d253770bfd436
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 2 15:16:43 2021 +0100
CAMEL-17239: camel-jbang - Use color logging
---
camel-dependencies/pom.xml | 1 +
dsl/camel-jbang/camel-jbang-core/pom.xml | 2 +-
parent/pom.xml | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 1ed4dda..1e73a73 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -290,6 +290,7 @@
<jakarta-mail-version>1.6.6</jakarta-mail-version>
<jakarta.el-version>3.0.3</jakarta.el-version>
<jandex-version>2.4.1.Final</jandex-version>
+ <jansi-version>1.18</jansi-version>
<jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
<jasn1-version>1.11.3</jasn1-version>
<jasypt-version>1.9.3</jasypt-version>
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml
index 4a37f0e..a33b6eb 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.18</version>
+ <version>${jansi-version}</version>
</dependency>
</dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 82e2ccb..3a9fc6a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -267,6 +267,7 @@
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
<jandex-version>2.4.1.Final</jandex-version>
+ <jansi-version>1.18</jansi-version>
<jasn1-version>1.11.3</jasn1-version>
<jasypt-version>1.9.3</jasypt-version>
<java-grok-version>0.1.9</java-grok-version>
[camel] 01/02: CAMEL-17239: camel-jbang - Use color logging
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06aa2099494f8c14e133b4591b3e6a840172361f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 2 15:14:00 2021 +0100
CAMEL-17239: camel-jbang - Use color logging
---
dsl/camel-jbang/camel-jbang-core/pom.xml | 5 ++++
.../camel/dsl/jbang/core/common/RuntimeUtil.java | 3 +--
.../src/main/resources/log4j2.properties | 27 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml
index b6c6946..4a37f0e 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -92,6 +92,11 @@
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.18</version>
+ </dependency>
</dependencies>
</project>
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
index bd9eeb4..2494cdc 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java
@@ -18,13 +18,12 @@ package org.apache.camel.dsl.jbang.core.common;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.Configurator;
-import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.slf4j.LoggerFactory;
public final class RuntimeUtil {
static {
- Configurator.initialize(new DefaultConfiguration());
+ Configurator.initialize("CamelJBang", "log4j2.properties");
}
private RuntimeUtil() {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/log4j2.properties b/dsl/camel-jbang/camel-jbang-core/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..cca5fb5
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/log4j2.properties
@@ -0,0 +1,27 @@
+## ---------------------------------------------------------------------------
+## 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.stdout.type = Console
+appender.stdout.name = out
+appender.stdout.layout.type = PatternLayout
+
+# logging style that is similar to spring boot
+appender.stdout.layout.pattern = %style{%d{yyyy-MM-dd HH:mm:ss.SSS}}{Dim} %highlight{%5p} %style{%pid}{Magenta} %style{---}{Dim} %style{[%15.15t]}{Dim} %style{%-40.40c{1.}}{Cyan} : %m%n
+
+rootLogger.level = INFO
+rootLogger.appenderRef.out.ref = out
+