You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2021/12/20 16:41:21 UTC
[qpid-jms] branch main updated (1fc1fdb -> f04cf5b)
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git.
from 1fc1fdb QPIDJMS-557: gate log message on whether closure was already requested
new 46bb0c7 QPIDJMS-558: update examples+tests to use slf4j-simple
new f04cf5b QPIDJMS-559: update to slf4j 1.7.32
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:
apache-qpid-jms/pom.xml | 5 --
apache-qpid-jms/src/main/assembly/bin.xml | 12 -----
pom.xml | 9 ++--
qpid-jms-client/pom.xml | 4 +-
...4j2-test.properties => simplelogger.properties} | 32 ++++---------
qpid-jms-discovery/pom.xml | 4 +-
qpid-jms-examples/pom.xml | 4 +-
.../{log4j2.properties => simplelogger.properties} | 16 ++-----
.../qpid-jms-activemq-tests/pom.xml | 4 +-
.../src/test/resources/log4j2-test.properties | 53 ----------------------
.../src/test/resources/simplelogger.properties | 22 +++++----
11 files changed, 38 insertions(+), 127 deletions(-)
rename qpid-jms-client/src/test/resources/{log4j2-test.properties => simplelogger.properties} (54%)
copy qpid-jms-examples/src/main/resources/{log4j2.properties => simplelogger.properties} (68%)
delete mode 100644 qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2-test.properties
rename qpid-jms-examples/src/main/resources/log4j2.properties => qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/simplelogger.properties (53%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 01/02: QPIDJMS-558: update examples+tests to use slf4j-simple
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 46bb0c7bce0cbab21b622b12b72e9b0ee48b7e0b
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Dec 20 16:30:50 2021 +0000
QPIDJMS-558: update examples+tests to use slf4j-simple
---
apache-qpid-jms/pom.xml | 5 --
apache-qpid-jms/src/main/assembly/bin.xml | 12 -----
pom.xml | 7 ++-
qpid-jms-client/pom.xml | 4 +-
...4j2-test.properties => simplelogger.properties} | 32 ++++---------
qpid-jms-discovery/pom.xml | 4 +-
qpid-jms-examples/pom.xml | 4 +-
.../{log4j2.properties => simplelogger.properties} | 16 ++-----
.../qpid-jms-activemq-tests/pom.xml | 4 +-
.../src/test/resources/log4j2-test.properties | 53 ----------------------
.../src/test/resources/simplelogger.properties | 35 +++++---------
11 files changed, 37 insertions(+), 139 deletions(-)
diff --git a/apache-qpid-jms/pom.xml b/apache-qpid-jms/pom.xml
index 4c5c23b..230d54d 100644
--- a/apache-qpid-jms/pom.xml
+++ b/apache-qpid-jms/pom.xml
@@ -35,11 +35,6 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-discovery</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <optional>true</optional>
- </dependency>
</dependencies>
<build>
diff --git a/apache-qpid-jms/src/main/assembly/bin.xml b/apache-qpid-jms/src/main/assembly/bin.xml
index b2e86c8..bb1a07b 100644
--- a/apache-qpid-jms/src/main/assembly/bin.xml
+++ b/apache-qpid-jms/src/main/assembly/bin.xml
@@ -45,18 +45,6 @@
<outputDirectory>/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
- <excludes>
- <exclude>org.apache.logging.log4j:log4j-slf4j-impl</exclude>
- </excludes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>/lib/optional</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <includes>
- <include>org.apache.logging.log4j:log4j-slf4j-impl</include>
- </includes>
</dependencySet>
</dependencySets>
<moduleSets>
diff --git a/pom.xml b/pom.xml
index c704efa..3e524f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
<proton-version>0.33.10</proton-version>
<netty-version>4.1.72.Final</netty-version>
<slf4j-version>1.7.30</slf4j-version>
- <log4j-slf4j-version>2.16.0</log4j-slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
<!-- 'Provided'/Test Dependency Versions for this Project -->
@@ -199,9 +198,9 @@
</dependency>
<!-- Logging impl dependency, e.g for the tests or examples -->
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j-slf4j-version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index 00b456b..497d8da 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -103,8 +103,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/qpid-jms-client/src/test/resources/log4j2-test.properties b/qpid-jms-client/src/test/resources/simplelogger.properties
similarity index 54%
copy from qpid-jms-client/src/test/resources/log4j2-test.properties
copy to qpid-jms-client/src/test/resources/simplelogger.properties
index d597c51..e83e492 100644
--- a/qpid-jms-client/src/test/resources/log4j2-test.properties
+++ b/qpid-jms-client/src/test/resources/simplelogger.properties
@@ -16,30 +16,16 @@
# specific language governing permissions and limitations
# under the License.
#
+org.slf4j.simpleLogger.logFile=System.out
-name=ClientModuleTestPropertiesConfig
-status=warn
+org.slf4j.simpleLogger.defaultLogLevel=trace
-appender.console.type=Console
-appender.console.name=STDOUT
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+org.slf4j.simpleLogger.showDateTime=true
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss,SSS
-rootLogger.level=trace
-rootLogger.appenderRef.console.ref=STDOUT
+org.slf4j.simpleLogger.log.org.apache.qpid.jms=debug
-logger.jms.name=org.apache.qpid.jms
-logger.jms.level=debug
-
-logger.provider.name=org.apache.qpid.jms.provider
-logger.provider.level=trace
-
-logger.testpeer.name=org.apache.qpid.jms.test.testpeer
-logger.testpeer.level=trace
-
-# Calm down MiniKdc OpenDirectory
-logger.directory.name=org.apache.directory
-logger.directory.level=warn
-
-logger.jdbm.name=jdbm
-logger.jdbm.level=warn
+org.slf4j.simpleLogger.log.org.apache.qpid.jms.provider=trace
+org.slf4j.simpleLogger.log.org.apache.qpid.jms.test.testpeer=trace
+org.slf4j.simpleLogger.log.org.apache.directory=warn
+org.slf4j.simpleLogger.log.jdbm=warn
diff --git a/qpid-jms-discovery/pom.xml b/qpid-jms-discovery/pom.xml
index 32a7a5e..82b5784 100644
--- a/qpid-jms-discovery/pom.xml
+++ b/qpid-jms-discovery/pom.xml
@@ -53,8 +53,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
diff --git a/qpid-jms-examples/pom.xml b/qpid-jms-examples/pom.xml
index a6d59ec..71cb5ba 100644
--- a/qpid-jms-examples/pom.xml
+++ b/qpid-jms-examples/pom.xml
@@ -41,8 +41,8 @@
<!-- Provide a logging implementation to avoid
notice from SLF4J that none was found -->
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>
diff --git a/qpid-jms-examples/src/main/resources/log4j2.properties b/qpid-jms-examples/src/main/resources/simplelogger.properties
similarity index 68%
rename from qpid-jms-examples/src/main/resources/log4j2.properties
rename to qpid-jms-examples/src/main/resources/simplelogger.properties
index 252d11f..6a2754f 100644
--- a/qpid-jms-examples/src/main/resources/log4j2.properties
+++ b/qpid-jms-examples/src/main/resources/simplelogger.properties
@@ -16,17 +16,11 @@
# specific language governing permissions and limitations
# under the License.
#
+org.slf4j.simpleLogger.logFile=System.out
-name=ExamplesPropertiesConfig
-status=warn
+org.slf4j.simpleLogger.defaultLogLevel=info
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+org.slf4j.simpleLogger.showDateTime=true
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss,SSS
-rootLogger.level = info
-rootLogger.appenderRef.console.ref = STDOUT
-
-logger.qpid.name = org.apache.qpid.jms
-logger.qpid.level = WARN
+org.slf4j.simpleLogger.log.org.apache.qpid.jms=warn
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
index 0294c73..a78da17 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
@@ -67,8 +67,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2-test.properties b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2-test.properties
deleted file mode 100644
index 1812985..0000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2-test.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# 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.
-#
-
-name=ActiveMQInteropModuleTestPropertiesConfig
-status=warn
-
-appender.console.type=Console
-appender.console.name=STDOUT
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-
-rootLogger.level=info
-rootLogger.appenderRef.console.ref=STDOUT
-
-logger.jms.name=org.apache.qpid.jms
-logger.jms.level=debug
-
-logger.provider.name=org.apache.qpid.jms.provider
-logger.provider.level=trace
-
-logger.jmsframes.name=org.apache.qpid.jms.provider.amqp.FRAMES
-logger.jmsframes.level=info
-
-logger.activemq.name=org.apache.activemq
-logger.activemq.level=info
-
-logger.broker.name=org.apache.activemq.broker
-logger.broker.level=info
-
-logger.ws.name=org.apache.activemq.transport.ws
-logger.ws.level=debug
-
-logger.amqp.name=org.apache.activemq.transport.amqp
-logger.amqp.level=debug
-
-logger.frames.name=org.apache.activemq.transport.amqp.FRAMES
-logger.frames.level=info
diff --git a/qpid-jms-client/src/test/resources/log4j2-test.properties b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/simplelogger.properties
similarity index 53%
rename from qpid-jms-client/src/test/resources/log4j2-test.properties
rename to qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/simplelogger.properties
index d597c51..92e4375 100644
--- a/qpid-jms-client/src/test/resources/log4j2-test.properties
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/simplelogger.properties
@@ -16,30 +16,19 @@
# specific language governing permissions and limitations
# under the License.
#
+org.slf4j.simpleLogger.logFile=System.out
-name=ClientModuleTestPropertiesConfig
-status=warn
+org.slf4j.simpleLogger.defaultLogLevel=info
-appender.console.type=Console
-appender.console.name=STDOUT
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+org.slf4j.simpleLogger.showDateTime=true
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss,SSS
-rootLogger.level=trace
-rootLogger.appenderRef.console.ref=STDOUT
+org.slf4j.simpleLogger.log.org.apache.qpid.jms=debug
+org.slf4j.simpleLogger.log.org.apache.qpid.jms.provider=trace
+org.slf4j.simpleLogger.log.org.apache.qpid.jms.provider.amqp.FRAMES=info
-logger.jms.name=org.apache.qpid.jms
-logger.jms.level=debug
-
-logger.provider.name=org.apache.qpid.jms.provider
-logger.provider.level=trace
-
-logger.testpeer.name=org.apache.qpid.jms.test.testpeer
-logger.testpeer.level=trace
-
-# Calm down MiniKdc OpenDirectory
-logger.directory.name=org.apache.directory
-logger.directory.level=warn
-
-logger.jdbm.name=jdbm
-logger.jdbm.level=warn
+org.slf4j.simpleLogger.log.org.apache.activemq=info
+org.slf4j.simpleLogger.log.org.apache.activemq.broker=info
+org.slf4j.simpleLogger.log.org.apache.activemq.transport.ws=debug
+org.slf4j.simpleLogger.log.org.apache.activemq.transport.amqp=debug
+org.slf4j.simpleLogger.log.org.apache.activemq.transport.amqp.FRAMES=info
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-jms] 02/02: QPIDJMS-559: update to slf4j 1.7.32
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit f04cf5bb894bb1af55abcb0d599337f5a6b65bb5
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Dec 20 16:41:02 2021 +0000
QPIDJMS-559: update to slf4j 1.7.32
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3e524f6..9ed6793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<!-- Dependency Versions for this Project -->
<proton-version>0.33.10</proton-version>
<netty-version>4.1.72.Final</netty-version>
- <slf4j-version>1.7.30</slf4j-version>
+ <slf4j-version>1.7.32</slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
<!-- 'Provided'/Test Dependency Versions for this Project -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org