This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new d341ee4 Update logging-parent 3 -> 4 and log4j 2.14.1-S -> 2.17.2-S.
d341ee4 is described below
commit d341ee4e9ea4f14ee3a87ff42a07dd2a7b76538e
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Jan 1 16:32:47 2022 -0500
Update logging-parent 3 -> 4 and log4j 2.14.1-S -> 2.17.2-S.
Update tests for JNDI restrictions.
---
log4j-server/pom.xml | 2 +-
.../mom/activemq/ActiveMqBrokerServiceRule.java | 10 ++++++----
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 19 ++++++++++++++-----
pom.xml | 15 ++++++++-------
4 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index df8c100..78ac3de 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-tools</artifactId>
- <version>2.14.1-SNAPSHOT</version>
+ <version>2.17.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-server</artifactId>
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
index a3116ac..9188234 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/activemq/ActiveMqBrokerServiceRule.java
@@ -21,6 +21,7 @@ import org.apache.activemq.broker.BrokerService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.TestMarkers;
+import org.apache.logging.log4j.status.StatusLogger;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -31,9 +32,10 @@ import org.junit.runners.model.Statement;
*/
public class ActiveMqBrokerServiceRule implements TestRule {
- static final Logger logger =
LogManager.getLogger(ActiveMqBrokerServiceRule.class);
+ // Use the StatusLogger to avoid initializing a logger context before
other rules run!
+ private static final StatusLogger LOGGER = StatusLogger.getLogger();
- /**
+ /**
* Apache Active MQ uses this property name to lookup which port to use
to
* connect to a broker.
*/
@@ -58,13 +60,13 @@ public class ActiveMqBrokerServiceRule implements TestRule {
public void evaluate() throws Throwable {
final BrokerService broker =
ActiveMqBrokerServiceHelper.startBrokerService(brokerName, brokerUrlString,
Integer.parseInt(System.getProperty(portPropertyName)));
- logger.debug(TestMarkers.TEST_RULE_LIFE_CYCLE,
"{} started Apache Active MQ {}",
+ LOGGER.debug(TestMarkers.TEST_RULE_LIFE_CYCLE,
"{} started Apache Active MQ {}",
this.getClass().getSimpleName(), this);
try {
base.evaluate();
} finally {
ActiveMqBrokerServiceHelper.stopBrokerService(broker);
-
logger.debug(TestMarkers.TEST_RULE_LIFE_CYCLE, "{} stopped Apache Active MQ {}",
+
LOGGER.debug(TestMarkers.TEST_RULE_LIFE_CYCLE, "{} stopped Apache Active MQ {}",
this.getClass().getSimpleName(), this);
}
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
index ba6ea87..c4b7804 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
@@ -19,6 +19,8 @@ package org.apache.logging.log4j.server.mom.jms;
import org.apache.logging.log4j.server.mom.activemq.ActiveMqBrokerServiceRule;
import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
+import org.apache.logging.log4j.test.SystemPropertyTestRule;
+import org.junit.AfterClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -28,15 +30,22 @@ public class JmsQueueReceiverTest {
private static final AvailablePortSystemPropertyTestRule portRule =
AvailablePortSystemPropertyTestRule
.create(ActiveMqBrokerServiceRule.PORT_PROPERTY_NAME);
- private static final ActiveMqBrokerServiceRule activeMqBrokerServiceRule =
new ActiveMqBrokerServiceRule(
- JmsQueueReceiverTest.class.getName(), portRule.getName());
+ @AfterClass
+ public static void afterClass() throws Exception {
+ System.clearProperty("log4j2.enableJndiJms");
+ }
@ClassRule
- public static RuleChain ruleChain = RuleChainFactory.create(portRule,
activeMqBrokerServiceRule);
+ public static RuleChain ruleChain = RuleChainFactory.create(
+ // @formatter:off
+ SystemPropertyTestRule.create("log4j2.enableJndiJms", "true"),
+ portRule,
+ new
ActiveMqBrokerServiceRule(JmsQueueReceiverTest.class.getName(),
portRule.getName()));
+ // @formatter:off
@Test
public void testMain() throws Exception {
- new JmsQueueReceiver().doMain(false, new String[] {
"org.apache.activemq.jndi.ActiveMQInitialContextFactory",
- "tcp://localhost:" + portRule.getPort(), "testq", "admin",
"admin", "queue.testq", "testq" });
+ new JmsQueueReceiver().doMain(false, new String[] {
"org.apache.activemq.jndi.ActiveMQInitialContextFactory", "tcp://localhost:" +
portRule.getValue(),
+ "testq", "admin", "admin", "queue.testq", "testq" });
}
}
diff --git a/pom.xml b/pom.xml
index ead5d01..ced0aad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,11 @@
<artifactId>log4j-tools</artifactId>
<packaging>pom</packaging>
<name>Apache Log4j 2 Tools</name>
- <version>2.14.1-SNAPSHOT</version>
+ <version>2.17.2-SNAPSHOT</version>
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>3</version>
+ <version>4</version>
<relativePath />
</parent>
<description>Apache Log4j 2 Tools</description>
@@ -172,12 +172,13 @@
<properties>
<!-- make sure to update these for each release! -->
<log4jParentDir>${basedir}</log4jParentDir>
- <Log4jReleaseVersion>2.14.0</Log4jReleaseVersion>
+ <Log4jReleaseVersion>2.17.2</Log4jReleaseVersion>
<!--<Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>-->
<!--<Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>-->
<Log4jReleaseManager>Matt Sicker</Log4jReleaseManager>
<Log4jReleaseKey>FA1C814D</Log4jReleaseKey>
<!-- note that any properties you want available in velocity templates
must not use periods! -->
+ <log4j2Version>2.17.2-SNAPSHOT</log4j2Version>
<jackson2Version>2.13.1</jackson2Version>
<compiler.plugin.version>3.8.1</compiler.plugin.version>
<pmd.plugin.version>3.7</pmd.plugin.version>
@@ -225,24 +226,24 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${project.version}</version>
+ <version>${log4j2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${project.version}</version>
+ <version>${log4j2Version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${project.version}</version>
+ <version>${log4j2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${project.version}</version>
+ <version>${log4j2Version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
