This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-12118 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit dc6e0f97ac641bb8e1d6c8b595f05ed3ea926c4a Author: Julian Reschke <[email protected]> AuthorDate: Fri Feb 27 20:12:54 2026 +0100 OAK-12118: LogCustomizer: avoid logback signatures --- .../org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java | 2 +- .../jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java | 3 +-- .../org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java | 10 ---------- .../apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java | 3 +-- .../jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java | 2 +- .../apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java | 2 +- .../index/property/OrderedPropertyIndexEditorProviderTest.java | 3 +-- .../index/property/OrderedPropertyIndexProviderTest.java | 3 +-- .../oak/plugins/index/property/PropertyIndexTest.java | 5 ++--- .../oak/plugins/blob/datastore/DataStoreTrackerGCTest.java | 2 +- .../org/apache/jackrabbit/oak/IndexCostEvaluationTest.java | 2 +- .../org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java | 4 +--- .../oak/jcr/observation/ObservationQueueFullWarnTest.java | 2 +- .../index/lucene/AsyncIndexStatsUpdateCallbackTest.java | 2 +- .../plugins/index/lucene/IndexlaneRepositoryTraversalTest.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java | 2 +- .../index/lucene/directory/ActiveDeletedBlobCollectorTest.java | 2 +- .../index/lucene/directory/BufferedOakDirectoryTest.java | 3 +-- .../index/lucene/directory/OakStreamingIndexFileTest.java | 2 +- .../index/lucene/dynamicBoost/LuceneDynamicBoostTest.java | 2 +- .../oak/plugins/index/lucene/hybrid/FacetCacheTest.java | 2 +- .../oak/plugins/index/lucene/hybrid/HybridIndexTest.java | 2 +- .../index/lucene/invalidData/InvalidIndexDefinitionTest.java | 3 +-- .../oak/indexversion/ElasticPurgeOldIndexVersionTest.java | 2 +- .../oak/indexversion/LucenePurgeOldIndexVersionTest.java | 3 +-- .../jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java | 2 +- .../org/apache/jackrabbit/oak/run/DataStoreCommandTest.java | 2 +- .../oak/plugins/index/elastic/ElasticPropertyIndexTest.java | 2 +- .../query/inference/ElasticInferenceUsingConfigTest.java | 2 +- .../elastic/query/inference/InferenceServiceMetricsTest.java | 2 +- .../jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java | 2 +- .../oak/plugins/document/BulkCreateOrUpdateClusterTest.java | 3 +-- .../jackrabbit/oak/plugins/document/DisableBranchesTest.java | 3 +-- .../oak/plugins/document/DocumentStoreStatsTest.java | 4 ++-- .../jackrabbit/oak/plugins/document/MongoBlobGCTest.java | 2 +- .../oak/plugins/document/VersionGarbageCollectorLogTest.java | 3 +-- .../document/mongo/MongoDocumentStoreQueryWarningTest.java | 2 +- .../oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java | 3 +-- .../document/rdb/RDBDocumentStoreSchemaUpgradeTest.java | 3 +-- .../jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java | 2 +- .../jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java | 2 +- 42 files changed, 43 insertions(+), 68 deletions(-) diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java index 5cb627eb0c..7cfb5be920 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java @@ -50,7 +50,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.atomic.AtomicReference; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -86,6 +85,7 @@ import org.junit.rules.TemporaryFolder; import org.mockito.internal.util.collections.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; /** * Generic class for BlobGC tests which uses custom MemoryNodeStore as well as a memory NodeStore. diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java index 9e89fc32f1..cf207ec510 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java @@ -40,8 +40,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import ch.qos.logback.classic.Level; - import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.FileIOUtils; @@ -60,6 +58,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java index a935751a65..373a7a9512 100644 --- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java +++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java @@ -91,21 +91,11 @@ public class LogCustomizer { this.name = name; } - public LogCustomizerBuilder enable(Level level) { - this.enableLevel = level; - return this; - } - public LogCustomizerBuilder enable(org.slf4j.event.Level level) { this.enableLevel = fromSlf4jLevel(level); return this; } - public LogCustomizerBuilder filter(Level level) { - this.filterLevel = level; - return this; - } - public LogCustomizerBuilder filter(org.slf4j.event.Level level) { this.filterLevel = fromSlf4jLevel(level); return this; diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java index 0aebe4532e..b58bbaf453 100644 --- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java +++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizerTest.java @@ -29,8 +29,7 @@ import java.util.List; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; /** * Tests for the LogCustomizer class diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java index 825680c09d..bf9969b788 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java @@ -97,8 +97,8 @@ import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Ignore; import org.junit.Test; +import org.slf4j.event.Level; -import ch.qos.logback.classic.Level; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; public class AsyncIndexUpdateTest { diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java index 03484055f4..8860570d2a 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java @@ -49,7 +49,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -85,6 +84,7 @@ import org.hamcrest.core.IsCollectionContaining; import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Test; +import org.slf4j.event.Level; public class IndexUpdateTest { diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java index e594b0d9ce..d51c60127f 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProviderTest.java @@ -41,8 +41,7 @@ import org.apache.jackrabbit.oak.spi.commit.EditorHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class OrderedPropertyIndexEditorProviderTest { private final CommitHook hook = new EditorHook(new IndexUpdateProvider( diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java index bd63ed59cb..30a52f2e7f 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexProviderTest.java @@ -32,8 +32,7 @@ import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class OrderedPropertyIndexProviderTest extends AbstractQueryTest { private final LogCustomizer custom = LogCustomizer diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java index 7296028873..3dc4795915 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java @@ -79,13 +79,12 @@ import org.junit.Assert; import org.junit.Test; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.spi.FilterReply; - +import org.slf4j.event.Level; /** * Test the Property2 index mechanism. @@ -1143,7 +1142,7 @@ public class PropertyIndexTest { @Override public FilterReply decide(ILoggingEvent event) { - if (event.getLevel().isGreaterOrEqual(Level.WARN) + if (event.getLevel().toInt() >= Level.WARN.toInt() && event.getMessage().contains("Traversed")) { return FilterReply.ACCEPT; } else { diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java index aa768aca47..6aa812745b 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java @@ -30,7 +30,6 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.ScheduledFuture; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -60,6 +59,7 @@ import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import static java.lang.String.valueOf; import static java.util.concurrent.Executors.newSingleThreadExecutor; diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java index f09e2eb21b..825a733355 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/IndexCostEvaluationTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.api.JackrabbitRepository; import org.apache.jackrabbit.api.JackrabbitSession; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; @@ -35,6 +34,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import javax.jcr.Node; import javax.jcr.Repository; diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java index b5fe06ba21..717cfed5cc 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java @@ -36,9 +36,7 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - -import ch.qos.logback.classic.Level; - +import org.slf4j.event.Level; @RunWith(Parameterized.class) public class ConflictResolutionTest extends AbstractRepositoryTest { diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java index 404eca8708..10ff93fcab 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.jcr.observation; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.api.JackrabbitRepository; import org.apache.jackrabbit.api.observation.JackrabbitEvent; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -35,6 +34,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java index cb8349bb5d..41be8c64e2 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/AsyncIndexStatsUpdateCallbackTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; @@ -39,6 +38,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +import org.slf4j.event.Level; import java.io.IOException; import java.util.List; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java index c8d163d93b..fb00a90f0b 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexlaneRepositoryTraversalTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -47,6 +46,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import java.util.List; import java.util.Properties; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java index 9ebd35c157..e309f0dad4 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/InvalidIndexTest.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.index.lucene; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.*; @@ -42,6 +41,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java index 23e9d1183c..f0dce5065b 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java @@ -60,7 +60,6 @@ import java.util.Set; import javax.jcr.PropertyType; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.api.Blob; @@ -115,6 +114,7 @@ import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Assert; import org.junit.Test; +import org.slf4j.event.Level; @SuppressWarnings("ConstantConditions") public class LuceneIndexTest { diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java index 324fde77c7..9a0882fb99 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java @@ -45,7 +45,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.testing.CIHelper; @@ -64,6 +63,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.internal.util.collections.Sets; +import org.slf4j.event.Level; public class ActiveDeletedBlobCollectorTest { @Rule diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java index 1549b1d3f0..78c152deab 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectoryTest.java @@ -23,8 +23,6 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; -import ch.qos.logback.classic.Level; - import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.collections.SetUtils; @@ -38,6 +36,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.junit.Test; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.BufferedOakDirectory.DELETE_THRESHOLD_UNTIL_REOPEN; import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.BufferedOakDirectory.ENABLE_WRITING_SINGLE_BLOB_INDEX_FILE_PARAM; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java index b925cfa758..6f8c16fb72 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFileTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.directory; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; @@ -27,6 +26,7 @@ import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.slf4j.event.Level; import java.io.IOException; import java.io.InputStream; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java index 1a745bced6..69eb5b36e5 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/dynamicBoost/LuceneDynamicBoostTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.dynamicBoost; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -44,6 +43,7 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java index a69525864f..789d3db57b 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/FacetCacheTest.java @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; @@ -62,6 +61,7 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import javax.jcr.GuestCredentials; import javax.jcr.Repository; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java index fcad988f6e..5fd9cdf164 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java @@ -37,7 +37,6 @@ import javax.management.AttributeNotFoundException; import javax.management.MBeanServer; import javax.management.ObjectName; -import ch.qos.logback.classic.Level; import org.apache.commons.exec.CommandLine; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.PumpStreamHandler; @@ -98,6 +97,7 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.api.QueryEngine.NO_BINDINGS; import static org.apache.jackrabbit.oak.spi.mount.Mounts.defaultMountInfoProvider; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java index 2fc3c9bf44..17c665fc7b 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java @@ -52,8 +52,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.lucene.codecs.Codec; import org.hamcrest.core.IsCollectionContaining; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class InvalidIndexDefinitionTest extends AbstractQueryTest { diff --git a/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java b/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java index 6922d3240a..f7e4e9f511 100644 --- a/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java +++ b/oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.indexversion; -import ch.qos.logback.classic.Level; import co.elastic.clients.elasticsearch._types.ExpandWildcard; import co.elastic.clients.elasticsearch.cat.IndicesResponse; import co.elastic.clients.elasticsearch.cat.indices.IndicesRecord; @@ -39,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.Assert; import org.junit.Test; +import org.slf4j.event.Level; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java index 8bfca47635..3ae96a1687 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java @@ -53,8 +53,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.Assert; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class LucenePurgeOldIndexVersionTest extends LuceneAbstractIndexCommandTest { private final static String FOO1_INDEX_PATH = "/oak:index/fooIndex1"; diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java index 0b19ebd914..c7f98b71e3 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionIT.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.indexversion; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.composite.blueGreen.IndexUtils; import org.apache.jackrabbit.oak.composite.blueGreen.Persistence; @@ -29,6 +28,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.slf4j.event.Level; import java.io.File; import java.io.IOException; diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java index 5bdc3fa0b8..59a34782ce 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java @@ -40,7 +40,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import ch.qos.logback.classic.Level; import org.apache.commons.lang3.StringUtils; import joptsimple.OptionException; import org.apache.commons.io.FileUtils; @@ -95,6 +94,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort; diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java index 6417986609..895d83f136 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.elastic; -import ch.qos.logback.classic.Level; import org.apache.commons.lang3.RandomStringUtils; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Tree; @@ -33,6 +32,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.slf4j.event.Level; import java.util.List; diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java index 13b0c3f1b5..6505527872 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/ElasticInferenceUsingConfigTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.elastic.query.inference; -import ch.qos.logback.classic.Level; import co.elastic.clients.elasticsearch._types.ElasticsearchException; import co.elastic.clients.elasticsearch.core.SearchRequest; import co.elastic.clients.elasticsearch.core.SearchResponse; @@ -58,6 +57,7 @@ import org.junit.Rule; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import java.io.IOException; import java.net.URL; diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java index 2ecf579b0e..53979db4ff 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/inference/InferenceServiceMetricsTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.elastic.query.inference; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; @@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.stats.TimerStats; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import java.util.List; import java.util.UUID; diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java index 09e8ee82a5..cf1852ff9e 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java @@ -41,7 +41,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import ch.qos.logback.classic.Level; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; import org.apache.jackrabbit.oak.api.Blob; @@ -75,6 +74,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; /** * Tests for SegmentNodeStore DataStore GC diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java index 2297b45e1f..33256cd8cf 100755 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java @@ -36,8 +36,7 @@ import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; public class BulkCreateOrUpdateClusterTest extends AbstractMultiDocumentStoreTest { diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java index ae505a6049..82f774a2df 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableBranchesTest.java @@ -33,8 +33,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; import static org.hamcrest.CoreMatchers.everyItem; import static org.hamcrest.CoreMatchers.is; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java index 6a7ad6ce40..779d20916b 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.plugins.metric.MetricStatisticsProvider; import org.junit.After; import org.junit.Test; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL; import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; @@ -295,6 +295,6 @@ public class DocumentStoreStatsTest { private static void enableLevel(String logName, Level level){ ((LoggerContext)LoggerFactory.getILoggerFactory()) - .getLogger(logName).setLevel(level); + .getLogger(logName).setLevel(ch.qos.logback.classic.Level.valueOf(level.toString())); } } \ No newline at end of file diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java index 6000a95073..0882046dfe 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java @@ -33,7 +33,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import ch.qos.logback.classic.Level; import org.apache.commons.lang3.StringUtils; import com.mongodb.BasicDBObject; import com.mongodb.ReadPreference; @@ -67,6 +66,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java index 2a59d69a92..3a225f368f 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorLogTest.java @@ -32,8 +32,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.Rule; import org.junit.Test; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java index db55983559..9bdc02adc6 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreQueryWarningTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.document.mongo; -import ch.qos.logback.classic.Level; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoDatabase; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; @@ -31,6 +30,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; +import org.slf4j.event.Level; import java.util.concurrent.TimeUnit; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java index 985bd763ff..8845942b28 100755 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java @@ -58,8 +58,7 @@ import org.junit.Test; import org.junit.rules.TestName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; /** * Tests checking certain JDBC related features. diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java index abd2eac742..90a3c457cd 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java @@ -46,8 +46,7 @@ import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; - -import ch.qos.logback.classic.Level; +import org.slf4j.event.Level; @RunWith(Parameterized.class) public class RDBDocumentStoreSchemaUpgradeTest { diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java index 066a0619b8..0e532dbaa1 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureToInlinedTest.java @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.upgrade.cli.blob; import java.io.IOException; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.plugins.blob.UploadStagingCache; import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest; @@ -30,6 +29,7 @@ import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContai import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import static org.junit.Assert.assertEquals; diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java index c32163fe75..2faa1f274b 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToInlinedTest.java @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.upgrade.cli.blob; import java.io.IOException; -import ch.qos.logback.classic.Level; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.plugins.blob.UploadStagingCache; import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest; @@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContai import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.slf4j.event.Level; import static org.junit.Assert.assertEquals;
