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 665a61ee8ed33258c532db280a541efe1099dcd2 Merge: f682971dd0 eec594e3af Author: Christopher Tubbs <[email protected]> AuthorDate: Thu Aug 28 17:54:11 2025 -0400 Merge branch '2.1' .github/ISSUE_TEMPLATE/post_vote_checklist.md | 2 ++ .../core/client/admin/CloneConfiguration.java | 6 ++++-- .../core/client/admin/ImportConfiguration.java | 4 ++-- .../accumulo/core/client/admin/TableOperations.java | 3 ++- .../core/clientImpl/CloneConfigurationImpl.java | 3 ++- .../accumulo/core/crypto/CryptoEnvironmentImpl.java | 2 +- .../main/java/org/apache/accumulo/core/data/Key.java | 4 ++-- .../org/apache/accumulo/core/data/KeyBuilder.java | 14 +++++++------- .../accumulo/core/data/constraints/Constraint.java | 5 ++++- .../data/constraints/DefaultKeySizeConstraint.java | 5 ++++- .../core/data/constraints/NoDeleteConstraint.java | 5 ++++- .../core/data/constraints/VisibilityConstraint.java | 5 ++++- .../accumulo/core/file/rfile/bcfile/BCFile.java | 2 +- .../org/apache/accumulo/core/iterators/Combiner.java | 6 ++++-- .../apache/accumulo/core/iterators/ServerFilter.java | 2 +- .../core/iterators/ServerSkippingIterator.java | 2 +- .../core/iterators/ServerWrappingIterator.java | 2 +- .../core/iterators/SynchronizedServerFilter.java | 2 +- .../accumulo/core/spi/crypto/CryptoEnvironment.java | 2 +- .../accumulo/core/spi/crypto/CryptoService.java | 2 +- .../core/spi/crypto/CryptoServiceFactory.java | 2 +- .../accumulo/core/spi/crypto/FileDecrypter.java | 2 +- .../accumulo/core/spi/crypto/FileEncrypter.java | 2 +- .../hadoop/mapred/AccumuloFileOutputFormat.java | 2 +- .../accumulo/hadoop/mapred/AccumuloInputFormat.java | 2 +- .../accumulo/hadoop/mapred/AccumuloOutputFormat.java | 2 +- .../hadoop/mapred/AccumuloRowInputFormat.java | 2 +- .../hadoop/mapreduce/AccumuloFileOutputFormat.java | 2 +- .../hadoop/mapreduce/AccumuloInputFormat.java | 2 +- .../hadoop/mapreduce/AccumuloOutputFormat.java | 2 +- .../hadoop/mapreduce/AccumuloRowInputFormat.java | 2 +- .../hadoop/mapreduce/FileOutputFormatBuilder.java | 6 +++--- .../accumulo/hadoop/mapreduce/InputFormatBuilder.java | 8 ++++---- .../hadoop/mapreduce/OutputFormatBuilder.java | 6 +++--- .../hadoop/its/mapred/AccumuloRowInputFormatIT.java | 2 +- .../hadoop/its/mapreduce/AccumuloInputFormatIT.java | 2 +- .../its/mapreduce/AccumuloRowInputFormatIT.java | 2 +- .../org/apache/accumulo/cluster/AccumuloCluster.java | 2 +- pom.xml | 19 ++++++++++++++++++- .../org/apache/accumulo/tserver/log/DfsLogger.java | 2 +- 40 files changed, 93 insertions(+), 56 deletions(-) diff --cc hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java index e7836adff9,689537b1b6..1480866e00 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java @@@ -79,13 -78,9 +79,13 @@@ import edu.umd.cs.findbugs.annotations. /** * Tests the new MR API in the hadoop-mapreduce package. * - * @since 2.0 + * @since 2.0.0 */ -public class AccumuloInputFormatIT extends AccumuloClusterHarness { +public class AccumuloInputFormatIT extends SharedMiniClusterBase { + + @SuppressFBWarnings("MS_SHOULD_BE_FINAL") + @TempDir + public static java.nio.file.Path tempDir; AccumuloInputFormat inputFormat; AccumuloClient client; diff --cc pom.xml index a8a63642af,083152f6b0..1bae04dd33 --- a/pom.xml +++ b/pom.xml @@@ -110,6 -112,7 +110,7 @@@ <url>https://github.com/apache/accumulo/actions</url> </ciManagement> <properties> - <accumulo.javadoc.since.versions>2.0.0,2.0.1,2.1.0,2.1.1,2.1.2,2.1.3,2.1.4,2.1.5</accumulo.javadoc.since.versions> ++ <accumulo.javadoc.since.versions>4.0.0</accumulo.javadoc.since.versions> <!-- used for filtering the java source with the current version --> <accumulo.release.version>${project.version}</accumulo.release.version> <!-- avoid error shutting down built-in ForkJoinPool.commonPool() during exec:java tasks -->
