diff --git a/assemble/pom.xml b/assemble/pom.xml index 78658c3e05c..d24a6081200 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -302,11 +302,6 @@ log4j-core true - - org.apache.logging.log4j - log4j-jcl - true - org.apache.logging.log4j log4j-jul diff --git a/core/pom.xml b/core/pom.xml index 57c8c425b41..9822afe1b81 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -114,18 +114,13 @@ hadoop-client-api + org.apache.logging.log4j log4j-1.2-api org.apache.thrift libthrift - - - org.apache.httpcomponents - httpcore - - org.apache.zookeeper @@ -148,24 +143,25 @@ snakeyaml - org.apache.hadoop - hadoop-client-runtime - runtime - - - + biz.aQute.bnd biz.aQute.bnd.annotation - test + provided + + + + org.apache.logging.log4j + log4j-api + provided org.apache.hadoop - hadoop-client-minicluster - test + hadoop-client-runtime + runtime - org.apache.logging.log4j - log4j-api + org.apache.hadoop + hadoop-client-minicluster test diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java index 7c1bbf07cba..088a0655c4d 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java @@ -502,7 +502,9 @@ public void initialize(InputSplit inSplit, JobConf job) throws IOException { } if (isIsolated) { log.info("Creating isolated scanner"); - scanner = new IsolatedScanner(scanner); + @SuppressWarnings("resource") + var wrapped = new IsolatedScanner(scanner); + scanner = wrapped; } if (usesLocalIterators) { log.info("Using local iterators"); diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java index bfbad1198e0..432471334b3 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java @@ -517,7 +517,9 @@ public void initialize(InputSplit inSplit, TaskAttemptContext attempt) throws IO } if (isIsolated) { log.info("Creating isolated scanner"); - scanner = new IsolatedScanner(scanner); + @SuppressWarnings("resource") + var wrapped = new IsolatedScanner(scanner); + scanner = wrapped; } if (usesLocalIterators) { log.info("Using local iterators"); diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java b/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java index 1d63fbf25d1..f3365c75c1b 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java @@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.metadata.schema.MetadataSchema; -import org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection; import org.apache.accumulo.core.metadata.schema.MetadataSchema.ScanServerFileReferenceSection; import org.apache.accumulo.core.util.UuidUtil; import org.apache.hadoop.fs.Path; @@ -38,7 +37,9 @@ public class ScanServerRefTabletFile extends TabletFile { @SuppressWarnings("deprecation") - private static final String OLD_PREFIX = OldScanServerFileReferenceSection.getRowPrefix(); + private static final String OLD_PREFIX = + org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection + .getRowPrefix(); private final String prefix; private final Value NULL_VALUE = new Value(new byte[0]); private final Text serverAddress; diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java index b9440ee9bbf..2325c086a93 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java @@ -195,7 +195,9 @@ public void initialize(InputSplit inSplit, JobConf job) throws IOException { } if (isIsolated) { log.info("Creating isolated scanner"); - scanner = new IsolatedScanner(scanner); + @SuppressWarnings("resource") + var wrapped = new IsolatedScanner(scanner); + scanner = wrapped; } if (usesLocalIterators) { log.info("Using local iterators"); diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java index dc614d61c43..66445e62cdf 100644 --- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java +++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java @@ -214,7 +214,9 @@ public void initialize(InputSplit inSplit, TaskAttemptContext attempt) throws IO } if (isIsolated) { log.info("Creating isolated scanner"); - scanner = new IsolatedScanner(scanner); + @SuppressWarnings("resource") + var wrapped = new IsolatedScanner(scanner); + scanner = wrapped; } if (usesLocalIterators) { log.info("Using local iterators"); diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 6a17606475e..7a013b402ce 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -128,11 +128,6 @@ curator-test test - - org.apache.logging.log4j - log4j-1.2-api - test - org.apache.logging.log4j log4j-slf4j2-impl diff --git a/pom.xml b/pom.xml index 463fd2944f8..16de14b1635 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ commons-logging commons-logging - 1.2 + 1.3.3 @@ -531,13 +531,6 @@ org.apache.thrift libthrift ${version.thrift} - - - - org.apache.httpcomponents - httpclient - - org.apache.zookeeper @@ -1039,7 +1032,7 @@ - + ch.qos.logback:* ch.qos.reload4j:* log4j:* diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java index ed531167ca4..773ded64031 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java @@ -61,7 +61,6 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection; import org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection.SkewedKeyValue; import org.apache.accumulo.core.metadata.schema.MetadataSchema.ExternalCompactionSection; -import org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection; import org.apache.accumulo.core.metadata.schema.MetadataSchema.ScanServerFileReferenceSection; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.BulkFileColumnFamily; import org.apache.accumulo.core.security.Authorizations; @@ -363,7 +362,8 @@ public Stream getScanServerFileReferences() { BatchScanner scanner = context.createBatchScanner(DataLevel.USER.metaTable(), Authorizations.EMPTY); scanner.setRanges(Set.of(ScanServerFileReferenceSection.getRange(), - OldScanServerFileReferenceSection.getRange())); + org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection + .getRange())); return StreamSupport.stream(scanner.spliterator(), false) .map(e -> new ScanServerRefTabletFile(e.getKey())); } catch (TableNotFoundException e) { diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java index 15322bc495c..b1fcb8fa835 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java @@ -266,9 +266,9 @@ public DistributionStatisticConfig configure(Meter.Id id, } } + // support for org.apache.accumulo.core.metrics.MeterRegistryFactory can be removed in 3.1 @VisibleForTesting - @SuppressWarnings({"deprecation", - "support for org.apache.accumulo.core.metrics.MeterRegistryFactory can be removed in 3.1"}) + @SuppressWarnings("deprecation") static MeterRegistry getRegistryFromFactory(final String factoryName, final ServerContext context) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException { diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java index 204e536c934..557c7891415 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java @@ -242,7 +242,7 @@ private StatusSummary getCompactorHosts(final ZooReader zooReader, final String Map> hostsByGroups = new TreeMap<>(); // get group names - Result> queueNodes = readNodeNames(zooReader, zRootPath); + Result> queueNodes = readNodeNames(zooReader, zRootPath); errors.addAndGet(queueNodes.getErrorCount()); Set queues = new TreeSet<>(queueNodes.getHosts()); @@ -265,7 +265,7 @@ private StatusSummary getCompactorHosts(final ZooReader zooReader, final String * @return Result with error count, Set of the node names. */ @VisibleForTesting - Result> readNodeNames(final ZooReader zooReader, final String path) { + Result> readNodeNames(final ZooReader zooReader, final String path) { Set nodeNames = new TreeSet<>(); final AtomicInteger errorCount = new AtomicInteger(0); try { @@ -290,7 +290,7 @@ Result> readNodeNames(final ZooReader zooReader, final Strin * @return Pair with error count, the node data as String. */ @VisibleForTesting - Result readNodeData(final ZooReader zooReader, final String path) { + Result readNodeData(final ZooReader zooReader, final String path) { try { byte[] data = zooReader.getData(path); return new Result<>(0, new String(data, UTF_8)); @@ -311,7 +311,7 @@ Result readNodeData(final ZooReader zooReader, final String path * @return Pair with error count, the data from each node as a String. */ @VisibleForTesting - Result> readAllNodesData(final ZooReader zooReader, final String path) { + Result> readAllNodesData(final ZooReader zooReader, final String path) { Set hosts = new TreeSet<>(); final AtomicInteger errorCount = new AtomicInteger(0); try { @@ -352,12 +352,12 @@ public static class Opts { * @param errorCount * @param hosts */ - private static class Result extends Pair { - public Result(A errorCount, B hosts) { + private static class Result extends Pair { + public Result(Integer errorCount, B hosts) { super(errorCount, hosts); } - public A getErrorCount() { + public Integer getErrorCount() { return getFirst(); } diff --git a/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java b/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java index 5ffb6156858..f754b3936f5 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java @@ -56,8 +56,8 @@ public void factoryTest() throws Exception { verify(context, conf); } - @SuppressWarnings({"deprecation", - "support for org.apache.accumulo.core.metrics.MeterRegistryFactory can be removed in 3.1"}) + // support for org.apache.accumulo.core.metrics.MeterRegistryFactory can be removed in 3.1 + @SuppressWarnings("deprecation") static final class DeprecatedFactory implements org.apache.accumulo.core.metrics.MeterRegistryFactory { DeprecatedFactory() { diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index 151cc8fdd2d..497a733b8bc 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -55,10 +55,6 @@ org.apache.accumulo accumulo-start - - org.apache.logging.log4j - log4j-1.2-api - org.apache.thrift libthrift diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index e7e4263066b..1866909c92c 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -63,10 +63,6 @@ org.apache.hadoop hadoop-client-api - - org.apache.logging.log4j - log4j-1.2-api - org.apache.thrift libthrift diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java index f0502bce988..efe1e6ab017 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java @@ -26,13 +26,9 @@ import org.apache.accumulo.core.metrics.MetricsProducer; import org.apache.accumulo.manager.Manager; import org.apache.accumulo.manager.metrics.fate.FateMetrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ManagerMetrics { - private final static Logger log = LoggerFactory.getLogger(ManagerMetrics.class); - public static List getProducers(AccumuloConfiguration conf, Manager m) { ArrayList producers = new ArrayList<>(); @SuppressWarnings("deprecation") diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index f68159233a4..ccc7bceb06e 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -145,7 +145,7 @@ slf4j-api - + biz.aQute.bnd biz.aQute.bnd.annotation provided diff --git a/start/pom.xml b/start/pom.xml index 44efb3ba3f5..85e31157e6f 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -65,6 +65,7 @@ test + org.apache.logging.log4j log4j-1.2-api test diff --git a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java index c7f56fb71f1..824284ee981 100644 --- a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java @@ -204,12 +204,13 @@ public boolean accept(Key k, Value v) { private void runPluginEnvTest(Set expected) throws Exception { try (var scanner = client.createScanner(tableName)) { initCalled.set(false); - var csis = new ClientSideIteratorScanner(scanner); - csis.addScanIterator(new IteratorSetting(100, "filter", TestPropFilter.class)); - assertEquals(expected, - csis.stream().map(e -> e.getKey().getRowData().toString()).collect(Collectors.toSet())); - // this check is here to ensure the iterator executed client side and not server side - assertTrue(initCalled.get()); + try (var csis = new ClientSideIteratorScanner(scanner)) { + csis.addScanIterator(new IteratorSetting(100, "filter", TestPropFilter.class)); + assertEquals(expected, + csis.stream().map(e -> e.getKey().getRowData().toString()).collect(Collectors.toSet())); + // this check is here to ensure the iterator executed client side and not server side + assertTrue(initCalled.get()); + } } // The offline scanner also runs iterators client side, so test its client side access to diff --git a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java index 459beb9ea1a..09f55d862d4 100644 --- a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java +++ b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java @@ -55,13 +55,9 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class PrintInfoIT extends SharedMiniClusterBase { - private static final Logger log = LoggerFactory.getLogger(PrintInfoIT.class); - @BeforeAll public static void setup() throws Exception { SharedMiniClusterBase.startMiniCluster(); diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java index da7e9228dad..a0b1dc20edf 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java @@ -33,7 +33,6 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.metadata.ScanServerRefTabletFile; import org.apache.accumulo.core.metadata.schema.Ample; -import org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection; import org.apache.accumulo.core.util.HostAndPort; import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; @@ -80,7 +79,6 @@ public void testServerContextMethods() { } @Test - @SuppressWarnings("deprecation") public void testOldScanServerRefs() { HostAndPort server = HostAndPort.fromParts("127.0.0.1", 1234); UUID serverLockUUID = UUID.randomUUID(); @@ -97,7 +95,10 @@ public void testOldScanServerRefs() { // Add old scan server entries try (BatchWriter writer = ctx.createBatchWriter(Ample.DataLevel.USER.metaTable())) { - String prefix = OldScanServerFileReferenceSection.getRowPrefix(); + @SuppressWarnings("deprecation") + String prefix = + org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection + .getRowPrefix(); for (String filepath : Stream.of("F0001243.rf", "F0006512.rf") .map(f -> "hdfs://localhost:8020/accumulo/tables/2a/test_tablet/" + f) .collect(Collectors.toSet())) {