[accumulo] branch main updated (b202483d62 -> 6c4905a1a1)

[ct...@apache.org]

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 b202483d62 Merge remote-tracking branch 'upstream/2.1'
     add 6c4905a1a1 Remove more deprecations for 3.0 (#3456)

No new revisions were added by this update.

Summary of changes:
 .../core/client/admin/TableOperations.java         |   4 +-
 .../compaction/ShellCompactCommandConfigurer.java  |  69 ++++
 .../compaction/ShellCompactCommandSelector.java    |  48 +--
 .../org/apache/accumulo/core/conf/Property.java    |   3 -
 .../accumulo/core/conf/SiteConfiguration.java      |   8 -
 .../accumulo/core/spi/compaction/package-info.java |   3 -
 .../ShellCompactCommandConfigurerTest.java         |  11 +-
 .../ShellCompactCommandSelectorTest.java}          |  15 +-
 .../org/apache/accumulo/server/util/Admin.java     |  16 -
 .../apache/accumulo/server/util/ConvertConfig.java | 107 ------
 .../main/java/org/apache/accumulo/gc/GCRun.java    |  15 -
 .../accumulo/gc/GarbageCollectWriteAheadLogs.java  |  11 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  16 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java       |  58 ++--
 .../accumulo/gc/SimpleGarbageCollectorTest.java    |  11 -
 .../src/test/resources/conf/accumulo-site.xml      | 104 ------
 shell/pom.xml                                      |   8 -
 .../main/java/org/apache/accumulo/shell/Shell.java |  10 +-
 .../org/apache/accumulo/shell/ShellOptionsJC.java  |   8 -
 .../accumulo/shell/commands/CompactCommand.java    |  10 +-
 .../accumulo/shell/commands/FateCommand.java       | 373 ---------------------
 .../accumulo/shell/commands/FateCommandTest.java   | 339 -------------------
 .../accumulo/test/functional/CompactionIT.java     |   1 -
 .../functional/GarbageCollectorTrashDefaultIT.java |  12 +-
 .../GarbageCollectorTrashDisabledIT.java           |  86 -----
 .../functional/GarbageCollectorTrashEnabledIT.java |   8 +-
 ...geCollectorTrashEnabledWithCustomPolicyIT.java} |  10 +-
 .../apache/accumulo/test/start/KeywordStartIT.java |   2 -
 28 files changed, 136 insertions(+), 1230 deletions(-)
 create mode 100644 core/src/main/java/org/apache/accumulo/core/compaction/ShellCompactCommandConfigurer.java
 rename server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java => core/src/main/java/org/apache/accumulo/core/compaction/ShellCompactCommandSelector.java (81%)
 rename server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java => core/src/test/java/org/apache/accumulo/core/compaction/ShellCompactCommandConfigurerTest.java (91%)
 copy core/src/{main/java/org/apache/accumulo/core/compaction/NullType.java => test/java/org/apache/accumulo/core/compaction/ShellCompactCommandSelectorTest.java} (75%)
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/util/ConvertConfig.java
 delete mode 100644 server/manager/src/test/resources/conf/accumulo-site.xml
 delete mode 100644 shell/src/main/java/org/apache/accumulo/shell/commands/FateCommand.java
 delete mode 100644 shell/src/test/java/org/apache/accumulo/shell/commands/FateCommandTest.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDisabledIT.java
 rename test/src/main/java/org/apache/accumulo/test/functional/{GarbageCollectorTrashEnabledCustomPolicyIT.java => GarbageCollectorTrashEnabledWithCustomPolicyIT.java} (91%)