[accumulo] branch main updated: Move ServiceLock classes to their own package (#3196)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
 new 798b46e617 Move ServiceLock classes to their own package (#3196)
798b46e617 is described below

commit 798b46e61784aaf0b229fc1ba4fc8396333b92fa
Author: EdColeman 
AuthorDate: Fri Mar 3 15:38:23 2023 -0500

Move ServiceLock classes to their own package (#3196)

Relocate ServiceLock and ServiceLockData to their own package
in org.apache.accumulo.core.lock and out of a fate-specific package,
since they are general ZooKeeper lock service classes and not specific
to fate. This moves the classes to better reflect their usages.
---
 .../apache/accumulo/core/clientImpl/ClientContext.java   |  6 +++---
 .../accumulo/core/clientImpl/ConditionalWriterImpl.java  |  2 +-
 .../accumulo/core/clientImpl/ZookeeperLockChecker.java   |  2 +-
 .../java/org/apache/accumulo/core/fate/AdminUtil.java|  4 ++--
 .../apache/accumulo/core/fate/zookeeper/ZooCache.java|  5 +++--
 .../core/{fate/zookeeper => lock}/ServiceLock.java   |  6 --
 .../accumulo/core/{util => lock}/ServiceLockData.java|  4 +++-
 .../org/apache/accumulo/core/metadata/schema/Ample.java  |  2 +-
 .../accumulo/core/metadata/schema/TabletMetadata.java|  4 ++--
 .../apache/accumulo/core/rpc/clients/TServerClient.java  |  6 +++---
 .../accumulo/core/spi/scan/ScanServerSelector.java   |  2 +-
 .../core/util/compaction/ExternalCompactionUtil.java |  6 +++---
 .../core/{util => lock}/ServiceLockDataTest.java |  8 
 .../core/{fate/zookeeper => lock}/ServiceLockTest.java   |  2 +-
 .../accumulo/server/constraints/MetadataConstraints.java |  2 +-
 .../java/org/apache/accumulo/server/fs/VolumeUtil.java   |  2 +-
 .../apache/accumulo/server/manager/LiveTServerSet.java   |  4 ++--
 .../accumulo/server/metadata/TabletMutatorBase.java  |  2 +-
 .../main/java/org/apache/accumulo/server/util/Admin.java |  2 +-
 .../org/apache/accumulo/server/util/ListInstances.java   |  6 +++---
 .../apache/accumulo/server/util/ManagerMetadataUtil.java |  2 +-
 .../apache/accumulo/server/util/MetadataTableUtil.java   |  2 +-
 .../apache/accumulo/server/util/TabletServerLocks.java   |  6 +++---
 .../java/org/apache/accumulo/server/util/ZooZap.java |  2 +-
 .../accumulo/coordinator/CompactionCoordinator.java  |  6 +++---
 .../accumulo/coordinator/CoordinatorLockWatcher.java |  4 ++--
 .../java/org/apache/accumulo/compactor/Compactor.java| 10 +-
 .../org/apache/accumulo/gc/SimpleGarbageCollector.java   | 10 +-
 .../main/java/org/apache/accumulo/manager/Manager.java   | 10 +-
 .../manager/tableOps/create/PopulateMetadata.java|  2 +-
 .../accumulo/manager/tserverOps/ShutdownTServer.java |  2 +-
 .../main/java/org/apache/accumulo/monitor/Monitor.java   |  8 
 .../java/org/apache/accumulo/tserver/ScanServer.java | 10 +-
 .../org/apache/accumulo/tserver/TabletClientHandler.java |  2 +-
 .../org/apache/accumulo/tserver/TabletHostingServer.java |  2 +-
 .../java/org/apache/accumulo/tserver/TabletServer.java   | 14 +++---
 .../org/apache/accumulo/shell/commands/FateCommand.java  |  4 ++--
 .../apache/accumulo/shell/commands/FateCommandTest.java  |  4 ++--
 .../apache/accumulo/test/BadDeleteMarkersCreatedIT.java  |  4 ++--
 .../apache/accumulo/test/functional/BackupManagerIT.java |  2 +-
 .../accumulo/test/functional/FateConcurrencyIT.java  |  2 +-
 .../accumulo/test/functional/FunctionalTestUtils.java|  2 +-
 .../accumulo/test/functional/GarbageCollectorIT.java |  6 +++---
 .../org/apache/accumulo/test/functional/ReadWriteIT.java |  4 ++--
 .../org/apache/accumulo/test/functional/RestartIT.java   |  4 ++--
 .../apache/accumulo/test/functional/SplitRecoveryIT.java | 10 +-
 .../test/functional/TabletStateChangeIteratorIT.java |  2 +-
 .../apache/accumulo/test/functional/ZombieTServer.java   | 10 +-
 .../test/{fate/zookeeper => lock}/ServiceLockIT.java | 16 
 49 files changed, 122 insertions(+), 117 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index dbd6a90848..dbe7590ee7 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -75,12 +75,14 @@ import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.KeyValue;
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;

[accumulo] branch temp deleted (was 052861af5a)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch temp
in repository https://gitbox.apache.org/repos/asf/accumulo.git


 was 052861af5a Merge branch 'main' into move_service_lock

This change permanently discards the following revisions:

 discard 052861af5a Merge branch 'main' into move_service_lock
 discard bdbbe87030 Move ServiceLock and ServiceLockData to o.a.a.core.lock

[accumulo] 02/02: Merge branch 'main' into move_service_lock

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch temp
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 052861af5a3c8ac81cdbf08a142f70515fd0592d
Merge: bdbbe87030 a3cab15546
Author: Christopher Tubbs 
AuthorDate: Fri Mar 3 14:37:56 2023 -0500

Merge branch 'main' into move_service_lock

 assemble/bin/accumulo-cluster  |  26 +-
 assemble/pom.xml   |   5 -
 contrib/ci/find-unapproved-junit.sh|   1 -
 core/pom.xml   |  29 +-
 .../accumulo/core/classloader/ClassLoaderUtil.java |   9 +-
 .../DefaultContextClassLoaderFactory.java  | 102 -
 .../classloader/URLContextClassLoaderFactory.java  |  75 
 .../core/client/admin/ActiveCompaction.java|   6 +
 .../core/clientImpl/ActiveCompactionImpl.java  |   5 +
 .../accumulo/core/clientImpl/bulk/BulkImport.java  |   6 +-
 .../org/apache/accumulo/core/conf/Property.java|  92 ++---
 .../apache/accumulo/core/conf/PropertyType.java|   5 +-
 .../core/conf/cluster/ClusterConfigParser.java |  18 +-
 .../org/apache/accumulo/core/data/InstanceId.java  |  14 +-
 .../org/apache/accumulo/core/data/NamespaceId.java |  15 +-
 .../org/apache/accumulo/core/data/TableId.java |  15 +-
 .../apache/accumulo/core/file/FileOperations.java  |   2 +-
 .../cache/impl/BlockCacheManagerFactory.java   |   2 +-
 .../file/blockfile/impl/CachableBlockFile.java |  13 +-
 .../file/rfile/bcfile/CompressionAlgorithm.java|  20 +-
 .../apache/accumulo/core/iterators/Combiner.java   |  29 +-
 .../core/iterators/IteratorEnvironment.java|  10 +
 .../core/iterators/SortedKeyValueIterator.java |  13 +
 .../accumulo/core/iterators/WrappingIterator.java  |  11 +-
 .../accumulo/core/metrics/MetricsProducer.java |  32 ++
 .../spi/balancer/HostRegexTableLoadBalancer.java   |  16 +-
 .../core/spi/common/ContextClassLoaderFactory.java |  16 +-
 .../spi/compaction/DefaultCompactionPlanner.java   |   4 +-
 .../core/spi/fs/SpaceAwareVolumeChooser.java   |  21 +-
 .../org/apache/accumulo/core/summary/Gatherer.java |   2 +-
 .../accumulo/core/summary/SummaryReader.java   |   2 +-
 .../compaction/CompactionPlannerInitParams.java|   4 +-
 .../accumulo/core/util/tables/TableZooHelper.java  |  13 +-
 .../core/tabletserver/thrift/ActiveCompaction.java | 104 -
 core/src/main/thrift/tabletserver.thrift   |   1 +
 .../classloader/ContextClassLoaderFactoryTest.java |   2 +-
 .../core/classloader/URLClassLoaderFactory.java|  46 ---
 .../core/conf/AccumuloConfigurationTest.java   |  21 +-
 .../core/conf/cluster/ClusterConfigParserTest.java |  68 ++-
 .../accumulo/core/fate/zookeeper/ZooUtilTest.java  |  22 +-
 .../accumulo/core/iterators/CombinerTestUtil.java  |   2 +-
 .../core/spi/fs/SpaceAwareVolumeChooserTest.java   |   4 +-
 core/src/test/resources/log4j2-test.properties |   4 -
 hadoop-mapreduce/pom.xml   |   6 -
 .../src/test/resources/log4j2-test.properties  |   4 -
 iterator-test-harness/pom.xml  |   6 -
 minicluster/pom.xml|   4 -
 .../miniclusterImpl/MiniAccumuloClusterImpl.java   |   2 +-
 .../miniclusterImpl/MiniAccumuloConfigImpl.java|   6 -
 .../MiniAccumuloClusterClasspathTest.java  |  12 +-
 pom.xml|  79 ++--
 server/base/pom.xml|   6 -
 .../org/apache/accumulo/server/AbstractServer.java |   9 +
 .../org/apache/accumulo/server/ServerContext.java  |   7 +
 .../accumulo/server/compaction/CompactionInfo.java |   8 +-
 .../server/compaction/CompactionStats.java |  13 +-
 .../accumulo/server/compaction/FileCompactor.java  |  45 +-
 ...tionStats.java => PausedCompactionMetrics.java} |  47 +--
 .../org/apache/accumulo/server/fs/FileManager.java |   2 +-
 .../iterators/SystemIteratorEnvironment.java   |   5 +
 .../LowMemoryDetector.java}|  83 +++-
 .../server/conf/CheckCompactionConfigTest.java |  51 +++
 server/compaction-coordinator/pom.xml  |   6 -
 .../coordinator/CompactionCoordinator.java |  11 -
 .../coordinator/CompactionCoordinatorTest.java |   3 -
 server/compactor/pom.xml   |   6 -
 .../org/apache/accumulo/compactor/Compactor.java   |  30 +-
 .../apache/accumulo/compactor/CompactorTest.java   |   8 +-
 server/gc/pom.xml  |   6 -
 server/manager/pom.xml |  10 +-
 .../accumulo/manager/recovery/RecoveryManager.java |  18 +-
 server/monitor/pom.xml |  11 +-
 server/native/pom.xml  |   6 -
 server/tserver/pom.xml |  19 +-
 .../org/apache/accumulo/tserver/ScanServer.java|  18 +-
 .../accumulo/tserver/TabletClientHandler.java  |   6

[accumulo] 01/02: Move ServiceLock and ServiceLockData to o.a.a.core.lock

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch temp
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit bdbbe870307c4e807c87b239e8856d9ded9d1345
Author: Ed Coleman 
AuthorDate: Wed Feb 15 21:46:40 2023 +

Move ServiceLock and ServiceLockData to o.a.a.core.lock
---
 .../apache/accumulo/core/clientImpl/ClientContext.java   |  6 +++---
 .../accumulo/core/clientImpl/ConditionalWriterImpl.java  |  2 +-
 .../accumulo/core/clientImpl/ZookeeperLockChecker.java   |  2 +-
 .../java/org/apache/accumulo/core/fate/AdminUtil.java|  4 ++--
 .../apache/accumulo/core/fate/zookeeper/ZooCache.java|  5 +++--
 .../core/{fate/zookeeper => lock}/ServiceLock.java   |  6 --
 .../accumulo/core/{util => lock}/ServiceLockData.java|  4 +++-
 .../org/apache/accumulo/core/metadata/schema/Ample.java  |  2 +-
 .../accumulo/core/metadata/schema/TabletMetadata.java|  4 ++--
 .../apache/accumulo/core/rpc/clients/TServerClient.java  |  6 +++---
 .../accumulo/core/spi/scan/ScanServerSelector.java   |  2 +-
 .../core/util/compaction/ExternalCompactionUtil.java |  6 +++---
 .../core/{util => lock}/ServiceLockDataTest.java |  8 
 .../core/{fate/zookeeper => lock}/ServiceLockTest.java   |  2 +-
 .../accumulo/server/constraints/MetadataConstraints.java |  2 +-
 .../java/org/apache/accumulo/server/fs/VolumeUtil.java   |  2 +-
 .../apache/accumulo/server/manager/LiveTServerSet.java   |  4 ++--
 .../accumulo/server/metadata/TabletMutatorBase.java  |  2 +-
 .../main/java/org/apache/accumulo/server/util/Admin.java |  2 +-
 .../org/apache/accumulo/server/util/ListInstances.java   |  6 +++---
 .../apache/accumulo/server/util/ManagerMetadataUtil.java |  2 +-
 .../apache/accumulo/server/util/MetadataTableUtil.java   |  2 +-
 .../apache/accumulo/server/util/TabletServerLocks.java   |  6 +++---
 .../java/org/apache/accumulo/server/util/ZooZap.java |  2 +-
 .../accumulo/coordinator/CompactionCoordinator.java  |  6 +++---
 .../accumulo/coordinator/CoordinatorLockWatcher.java |  4 ++--
 .../java/org/apache/accumulo/compactor/Compactor.java| 10 +-
 .../org/apache/accumulo/gc/SimpleGarbageCollector.java   | 10 +-
 .../main/java/org/apache/accumulo/manager/Manager.java   | 10 +-
 .../manager/tableOps/create/PopulateMetadata.java|  2 +-
 .../accumulo/manager/tserverOps/ShutdownTServer.java |  2 +-
 .../main/java/org/apache/accumulo/monitor/Monitor.java   |  8 
 .../java/org/apache/accumulo/tserver/ScanServer.java | 10 +-
 .../org/apache/accumulo/tserver/TabletClientHandler.java |  2 +-
 .../org/apache/accumulo/tserver/TabletHostingServer.java |  2 +-
 .../java/org/apache/accumulo/tserver/TabletServer.java   | 14 +++---
 .../org/apache/accumulo/shell/commands/FateCommand.java  |  4 ++--
 .../apache/accumulo/shell/commands/FateCommandTest.java  |  4 ++--
 .../apache/accumulo/test/BadDeleteMarkersCreatedIT.java  |  4 ++--
 .../apache/accumulo/test/functional/BackupManagerIT.java |  2 +-
 .../accumulo/test/functional/FateConcurrencyIT.java  |  2 +-
 .../accumulo/test/functional/FunctionalTestUtils.java|  2 +-
 .../accumulo/test/functional/GarbageCollectorIT.java |  6 +++---
 .../org/apache/accumulo/test/functional/ReadWriteIT.java |  4 ++--
 .../org/apache/accumulo/test/functional/RestartIT.java   |  4 ++--
 .../apache/accumulo/test/functional/SplitRecoveryIT.java | 10 +-
 .../test/functional/TabletStateChangeIteratorIT.java |  2 +-
 .../apache/accumulo/test/functional/ZombieTServer.java   | 10 +-
 .../test/{fate/zookeeper => lock}/ServiceLockIT.java | 16 
 49 files changed, 122 insertions(+), 117 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index dbd6a90848..dbe7590ee7 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -75,12 +75,14 @@ import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.KeyValue;
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;
 import org.apache.accumulo.core.fate.zookeeper.ZooCacheFactory;
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLockData;
+import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.manager.state.tables.TableState;
 import

[accumulo] branch temp created (now 052861af5a)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch temp
in repository https://gitbox.apache.org/repos/asf/accumulo.git


  at 052861af5a Merge branch 'main' into move_service_lock

This branch includes the following new commits:

 new bdbbe87030 Move ServiceLock and ServiceLockData to o.a.a.core.lock
 new 052861af5a Merge branch 'main' into move_service_lock

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.

[accumulo] branch main updated: Use Collections.unmodifiableList for static ACL declarations (#3195)

2023-03-03 Thread edcoleman 
This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
 new a3cab15546 Use Collections.unmodifiableList for static ACL 
declarations (#3195)
a3cab15546 is described below

commit a3cab15546d79c79ccca0ecf68574d091b6e6b09
Author: EdColeman 
AuthorDate: Fri Mar 3 13:52:51 2023 -0500

Use Collections.unmodifiableList for static ACL declarations (#3195)

Spotbugs flags leaking a mutable collection used when creating the 
ZooKeeper ACLs  - currently ZooKeeper code cannot use Immutable collections 
(List.of()) so this uses Collections.unmodifiableList instead.

* Use Collections.unmodifiableList for static ACL declarations
* Update 
core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java
---
 .../accumulo/core/fate/zookeeper/ZooUtil.java  | 18 +++---
 .../accumulo/core/fate/zookeeper/ZooUtilTest.java  | 69 ++
 2 files changed, 80 insertions(+), 7 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java 
b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java
index c968c33066..47d906fedb 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java
@@ -27,6 +27,7 @@ import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.accumulo.core.Constants;
@@ -94,15 +95,18 @@ public class ZooUtil {
 }
   }
 
-  public static final List PRIVATE;
-  public static final List PUBLIC;
+  // Need to use Collections.unmodifiableList() instead of List.of() or 
List.copyOf(), because
+  // ImmutableCollections.contains() doesn't handle nulls properly 
(JDK-8265905) and ZooKeeper (as
+  // of 3.8.1) calls acl.contains((Object) null) which throws a NPE when 
passed an immutable
+  // collection
+  public static final List PRIVATE =
+  Collections.unmodifiableList(new ArrayList<>(Ids.CREATOR_ALL_ACL));
 
+  public static final List PUBLIC;
   static {
-PRIVATE = new ArrayList<>();
-PRIVATE.addAll(Ids.CREATOR_ALL_ACL);
-PUBLIC = new ArrayList<>();
-PUBLIC.addAll(PRIVATE);
-PUBLIC.add(new ACL(Perms.READ, Ids.ANYONE_ID_UNSAFE));
+var publicTmp = new ArrayList<>(PRIVATE);
+publicTmp.add(new ACL(Perms.READ, Ids.ANYONE_ID_UNSAFE));
+PUBLIC = Collections.unmodifiableList(publicTmp);
   }
 
   public static String getRoot(final InstanceId instanceId) {
diff --git 
a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java 
b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java
new file mode 100644
index 00..4f9315b9f5
--- /dev/null
+++ 
b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java
@@ -0,0 +1,69 @@
+/*
+ * 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
+ *
+ *   https://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.
+ */
+package org.apache.accumulo.core.fate.zookeeper;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.ZooDefs;
+import org.apache.zookeeper.data.ACL;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class ZooUtilTest {
+  Logger log = LoggerFactory.getLogger(ZooUtilTest.class);
+
+  @Test
+  void checkUnmodifiable() throws Exception {
+assertTrue(validateACL(ZooUtil.PRIVATE));
+assertTrue(validateACL(ZooUtil.PUBLIC));
+  }
+
+  @Test
+  public void checkImmutableAcl() throws Exception {
+
+final List mutable = new ArrayList<>(ZooDefs.Ids.CREATOR_ALL_ACL);
+assertTrue(validateACL(mutable));
+
+// Replicates the acl check in ZooKeeper.java to show ZooKeeper will not 
accept an
+// ImmutableCollection for the ACL list. ZooKeeper (as of 3.8.1) calls
+// acl.contains((Object) null)

[accumulo] 01/01: Merge branch '2.1'

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 9a31c4257b54ed890f02ab9aafe6d99a9638dac6
Merge: 628c282f7b 704197f7d3
Author: Christopher Tubbs 
AuthorDate: Fri Mar 3 11:45:43 2023 -0500

Merge branch '2.1'

 core/pom.xml |  6 --
 pom.xml  | 10 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

[accumulo] branch main updated (628c282f7b -> 9a31c4257b)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from 628c282f7b Fix minor issues for #3206 (#3224)
 add 704197f7d3 Update micrometer (#3223)
 new 9a31c4257b Merge branch '2.1'

The 1 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:
 core/pom.xml |  6 --
 pom.xml  | 10 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

[accumulo] branch 2.1 updated: Update micrometer (#3223)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
 new 704197f7d3 Update micrometer (#3223)
704197f7d3 is described below

commit 704197f7d38bdc9c2b151eac6a70a9efbc7d4045
Author: Christopher Tubbs 
AuthorDate: Fri Mar 3 11:44:10 2023 -0500

Update micrometer (#3223)

* Converge netty transitive dependencies
---
 core/pom.xml |  6 --
 pom.xml  | 10 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index ee75be936c..0280b5000c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -130,12 +130,6 @@
 
   org.apache.zookeeper
   zookeeper
-  
-
-  io.netty
-  netty
-
-  
 
 
   org.apache.zookeeper
diff --git a/pom.xml b/pom.xml
index a68b9ff4c3..3f5a12f603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,15 @@
   
 io.micrometer
 micrometer-bom
-1.9.5
+1.9.8
+pom
+import
+  
+  
+
+io.netty
+netty-bom
+4.1.89.Final
 pom
 import

[accumulo] branch main updated: Fix minor issues for #3206 (#3224)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
 new 628c282f7b Fix minor issues for #3206 (#3224)
628c282f7b is described below

commit 628c282f7b3a0e70ae789f590036baebc35c1084
Author: Christopher L. Shannon 
AuthorDate: Fri Mar 3 11:23:45 2023 -0500

Fix minor issues for #3206 (#3224)

* Narrow catch block for exception handling to only UncheckedIOException
* Fix google cache regex in checkstyle rules
---
 .../org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java | 2 +-
 pom.xml | 2 +-
 .../main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index f106ba8e6b..0643ba1d80 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -176,7 +176,7 @@ public class CachableBlockFile {
 throw new UncheckedIOException(e);
   }
 });
-  } catch (Exception e) {
+  } catch (UncheckedIOException e) {
 throw new IOException("Failed to get " + cacheId + " len from cache ", 
e);
   }
 }
diff --git a/pom.xml b/pom.xml
index 05eba6b3c4..a23c0bf0c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1130,7 +1130,7 @@
   
 
 
-  
+  
   
 
 
diff --git 
a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
 
b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
index cb0fd76dc2..7bceb71e9c 100644
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
@@ -151,7 +151,7 @@ public class RecoveryManager {
   throw new UncheckedIOException(e);
 }
   });
-} catch (Exception e) {
+} catch (UncheckedIOException e) {
   throw new IOException(e);
 }
   }

[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot

2023-03-03 Thread git-site-role 
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 25dd01c0 Automatic Site Publish by Buildbot
25dd01c0 is described below

commit 25dd01c08eb3027da9117823a450318892950d19
Author: buildbot 
AuthorDate: Fri Mar 3 15:38:14 2023 +

Automatic Site Publish by Buildbot
---
 output/feed.xml  | 4 ++--
 output/release/accumulo-2.1.1/index.html | 1 +
 output/search_data.json  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/output/feed.xml b/output/feed.xml
index 7ef1a75c..3e6c2ccf 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml; rel="self" 
type="application/rss+xml"/>
-Thu, 23 Feb 2023 13:41:20 +
-Thu, 23 Feb 2023 13:41:20 +
+Fri, 03 Mar 2023 15:38:06 +
+Fri, 03 Mar 2023 15:38:06 +
 Jekyll v4.3.1
 
 
diff --git a/output/release/accumulo-2.1.1/index.html 
b/output/release/accumulo-2.1.1/index.html
index d72e361a..c7d53fb2 100644
--- a/output/release/accumulo-2.1.1/index.html
+++ b/output/release/accumulo-2.1.1/index.html
@@ -207,6 +207,7 @@ that will improve the underlying implementation when 
resolved.
   https://github.com/apache/accumulo/issues/3023;>#3023, https://github.com/apache/accumulo/issues/3053;>#3053 Prevent 
excessive logging when an ExternalCompaction
 is cancelled for cause and around the ThreadPools
   https://github.com/apache/accumulo/issues/3057;>#3057 
Modified Monitor to direct DataTable errors to console
+  https://github.com/apache/accumulo/issues/3205;>#3205 
Support writing cluster config parser output to a file
 
 
 Bug Fixes
diff --git a/output/search_data.json b/output/search_data.json
index bee35537..43095f00 100644
--- a/output/search_data.json
+++ b/output/search_data.json
@@ -334,7 +334,7 @@
   
 "release-accumulo-2-1-1": {
   "title": "Apache Accumulo 2.1.1",
-  "content": "AboutApache Accumulo 2.1.1 is a patch release of the 2.1.0 
LTM line.Major ImprovementsMinor Improvements  #3180 Enable users to provide 
per-volume Hadoop Filesystem configurationoverrides via the Accumulo 
configuration. Hadoop Filesystem objects are configuredby the standard Hadoop 
mechanisms (default configuration, core-site.xml,hdfs-site.xml, etc.), but 
these configuration files don’t allow for the sameproperty to be specified with 
different values for different names [...]
+  "content": "AboutApache Accumulo 2.1.1 is a patch release of the 2.1.0 
LTM line.Major ImprovementsMinor Improvements  #3180 Enable users to provide 
per-volume Hadoop Filesystem configurationoverrides via the Accumulo 
configuration. Hadoop Filesystem objects are configuredby the standard Hadoop 
mechanisms (default configuration, core-site.xml,hdfs-site.xml, etc.), but 
these configuration files don’t allow for the sameproperty to be specified with 
different values for different names [...]
   "url": " /release/accumulo-2.1.1/",
   "categories": "release"
 }

[accumulo-website] branch main updated: Updated 2.1.1 release notes (#377)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/main by this push:
 new 49bea699 Updated 2.1.1 release notes (#377)
49bea699 is described below

commit 49bea6990f73fc50a8b7e35525fe7815e63cb720
Author: Christopher L. Shannon 
AuthorDate: Fri Mar 3 10:37:51 2023 -0500

Updated 2.1.1 release notes (#377)

Add https://github.com/apache/accumulo/pull/3205 to the list of minor
improvements
---
 _posts/release/2022-11-02-accumulo-2.1.1.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_posts/release/2022-11-02-accumulo-2.1.1.md 
b/_posts/release/2022-11-02-accumulo-2.1.1.md
index b7c43a10..dfd05e4c 100644
--- a/_posts/release/2022-11-02-accumulo-2.1.1.md
+++ b/_posts/release/2022-11-02-accumulo-2.1.1.md
@@ -42,6 +42,7 @@ Apache Accumulo 2.1.1 is a patch release of the 2.1.0 LTM 
line.
 * {% ghi 3023 %}, {% ghi 3053 %} Prevent excessive logging when an 
ExternalCompaction
   is cancelled for cause and around the ThreadPools
 * {% ghi 3057 %} Modified Monitor to direct DataTable errors to console
+* {% ghi 3205 %} Support writing cluster config parser output to a file
 
 ### Bug Fixes

[accumulo] 01/01: Merge branch '2.1'

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit fe31930ccef448a549cea082943c510b678dbecd
Merge: 8a976b32ff af048d96b0
Author: Christopher Tubbs 
AuthorDate: Fri Mar 3 10:06:03 2023 -0500

Merge branch '2.1'

 core/pom.xml  | 6 --
 hadoop-mapreduce/pom.xml  | 6 --
 iterator-test-harness/pom.xml | 6 --
 minicluster/pom.xml   | 4 
 pom.xml   | 4 +---
 server/base/pom.xml   | 6 --
 server/compaction-coordinator/pom.xml | 6 --
 server/compactor/pom.xml  | 6 --
 server/gc/pom.xml | 6 --
 server/manager/pom.xml| 6 --
 server/native/pom.xml | 6 --
 server/tserver/pom.xml| 6 --
 shell/pom.xml | 6 --
 start/pom.xml | 6 --
 test/pom.xml  | 4 
 15 files changed, 1 insertion(+), 83 deletions(-)

[accumulo] branch main updated (8a976b32ff -> fe31930cce)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from 8a976b32ff Merge branch '2.1'
 add af048d96b0 Update log4j and remove log4j-core dependency (#3215)
 new fe31930cce Merge branch '2.1'

The 1 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:
 core/pom.xml  | 6 --
 hadoop-mapreduce/pom.xml  | 6 --
 iterator-test-harness/pom.xml | 6 --
 minicluster/pom.xml   | 4 
 pom.xml   | 4 +---
 server/base/pom.xml   | 6 --
 server/compaction-coordinator/pom.xml | 6 --
 server/compactor/pom.xml  | 6 --
 server/gc/pom.xml | 6 --
 server/manager/pom.xml| 6 --
 server/native/pom.xml | 6 --
 server/tserver/pom.xml| 6 --
 shell/pom.xml | 6 --
 start/pom.xml | 6 --
 test/pom.xml  | 4 
 15 files changed, 1 insertion(+), 83 deletions(-)

[accumulo-classloaders] branch main updated: Remove usage of deprecated AccessController (#19)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-classloaders.git


The following commit(s) were added to refs/heads/main by this push:
 new b4ecd67  Remove usage of deprecated AccessController (#19)
b4ecd67 is described below

commit b4ecd6794df2043127952e68b5420e9acc85cd3e
Author: Christopher L. Shannon 
AuthorDate: Fri Mar 3 10:01:39 2023 -0500

Remove usage of deprecated AccessController (#19)

The SecurityManager and related classes, including AccessController,
have been deprecated as of JDK 17 and are planned for removal. This
commit removes the usage of the APIs.
---
 .../ReloadingVFSContextClassLoaderFactory.java | 58 ++---
 .../classloader/vfs/VfsClassLoaderTest.java| 21 +++-
 .../ReloadingVFSContextClassLoaderFactoryTest.java | 60 ++
 3 files changed, 61 insertions(+), 78 deletions(-)

diff --git 
a/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/context/ReloadingVFSContextClassLoaderFactory.java
 
b/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/context/ReloadingVFSContextClassLoaderFactory.java
index f5bebcc..7a546e9 100644
--- 
a/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/context/ReloadingVFSContextClassLoaderFactory.java
+++ 
b/modules/vfs-class-loader/src/main/java/org/apache/accumulo/classloader/vfs/context/ReloadingVFSContextClassLoaderFactory.java
@@ -23,8 +23,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -37,6 +35,8 @@ import org.slf4j.LoggerFactory;
 
 import com.google.gson.Gson;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * A ClassLoaderFactory implementation that uses a ReloadingVFSClassLoader per 
defined context.
  * Configuration of this class is done with a JSON file whose location is 
defined by the system
@@ -282,39 +282,35 @@ public class ReloadingVFSContextClassLoaderFactory 
implements ContextClassLoader
 });
   }
 
+  @SuppressFBWarnings(value = "DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED",
+  justification = "Security Manager is deprecated for removal as of JDK 
17")
   protected AccumuloVFSClassLoader create(Context c) {
 LOG.debug("Creating ReloadingVFSClassLoader for context: {})", 
c.getName());
-return AccessController.doPrivileged(new 
PrivilegedAction() {
+return new AccumuloVFSClassLoader(
+ReloadingVFSContextClassLoaderFactory.class.getClassLoader()) {
   @Override
-  public AccumuloVFSClassLoader run() {
-return new AccumuloVFSClassLoader(
-ReloadingVFSContextClassLoaderFactory.class.getClassLoader()) {
-  @Override
-  protected String getClassPath() {
-return c.getConfig().getClassPath();
-  }
-
-  @Override
-  protected boolean isPostDelegationModel() {
-LOG.debug("isPostDelegationModel called, returning {}",
-c.getConfig().getPostDelegate());
-return c.getConfig().getPostDelegate();
-  }
-
-  @Override
-  protected long getMonitorInterval() {
-return c.getConfig().getMonitorIntervalMs();
-  }
-
-  @Override
-  protected boolean isVMInitialized() {
-// The classloader is not being set using
-// `java.system.class.loader`, so the VM is initialized.
-return true;
-  }
-};
+  protected String getClassPath() {
+return c.getConfig().getClassPath();
   }
-});
+
+  @Override
+  protected boolean isPostDelegationModel() {
+LOG.debug("isPostDelegationModel called, returning {}", 
c.getConfig().getPostDelegate());
+return c.getConfig().getPostDelegate();
+  }
+
+  @Override
+  protected long getMonitorInterval() {
+return c.getConfig().getMonitorIntervalMs();
+  }
+
+  @Override
+  protected boolean isVMInitialized() {
+// The classloader is not being set using
+// `java.system.class.loader`, so the VM is initialized.
+return true;
+  }
+};
   }
 
   @Override
diff --git 
a/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/VfsClassLoaderTest.java
 
b/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/VfsClassLoaderTest.java
index 3ee15b6..e5a5cd1 100644
--- 
a/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/VfsClassLoaderTest.java
+++ 
b/modules/vfs-class-loader/src/test/java/org/apache/accumulo/classloader/vfs/VfsClassLoaderTest.java
@@ -23,8 +23,6 @@ import static

[accumulo] branch 2.1 updated: Update log4j and remove log4j-core dependency (#3215)

2023-03-03 Thread domgarguilo 
This is an automated email from the ASF dual-hosted git repository.

domgarguilo pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
 new af048d96b0 Update log4j and remove log4j-core dependency (#3215)
af048d96b0 is described below

commit af048d96b09318205eea2f429b4f8cf74d663c6b
Author: Dom G 
AuthorDate: Fri Mar 3 10:01:06 2023 -0500

Update log4j and remove log4j-core dependency (#3215)

* Update log4j and remove log4j-core dependency

* Remove outdated comments and unused dependency rule

-

Co-authored-by: Christopher Tubbs 
---
 core/pom.xml  | 6 --
 hadoop-mapreduce/pom.xml  | 6 --
 iterator-test-harness/pom.xml | 6 --
 minicluster/pom.xml   | 4 
 pom.xml   | 4 +---
 server/base/pom.xml   | 6 --
 server/compaction-coordinator/pom.xml | 6 --
 server/compactor/pom.xml  | 6 --
 server/gc/pom.xml | 6 --
 server/manager/pom.xml| 6 --
 server/native/pom.xml | 6 --
 server/tserver/pom.xml| 6 --
 shell/pom.xml | 6 --
 start/pom.xml | 6 --
 test/pom.xml  | 4 
 15 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7a1b07b1ce..ee75be936c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -159,12 +159,6 @@
   hadoop-client-minicluster
   test
 
-
-  
-  org.apache.logging.log4j
-  log4j-core
-  test
-
 
   org.apache.logging.log4j
   log4j-slf4j2-impl
diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml
index 0b4f250d6f..b03389b11f 100644
--- a/hadoop-mapreduce/pom.xml
+++ b/hadoop-mapreduce/pom.xml
@@ -71,12 +71,6 @@
   accumulo-test
   test
 
-
-  
-  org.apache.logging.log4j
-  log4j-core
-  test
-
 
   org.apache.logging.log4j
   log4j-slf4j2-impl
diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml
index dbe90595e0..be14bd5a4e 100644
--- a/iterator-test-harness/pom.xml
+++ b/iterator-test-harness/pom.xml
@@ -59,12 +59,6 @@
   hadoop-client-runtime
   runtime
 
-
-  
-  org.apache.logging.log4j
-  log4j-core
-  test
-
 
   org.apache.logging.log4j
   log4j-slf4j2-impl
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index f6d0dc5ebd..2bf23ab003 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -129,10 +129,6 @@
   log4j-1.2-api
   test
 
-
 
   org.apache.logging.log4j
   log4j-slf4j2-impl
diff --git a/pom.xml b/pom.xml
index a430d2a15c..a68b9ff4c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@
   
 org.apache.logging.log4j
 log4j-bom
-2.19.0
+2.20.0
 pom
 import
   
@@ -1014,8 +1014,6 @@
 org.apache.logging.log4j:log4j-1.2-api:jar:*
 
org.apache.logging.log4j:log4j-slf4j2-impl:jar:*
 org.apache.logging.log4j:log4j-web:jar:*
-
-org.apache.logging.log4j:log4j-core:jar:*
 
 org.junit.vintage:junit-vintage-engine:jar:*
 org.junit.jupiter:junit-jupiter-engine:jar:*
diff --git a/server/base/pom.xml b/server/base/pom.xml
index a984be09f3..c15fbcacee 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -117,12 +117,6 @@
   hadoop-client-runtime
   runtime
 
-
-  
-  org.apache.logging.log4j
-  log4j-core
-  test
-
 
   org.apache.logging.log4j
   log4j-slf4j2-impl
diff --git a/server/compaction-coordinator/pom.xml 
b/server/compaction-coordinator/pom.xml
index aa8d51ebfd..c37d6eda77 100644
--- a/server/compaction-coordinator/pom.xml
+++ b/server/compaction-coordinator/pom.xml
@@ -76,12 +76,6 @@
   hadoop-client-runtime
   runtime
 
-
-  
-  org.apache.logging.log4j
-  log4j-core
-  test
-
 
   org.apache.logging.log4j
   log4j-slf4j2-impl
diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml
index d818d6c26b..c722d679f2 100644
--- a/server/compactor/pom.xml
+++ b/server/compactor/pom.xml
@@ -79,12 +79,6 @@
   org.slf4j
   slf4j-api
 
-
-  
-  org.apache.logging.log4j
-  log4j-core
-  test
-
 
   org.apache.logging.log4j
   log4j-slf4j2-impl
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 48d47b537f..6a3e317b90 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -89,12 +89,6 @@
   hadoop-client-runtime
   runtime
 
-
-  
-  org.apache.logging.log4j
-  log4j-core
-  test
-

[accumulo] branch 2.1 updated (7d7884787a -> f2589f3120)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from 7d7884787a Update Maven plugins to support Maven 3.9.0 (#3222)
 new 1ec4da2156 Build with 3.9
 new f2589f3120 Merge branch '1.10' into 2.1

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:
 core/pom.xml   | 17 +++--
 pom.xml| 24 +---
 server/monitor/pom.xml | 11 ---
 server/tserver/pom.xml | 13 +
 4 files changed, 41 insertions(+), 24 deletions(-)

[accumulo] 01/01: Merge branch '1.10' into 2.1

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit f2589f312076b0e33a9d45f6f2576b4ba33f02fd
Merge: 7d7884787a 1ec4da2156
Author: Christopher Tubbs 
AuthorDate: Fri Mar 3 09:20:46 2023 -0500

Merge branch '1.10' into 2.1

 core/pom.xml   | 17 +++--
 pom.xml| 24 +---
 server/monitor/pom.xml | 11 ---
 server/tserver/pom.xml | 13 +
 4 files changed, 41 insertions(+), 24 deletions(-)

diff --cc core/pom.xml
index 73e6863029,163a1c062f..7a1b07b1ce
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -194,18 -136,6 +194,23 @@@
  
  

 +
 +  com.mycila
 +  license-maven-plugin
 +  
- 
-   
src/main/java/org/apache/accumulo/core/bloomfilter/*.java
-   
src/main/java/org/apache/accumulo/core/util/HostAndPort.java
-   src/test/resources/*.jceks
-   
src/test/resources/org/apache/accumulo/core/file/rfile/*.rf
- 
++
++  
++
${session.executionRootDirectory}/contrib/license-header.txt
++
++  
src/main/java/org/apache/accumulo/core/bloomfilter/*.java
++  
src/main/java/org/apache/accumulo/core/util/HostAndPort.java
++  src/test/resources/*.jceks
++  
src/test/resources/org/apache/accumulo/core/file/rfile/*.rf
++
++  
++
 +  
 +
  
org.apache.rat
apache-rat-plugin
diff --cc pom.xml
index a1fc550b43,7e1e7cd0d2..a430d2a15c
--- a/pom.xml
+++ b/pom.xml
@@@ -697,33 -617,7 +697,37 @@@
  
org.codehaus.mojo
versions-maven-plugin
 -  2.8.1
 +  2.12.0
 +
 +
 +  com.mycila
 +  license-maven-plugin
 +  4.1
 +  
- 
${session.executionRootDirectory}/contrib/license-header.txt
- 
-   **/DEPENDENCIES
-   **/LICENSE
-   **/NOTICE
-   **/target/**
-   contrib/javadoc11.patch
- 
++
++  
++
${session.executionRootDirectory}/contrib/license-header.txt
++
++  **/DEPENDENCIES
++  **/LICENSE
++  **/NOTICE
++  **/target/**
++  contrib/javadoc11.patch
++
++  
++
 +
 +  
 +  SCRIPT_STYLE
 +  SLASHSTAR_STYLE
 +  SLASHSTAR_STYLE
 +  SLASHSTAR_STYLE
 +  SLASHSTAR_STYLE
 +  SLASHSTAR_STYLE
 +  SLASHSTAR_STYLE
 +  SLASHSTAR_STYLE
 +
 +  
  
  
org.gaul
diff --cc server/monitor/pom.xml
index 82f3e23a36,523ab1b815..ca17126745
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@@ -194,15 -129,6 +194,20 @@@

  

 +
 +  com.mycila
 +  license-maven-plugin
 +  
- 
-   
src/main/resources/org/apache/accumulo/monitor/resources/external/**/*
- 
++
++  
++
${session.executionRootDirectory}/contrib/license-header.txt
++
++  
src/main/resources/org/apache/accumulo/monitor/resources/external/**/*
++
++  
++
 +  
 +
  
org.apache.rat
apache-rat-plugin
diff --cc server/tserver/pom.xml
index 4745e8e1b5,18028634a9..a661df1373
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@@ -154,16 -136,6 +154,21 @@@
  

  
 +
 +  com.mycila
 +  license-maven-plugin
 +  
- 
-   src/test/resources/*.walog
-   src/test/resources/walog-from-14/*
- 
++
++  
++
${session.executionRootDirectory}/contrib/license-header.txt
++
++  src/test/resources/*.walog
++  src/test/resources/walog-from-14/*
++
++  
++
 +  
 +
  
org.apache.rat
apache-rat-plugin

[accumulo] branch main updated (65034b65c5 -> 8a976b32ff)

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from 65034b65c5 Replace all instances of Guava cache with Caffeine (#3206)
 new 1ec4da2156 Build with 3.9
 new f2589f3120 Merge branch '1.10' into 2.1
 new 8a976b32ff Merge branch '2.1'

The 3 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:
 core/pom.xml   | 17 +++--
 pom.xml| 24 +---
 server/monitor/pom.xml | 11 ---
 server/tserver/pom.xml | 13 +
 4 files changed, 41 insertions(+), 24 deletions(-)

[accumulo] 01/01: Merge branch '2.1'

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 8a976b32ff3bec3af9b54c96de7ed9b4ab7c33d1
Merge: 65034b65c5 f2589f3120
Author: Christopher Tubbs 
AuthorDate: Fri Mar 3 09:21:27 2023 -0500

Merge branch '2.1'

 core/pom.xml   | 17 +++--
 pom.xml| 24 +---
 server/monitor/pom.xml | 11 ---
 server/tserver/pom.xml | 13 +
 4 files changed, 41 insertions(+), 24 deletions(-)

[accumulo] branch 1.10 updated: Build with 3.9

2023-03-03 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.10
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.10 by this push:
 new 1ec4da2156 Build with 3.9
1ec4da2156 is described below

commit 1ec4da21568268886af9c0787a42143aaa40215e
Author: Christopher Tubbs 
AuthorDate: Fri Mar 3 09:19:05 2023 -0500

Build with 3.9

* Remove warnings about deprecated plugin options
---
 docs/pom.xml | 2 --
 pom.xml  | 6 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 3681be8733..84762532ee 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -76,9 +76,7 @@
   html5
   book
   true
-  ${project.build.directory}/asciidoc/images
   
${project.build.directory}/asciidoc
-  highlightjs
 
 
   
diff --git a/pom.xml b/pom.xml
index 19c443a59b..7e1e7cd0d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -647,8 +647,7 @@
 
   org.apache.maven.plugins
   maven-assembly-plugin
-  
-  3.1.1
+  3.5.0
 
 
   com.github.ekryd.sortpom
@@ -694,7 +693,6 @@
   org.apache.maven.plugins
   maven-compiler-plugin
   
-true
 true
 true
 
@@ -833,7 +831,7 @@
 
   net.revelc.code
   impsort-maven-plugin
-  1.7.0
+  1.8.0
   
 true
 java.,javax.,org.,com.

[accumulo-classloaders] branch main updated: Update Maven plugins to support Maven 3.9.0 (#20)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-classloaders.git


The following commit(s) were added to refs/heads/main by this push:
 new 5994282  Update Maven plugins to support Maven 3.9.0 (#20)
5994282 is described below

commit 5994282c305e9e19f09656721ae069034d43c09a
Author: Christopher L. Shannon 
AuthorDate: Fri Mar 3 09:11:27 2023 -0500

Update Maven plugins to support Maven 3.9.0 (#20)

modernizer-maven-plugin: 2.5.0
impsort-maven-plugin: 1.8.0
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 92e1567..03d27fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@
 
   net.revelc.code
   impsort-maven-plugin
-  1.4.1
+  1.8.0
   
 true
 java.,javax.,org.,com.
@@ -477,7 +477,7 @@
 
   org.gaul
   modernizer-maven-plugin
-  2.1.0
+  2.5.0
   
 ${maven.compiler.target}

[accumulo] branch main updated: Replace all instances of Guava cache with Caffeine (#3206)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
 new 65034b65c5 Replace all instances of Guava cache with Caffeine (#3206)
65034b65c5 is described below

commit 65034b65c5f065cc3419e4df0e03a55d3b5d94fd
Author: Christopher L. Shannon 
AuthorDate: Fri Mar 3 08:14:16 2023 -0500

Replace all instances of Guava cache with Caffeine (#3206)

Caffeine is the replacement for Guava and has several improvements. This
commit replaces all instances of Guava with Caffeine for consistency and
also adds a checkstyle rule to prevent using Guava in the future.
---
 .../classloader/URLContextClassLoaderFactory.java  | 32 +-
 .../accumulo/core/clientImpl/bulk/BulkImport.java  |  6 ++--
 .../org/apache/accumulo/core/data/InstanceId.java  | 14 +++---
 .../org/apache/accumulo/core/data/NamespaceId.java | 15 +++---
 .../org/apache/accumulo/core/data/TableId.java | 15 +++---
 .../apache/accumulo/core/file/FileOperations.java  |  2 +-
 .../file/blockfile/impl/CachableBlockFile.java | 13 ++---
 .../file/rfile/bcfile/CompressionAlgorithm.java| 20 --
 .../apache/accumulo/core/iterators/Combiner.java   | 29 
 .../spi/balancer/HostRegexTableLoadBalancer.java   | 16 ---
 .../core/spi/fs/SpaceAwareVolumeChooser.java   | 21 --
 .../org/apache/accumulo/core/summary/Gatherer.java |  2 +-
 .../accumulo/core/summary/SummaryReader.java   |  2 +-
 .../accumulo/core/util/tables/TableZooHelper.java  | 13 +++--
 .../accumulo/core/iterators/CombinerTestUtil.java  |  2 +-
 .../core/spi/fs/SpaceAwareVolumeChooserTest.java   |  4 +--
 pom.xml|  4 +++
 .../org/apache/accumulo/server/fs/FileManager.java |  2 +-
 server/manager/pom.xml |  4 +++
 .../accumulo/manager/recovery/RecoveryManager.java | 18 
 .../accumulo/tserver/TabletClientHandler.java  |  2 +-
 .../tserver/TabletServerResourceManager.java   |  6 ++--
 22 files changed, 98 insertions(+), 144 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/classloader/URLContextClassLoaderFactory.java
 
b/core/src/main/java/org/apache/accumulo/core/classloader/URLContextClassLoaderFactory.java
index ce36667a1f..26b06e39bc 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/classloader/URLContextClassLoaderFactory.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/classloader/URLContextClassLoaderFactory.java
@@ -22,16 +22,14 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 import org.apache.accumulo.core.spi.common.ContextClassLoaderFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 
 /**
  * The default implementation of ContextClassLoaderFactory. This classloader 
returns a
@@ -49,7 +47,7 @@ public class URLContextClassLoaderFactory implements 
ContextClassLoaderFactory {
   // Classes that are loaded contain a reference to the class loader used to 
load them
   // so the class loader will be garbage collected when no more classes are 
loaded that reference it
   private final Cache classloaders =
-  CacheBuilder.newBuilder().weakValues().build();
+  Caffeine.newBuilder().weakValues().build();
 
   public URLContextClassLoaderFactory() {
 if (!isInstantiated.compareAndSet(false, true)) {
@@ -63,19 +61,15 @@ public class URLContextClassLoaderFactory implements 
ContextClassLoaderFactory {
   throw new IllegalArgumentException("Unknown context");
 }
 
-try {
-  return classloaders.get(context, () -> {
-LOG.debug("Creating URLClassLoader for context, uris: {}", context);
-return new URLClassLoader(Arrays.stream(context.split(",")).map(url -> 
{
-  try {
-return new URL(url);
-  } catch (MalformedURLException e) {
-throw new RuntimeException(e);
-  }
-}).collect(Collectors.toList()).toArray(new URL[] {}), 
ClassLoader.getSystemClassLoader());
-  });
-} catch (ExecutionException e) {
-  throw new RuntimeException(e);
-}
+return classloaders.get(context, k -> {
+  LOG.debug("Creating URLClassLoader for context, uris: {}", context);
+  return new URLClassLoader(Arrays.stream(context.split(",")).map(url -> {
+try {
+  return new URL(url);
+} catch (MalformedURLException e) {
+  throw new

[accumulo] branch 2.1 updated: Update Maven plugins to support Maven 3.9.0 (#3222)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
 new 7d7884787a Update Maven plugins to support Maven 3.9.0 (#3222)
7d7884787a is described below

commit 7d7884787ab892ccb5860acd51989f5abc36734a
Author: Christopher L. Shannon 
AuthorDate: Fri Mar 3 07:36:20 2023 -0500

Update Maven plugins to support Maven 3.9.0 (#3222)

modernizer-maven-plugin: 2.5.0
impsort-maven-plugin: 1.8.0
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c64e71bfdb..a1fc550b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -728,7 +728,7 @@
 
   org.gaul
   modernizer-maven-plugin
-  2.4.0
+  2.5.0
   
 ${maven.compiler.target}
   
@@ -954,7 +954,7 @@
 
   net.revelc.code
   impsort-maven-plugin
-  1.7.0
+  1.8.0
   
 true
 java.,javax.,jakarta.,org.,com.

[accumulo] 01/01: Merge branch '2.1'

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 903aa5974da3928e49bff5115e3980913bd6b3a8
Merge: 6fdb98b44e 7d7884787a
Author: Christopher L. Shannon (cshannon) 
AuthorDate: Fri Mar 3 07:36:42 2023 -0500

Merge branch '2.1'

 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[accumulo] branch main updated (6fdb98b44e -> 903aa5974d)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from 6fdb98b44e Merge branch '2.1'
 add 7d7884787a Update Maven plugins to support Maven 3.9.0 (#3222)
 new 903aa5974d Merge branch '2.1'

The 1 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:
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[accumulo] 01/01: Merge branch '2.1'

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 6fdb98b44e1d7e1237792e63d8f07c0a8a7e04e3
Merge: a21694240b b59af2ce66
Author: Christopher L. Shannon (cshannon) 
AuthorDate: Fri Mar 3 06:56:20 2023 -0500

Merge branch '2.1'

 pom.xml | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

[accumulo] branch main updated (a21694240b -> 6fdb98b44e)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from a21694240b Merge branch '2.1'
 add b59af2ce66 Update several dependency versions (#3207)
 new 6fdb98b44e Merge branch '2.1'

The 1 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:
 pom.xml | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

[accumulo] branch 2.1 updated: Update several dependency versions (#3207)

2023-03-03 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
 new b59af2ce66 Update several dependency versions (#3207)
b59af2ce66 is described below

commit b59af2ce6696826dc7397a3fae2ca4718376d5e7
Author: Christopher L. Shannon 
AuthorDate: Fri Mar 3 06:54:17 2023 -0500

Update several dependency versions (#3207)

* Apache parent 29
* Slf4j 2.0.6
* Jackson 2.14.2
* Jetty 11.0.13
* Jaxb 4.0.2
* Jersey 3.0.9
* Junit 5.9.2
* Caffeine 3.1.4
* Protobuf 3.22.0
* Jline 3.22.0
* Spotbugs annotations 4.7.3
* Freemarker 2.3.22
---
 pom.xml | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0dc8d7c901..c64e71bfdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   
 org.apache
 apache
-28
+29
   
   org.apache.accumulo
   accumulo-project
@@ -147,7 +147,7 @@
 
 
2022-10-27T05:45:29Z
 true
-2.0.3
+2.0.6
 
source-release-tar
 
 false
@@ -166,7 +166,7 @@
   
 com.fasterxml.jackson
 jackson-bom
-2.13.4.20221013
+2.14.2
 pom
 import
   
@@ -208,7 +208,7 @@
   
 org.eclipse.jetty
 jetty-bom
-11.0.12
+11.0.13
 pom
 import
   
@@ -222,7 +222,7 @@
   
 org.glassfish.jaxb
 jaxb-bom
-4.0.0
+4.0.2
 pom
 import
   
@@ -230,14 +230,14 @@
 org.glassfish.jersey
 jersey-bom
 
-3.0.8
+3.0.9
 pom
 import
   
   
 org.junit
 junit-bom
-5.9.1
+5.9.2
 pom
 import
   
@@ -254,12 +254,12 @@
   
 com.github.ben-manes.caffeine
 caffeine
-3.1.1
+3.1.4
   
   
 com.github.spotbugs
 spotbugs-annotations
-4.7.2
+4.7.3
   
   
 com.google.auto.service
@@ -296,7 +296,7 @@
   
 com.google.protobuf
 protobuf-java
-3.21.7
+3.22.0
   
   
 com.lmax
@@ -584,7 +584,7 @@
   
 org.freemarker
 freemarker
-2.3.31
+2.3.32
   
   
 org.glassfish
@@ -626,7 +626,7 @@
   
 org.jline
 jline
-3.21.0
+3.22.0
   
   
 org.latencyutils