This is an automated email from the ASF dual-hosted git repository.
enapps-enorman pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-commons.git
The following commit(s) were added to refs/heads/master by this push:
new 686b133 SLING-13226 Migrate test logging from log4j to logback (#10)
686b133 is described below
commit 686b133906c0fb11f8f6664de787aed1c04f1840
Author: Eric Norman <[email protected]>
AuthorDate: Sat May 30 12:09:02 2026 -0700
SLING-13226 Migrate test logging from log4j to logback (#10)
---
pom.xml | 27 +++++++++++------
.../providers/base/TestMinEventDelayHandler.java | 9 +++---
.../providers/base/TestOakViewStateManager.java | 8 ++---
.../providers/base/TestSlowViewStateManager.java | 8 ++---
.../providers/base/TestViewStateManager.java | 13 ++++----
src/test/resources/log4j.properties | 26 ----------------
src/test/resources/logback-test.xml | 35 ++++++++++++++++++++++
7 files changed, 71 insertions(+), 55 deletions(-)
diff --git a/pom.xml b/pom.xml
index e4a7544..fdffd4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
<version>48</version>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.discovery.commons</artifactId>
@@ -44,6 +45,8 @@
<sling.java.version>11</sling.java.version>
<jackrabbit.version>2.14.3</jackrabbit.version>
<oak.version>1.62.0</oak.version>
+ <surefire.maxmem>-Xmx2048m</surefire.maxmem>
+ <surefire.argline>${surefire.maxmem}</surefire.argline>
</properties>
<build>
@@ -68,7 +71,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <argLine>-Xmx2048m</argLine>
+ <argLine>${surefire.argline}</argLine>
<excludedGroups>${sling.excluded.surefire.groups}</excludedGroups>
</configuration>
</plugin>
@@ -185,15 +188,10 @@
<version>4.4.0</version>
<scope>test</scope>
</dependency>
+ <!-- using logback under slf4j to allow fine-grained logging config
(see src/test/resources/logback-test.xml) -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
<version>1.2.13</version>
<scope>test</scope>
</dependency>
@@ -223,4 +221,15 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <!-- override to pass the extra jacoco arguments to surefire-->
+ <profile>
+ <id>jacoco-report</id>
+ <properties>
+ <surefire.argline>${surefire.maxmem}
${jacoco.command}</surefire.argline>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
diff --git
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java
index c88cd55..3ea3601 100644
---
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java
+++
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestMinEventDelayHandler.java
@@ -27,13 +27,10 @@ import java.util.Random;
import java.util.UUID;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.log4j.Level;
-import org.apache.log4j.spi.RootLogger;
import org.apache.sling.discovery.commons.providers.BaseTopologyView;
import org.apache.sling.discovery.commons.providers.DefaultClusterView;
import org.apache.sling.discovery.commons.providers.DummyTopologyView;
import org.apache.sling.discovery.commons.providers.EventHelper;
-import org.apache.sling.discovery.commons.providers.base.ViewStateManagerImpl;
import org.apache.sling.discovery.commons.providers.spi.ClusterSyncService;
import org.junit.After;
import org.junit.Before;
@@ -41,6 +38,8 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import ch.qos.logback.classic.Level;
+
public class TestMinEventDelayHandler {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -75,7 +74,7 @@ public class TestMinEventDelayHandler {
sds = new DummyDiscoveryService();
mgr.installMinEventDelayHandler(sds, scheduler, 1);
- final org.apache.log4j.Logger discoveryLogger =
RootLogger.getLogger("org.apache.sling.discovery");
+ final ch.qos.logback.classic.Logger discoveryLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery");
logLevel = discoveryLogger.getLevel();
discoveryLogger.setLevel(Level.INFO); // changed from Level.DEBUG
}
@@ -84,7 +83,7 @@ public class TestMinEventDelayHandler {
public void teardown() throws Exception {
mgr = null;
defaultRandom= null;
- final org.apache.log4j.Logger discoveryLogger =
RootLogger.getLogger("org.apache.sling.discovery");
+ final ch.qos.logback.classic.Logger discoveryLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery");
discoveryLogger.setLevel(logLevel);
}
diff --git
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestOakViewStateManager.java
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestOakViewStateManager.java
index 485a53c..7c27fb1 100644
---
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestOakViewStateManager.java
+++
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestOakViewStateManager.java
@@ -26,8 +26,6 @@ import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.log4j.Level;
-import org.apache.log4j.spi.RootLogger;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.discovery.DiscoveryService;
@@ -51,6 +49,8 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import ch.qos.logback.classic.Level;
+
public class TestOakViewStateManager implements DiscoveryService {
protected static final Logger logger =
LoggerFactory.getLogger(TestOakViewStateManager.class);
@@ -88,7 +88,7 @@ public class TestOakViewStateManager implements
DiscoveryService {
// nothing to cancel, we're auto-run
}
});
- final org.apache.log4j.Logger discoveryLogger =
RootLogger.getLogger("org.apache.sling.discovery");
+ final ch.qos.logback.classic.Logger discoveryLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery");
logLevel = discoveryLogger.getLevel();
discoveryLogger.setLevel(Level.INFO);
@@ -107,7 +107,7 @@ public class TestOakViewStateManager implements
DiscoveryService {
mgr.handleDeactivated();
}
mgr = null;
- final org.apache.log4j.Logger discoveryLogger =
RootLogger.getLogger("org.apache.sling.discovery");
+ final ch.qos.logback.classic.Logger discoveryLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery");
discoveryLogger.setLevel(logLevel);
logger.info("teardown: end");
}
diff --git
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestSlowViewStateManager.java
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestSlowViewStateManager.java
index 93e2cb6..effccf0 100644
---
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestSlowViewStateManager.java
+++
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestSlowViewStateManager.java
@@ -26,13 +26,14 @@ import java.util.UUID;
import java.util.concurrent.Semaphore;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
import org.apache.sling.discovery.TopologyEvent;
import org.apache.sling.discovery.commons.providers.DefaultClusterView;
import org.apache.sling.discovery.commons.providers.DummyTopologyView;
import org.apache.sling.discovery.commons.providers.EventHelper;
import org.junit.Test;
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.Level;
public class TestSlowViewStateManager extends TestViewStateManager {
@@ -45,8 +46,7 @@ public class TestSlowViewStateManager extends
TestViewStateManager {
@Test
public void testClusterSyncService_withConcurrency() throws Exception {
- final org.apache.log4j.Logger commonsLogger =
LogManager.getRootLogger().getLogger("org.apache.sling.discovery.commons.providers");
- final org.apache.log4j.Level logLevel = commonsLogger.getLevel();
+ final ch.qos.logback.classic.Logger commonsLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery.commons.providers");
commonsLogger.setLevel(Level.INFO); // change here to DEBUG in case of
issues with this test
final Semaphore serviceSemaphore = new Semaphore(0);
final Semaphore testSemaphore = new Semaphore(0);
diff --git
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java
index c48a115..1182e85 100644
---
a/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java
+++
b/src/test/java/org/apache/sling/discovery/commons/providers/base/TestViewStateManager.java
@@ -33,8 +33,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.log4j.Level;
-import org.apache.log4j.spi.RootLogger;
import org.apache.sling.discovery.ClusterView;
import org.apache.sling.discovery.DiscoveryService;
import org.apache.sling.discovery.InstanceDescription;
@@ -53,6 +51,8 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import ch.qos.logback.classic.Level;
+
public class TestViewStateManager {
protected static final Logger logger =
LoggerFactory.getLogger(TestViewStateManager.class);
@@ -112,7 +112,7 @@ public class TestViewStateManager {
}
});
defaultRandom = new Random(1234123412); // I want randomness yes, but
deterministic, for some methods at least
- final org.apache.log4j.Logger discoveryLogger =
RootLogger.getLogger("org.apache.sling.discovery");
+ final ch.qos.logback.classic.Logger discoveryLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery");
logLevel = discoveryLogger.getLevel();
discoveryLogger.setLevel(Level.INFO);
}
@@ -125,7 +125,7 @@ public class TestViewStateManager {
}
mgr = null;
defaultRandom= null;
- final org.apache.log4j.Logger discoveryLogger =
RootLogger.getLogger("org.apache.sling.discovery");
+ final ch.qos.logback.classic.Logger discoveryLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery");
discoveryLogger.setLevel(logLevel);
}
@@ -568,8 +568,7 @@ public class TestViewStateManager {
@Test
public void testClusterSyncService_noConcurrency() throws Exception {
- final org.apache.log4j.Logger commonsLogger =
RootLogger.getLogger("org.apache.sling.discovery.commons.providers");
-// final org.apache.log4j.Level logLevel = commonsLogger.getLevel();
+ final ch.qos.logback.classic.Logger commonsLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery.commons.providers");
commonsLogger.setLevel(Level.INFO); // change here to DEBUG in case of
issues with this test
final Semaphore serviceSemaphore = new Semaphore(0);
final ReentrantLock lock = new ReentrantLock();
@@ -631,7 +630,7 @@ public class TestViewStateManager {
@Test
public void testOnlyDiffersInProperties() throws Exception {
- final org.apache.log4j.Logger discoveryLogger =
RootLogger.getLogger("org.apache.sling.discovery");
+ final ch.qos.logback.classic.Logger discoveryLogger =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger("org.apache.sling.discovery");
discoveryLogger.setLevel(Level.INFO); // changed from Level.DEBUG
logger.info("testOnlyDiffersInProperties: start");
final String slingId1 = UUID.randomUUID().toString();
diff --git a/src/test/resources/log4j.properties
b/src/test/resources/log4j.properties
deleted file mode 100644
index ec467a0..0000000
--- a/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,26 +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.
-
-log4j.rootLogger=INFO, stdout
-
-log4j.logger.org.apache.jackrabbit.core.TransientRepository=WARN
-#log4j.logger.org.apache.sling.discovery.impl=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-#log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss} *%-5p*
[%t] %c{1}: %m (%F, line %L)\n
-log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss.SSS}
*%-5p* [%t] %c{1}: %m\n
diff --git a/src/test/resources/logback-test.xml
b/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..29ccf2e
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,35 @@
+<?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>
+ <property name="LOG_PATTERN" value="%d{dd.MM.yyyy HH:mm:ss.SSS} *%-5p* [%t]
%c{1}: %m"/>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${LOG_PATTERN}</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.apache.jackrabbit.core.TransientRepository" level="WARN"/>
+ <!-- <logger name="org.apache.sling.discovery.impl" level="DEBUG"/> -->
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT"/>
+ </root>
+</configuration>
