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 c2dbdf50229348953f906b7857f79d8d27d3d625 Merge: 90920e218d 70c2c78334 Author: Christopher Tubbs <[email protected]> AuthorDate: Thu Sep 18 21:16:10 2025 -0400 Merge branch '2.1' .github/workflows/maven-full-its.yaml | 4 +- .github/workflows/maven-on-demand.yaml | 2 +- core/pom.xml | 8 +- .../apache/accumulo/core/FilteredConstants.java | 2 +- pom.xml | 90 ++++++++++++---------- server/monitor/pom.xml | 8 +- server/tserver/pom.xml | 7 +- .../tserver/log/TestUpgradePathForWALogs.java | 7 +- src/build/license-header.txt | 16 ---- test/pom.xml | 2 +- 10 files changed, 60 insertions(+), 86 deletions(-) diff --cc pom.xml index 7adfbe6ae2,e7ed0e963f..84bd8ddefd --- a/pom.xml +++ b/pom.xml @@@ -110,12 -112,32 +110,32 @@@ <url>https://github.com/apache/accumulo/actions</url> </ciManagement> <properties> - <accumulo.javadoc.since.versions>4.0.0</accumulo.javadoc.since.versions> + <!-- properties used by the accumulo build in our own POM files --> + <accumulo.build.extraTestArgs>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.management/java.lang.management=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens j [...] - <accumulo.build.javadoc.since>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.build.javadoc.since> ++ <accumulo.build.javadoc.since>4.0.0</accumulo.build.javadoc.since> + <accumulo.build.license.header><![CDATA[ + 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. + ]]></accumulo.build.license.header> <!-- used for filtering the java source with the current version --> - <accumulo.release.version>${project.version}</accumulo.release.version> + <accumulo.build.release.version>${project.version}</accumulo.build.release.version> + <accumulo.build.unitTestMemSize>-Xmx1G</accumulo.build.unitTestMemSize> <!-- avoid error shutting down built-in ForkJoinPool.commonPool() during exec:java tasks --> <exec.cleanupDaemonThreads>false</exec.cleanupDaemonThreads> - <extraTestArgs>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.management/java.lang.management=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.u [...] <failsafe.excludedGroups /> <failsafe.failIfNoSpecifiedTests>false</failsafe.failIfNoSpecifiedTests> <failsafe.forkCount>1</failsafe.forkCount> @@@ -123,11 -145,8 +143,8 @@@ <failsafe.reuseForks>false</failsafe.reuseForks> <!-- prevent introduction of new compiler warnings --> <maven.compiler.failOnWarning>true</maven.compiler.failOnWarning> - <maven.compiler.release>17</maven.compiler.release> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.target>17</maven.compiler.target> <maven.javadoc.failOnWarnings>true</maven.javadoc.failOnWarnings> - <maven.javadoc.since.version>4.0.0</maven.javadoc.since.version> <maven.site.deploy.skip>true</maven.site.deploy.skip> <maven.site.skip>true</maven.site.skip> <!-- surefire/failsafe plugin option --> @@@ -145,18 -164,15 +162,16 @@@ <surefire.forkCount>1C</surefire.forkCount> <surefire.groups /> <surefire.reuseForks>true</surefire.reuseForks> - <unitTestMemSize>-Xmx1G</unitTestMemSize> <!-- dependency and plugin versions managed with properties --> + <version.accumulo-access>1.0.0-SNAPSHOT</version.accumulo-access> <version.auto-service>1.1.1</version.auto-service> <version.bouncycastle>1.80</version.bouncycastle> <version.curator>5.8.0</version.curator> - <version.errorprone>2.35.0</version.errorprone> + <version.errorprone>2.41.0</version.errorprone> - <version.hadoop>3.3.6</version.hadoop> + <version.flatbuffers>24.3.25</version.flatbuffers> + <version.hadoop>3.4.0</version.hadoop> - <version.log4j>2.24.3</version.log4j> + <version.log4j>2.25.1</version.log4j> <version.opentelemetry>1.48.0</version.opentelemetry> -- <version.powermock>2.0.9</version.powermock> <version.slf4j>2.0.17</version.slf4j> <version.thrift>0.17.0</version.thrift> <version.zookeeper>3.9.3</version.zookeeper> @@@ -694,7 -752,8 +708,7 @@@ <plugin> <groupId>org.gaul</groupId> <artifactId>modernizer-maven-plugin</artifactId> - <version>3.1.0</version> - <!-- newer versions suggest changes not worth the effort in 2.1 --> - <version>2.9.0</version> ++ <version>3.2.0</version> <configuration> <javaVersion>${maven.compiler.target}</javaVersion> </configuration> @@@ -937,8 -991,10 +945,6 @@@ <undeclared>org.apache.hadoop:hadoop-mapreduce-client-core:jar:*</undeclared> <undeclared>org.apache.hadoop:hadoop-auth:jar:*</undeclared> <undeclared>org.apache.httpcomponents:httpcore:jar:*</undeclared> -- <undeclared>org.powermock:powermock-core:jar:*</undeclared> -- <undeclared>org.powermock:powermock-reflect:jar:*</undeclared> - <!-- This should be removed upon completion of migrating junit 4 to 5 --> - <undeclared>junit:junit:jar:*</undeclared> </ignoredUsedUndeclaredDependencies> <ignoredUnusedDeclaredDependencies> <!-- auto-service isn't used in every module --> @@@ -951,7 -1007,7 +957,6 @@@ <unused>org.glassfish.jersey.ext:jersey-bean-validation:jar:*</unused> <unused>org.glassfish.jersey.inject:jersey-hk2:jar:*</unused> <unused>org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:jar:*</unused> -- <unused>org.powermock:powermock-api-easymock:jar:*</unused> <!-- spotbugs annotations may or may not be used in each module --> <unused>com.github.spotbugs:spotbugs-annotations:jar:*</unused> <!-- ignore unused native; analysis isn't possible with tar.gz dependency --> @@@ -960,10 -1016,9 +965,8 @@@ <unused>org.apache.logging.log4j:log4j-1.2-api:jar:*</unused> <unused>org.apache.logging.log4j:log4j-slf4j2-impl:jar:*</unused> <unused>org.apache.logging.log4j:log4j-web:jar:*</unused> - <!-- ignore log4j dep used for annotations and needed for compile time linting --> - <unused>biz.aQute.bnd:biz.aQute.bnd.annotation:jar:*</unused> - <!-- This should be removed upon completion of migrating junit 4 to 5 --> - <unused>org.junit.vintage:junit-vintage-engine:jar:*</unused> <unused>org.junit.jupiter:junit-jupiter-engine:jar:*</unused> + <unused>org.junit.platform:junit-platform-suite-engine:jar:*</unused> <unused>org.lz4:lz4-java:jar:*</unused> </ignoredUnusedDeclaredDependencies> </configuration> @@@ -1695,9 -1756,10 +1702,10 @@@ <configuration> <compilerArgs> <arg>-XDcompilePolicy=simple</arg> + <arg>--should-stop=ifError=FLOW</arg> <arg> -Xplugin:ErrorProne \ - -XepExcludedPaths:.*/(proto|thrift|generated-sources|src/test)/.* \ + -XepExcludedPaths:.*/(flatbuffers|thrift|generated-sources|src/test)/.* \ -XepDisableWarningsInGeneratedCode \ -XepDisableAllWarnings \ <!-- ERROR patterns to specifically ignore --> diff --cc server/tserver/pom.xml index ad86377bc4,40622e37a1..ec347bad46 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@@ -105,11 -113,11 +105,6 @@@ <artifactId>hadoop-client-runtime</artifactId> <scope>runtime</scope> </dependency> -- <dependency> -- <groupId>commons-io</groupId> -- <artifactId>commons-io</artifactId> -- <scope>test</scope> -- </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> diff --cc server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java index d83a6a967b,8aab03b5c6..883883fc0a --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java @@@ -37,9 -39,8 +37,8 @@@ import org.apache.accumulo.core.spi.cry import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.fs.VolumeManagerImpl; +import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.WithTestNames; --import org.apache.commons.io.IOUtils; import org.apache.hadoop.fs.Path; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@@ -100,12 -97,11 +99,12 @@@ public class TestUpgradePathForWALogs e @Test public void testUpgradeOf15WALog() throws IOException { String walogToTest = WALOG_FROM_15; - String testPath = perTestTempSubDir.getAbsolutePath(); + String testPath = perTestTempSubDir.toAbsolutePath().toString(); - try (InputStream walogStream = getClass().getResourceAsStream(walogToTest); - OutputStream walogInHDFStream = new FileOutputStream(testPath + walogToTest)) { - IOUtils.copyLarge(walogStream, walogInHDFStream); + try (InputStream walogStream = getClass().getResourceAsStream("/" + walogToTest); + OutputStream walogInHDFStream = + Files.newOutputStream(perTestTempSubDir.resolve(walogToTest))) { - IOUtils.copyLarge(walogStream, walogInHDFStream); ++ walogStream.transferTo(walogInHDFStream); walogInHDFStream.flush(); walogInHDFStream.close(); @@@ -122,13 -117,12 +121,13 @@@ @Test public void testBasic16WALogRead() throws IOException { String walogToTest = WALOG_FROM_16; - String testPath = perTestTempSubDir.getAbsolutePath(); + String testPath = perTestTempSubDir.toAbsolutePath().toString(); String destPath = "file://" + testPath + "/manyMaps"; - try (InputStream walogStream = getClass().getResourceAsStream(walogToTest); - OutputStream walogInHDFStream = new FileOutputStream(testPath + walogToTest)) { - IOUtils.copyLarge(walogStream, walogInHDFStream); + try (InputStream walogStream = getClass().getResourceAsStream("/" + walogToTest); + OutputStream walogInHDFStream = + Files.newOutputStream(java.nio.file.Path.of(testPath).resolve(walogToTest))) { - IOUtils.copyLarge(walogStream, walogInHDFStream); ++ walogStream.transferTo(walogInHDFStream); walogInHDFStream.flush(); walogInHDFStream.close(); @@@ -147,13 -141,12 +146,13 @@@ @Test public void testBasic20WALogRead() throws IOException { String walogToTest = WALOG_FROM_20; - String testPath = perTestTempSubDir.getAbsolutePath(); + String testPath = perTestTempSubDir.toAbsolutePath().toString(); String destPath = "file://" + testPath + "/manyMaps"; - try (InputStream walogStream = getClass().getResourceAsStream(walogToTest); - OutputStream walogInHDFStream = new FileOutputStream(testPath + walogToTest)) { - IOUtils.copyLarge(walogStream, walogInHDFStream); + try (InputStream walogStream = getClass().getResourceAsStream("/" + walogToTest); + OutputStream walogInHDFStream = + Files.newOutputStream(java.nio.file.Path.of(testPath).resolve(walogToTest))) { - IOUtils.copyLarge(walogStream, walogInHDFStream); ++ walogStream.transferTo(walogInHDFStream); walogInHDFStream.flush(); walogInHDFStream.close(); diff --cc test/pom.xml index e6ba98372d,c58e377869..e4f6dd5052 --- a/test/pom.xml +++ b/test/pom.xml @@@ -243,23 -240,6 +243,23 @@@ <mapping> <shellit>SCRIPT_STYLE</shellit> </mapping> + <licenseSets> + <licenseSet> - <header>${rootlocation}/src/build/license-header.txt</header> ++ <inlineHeader>${accumulo.build.license.header}</inlineHeader> + <excludes> + <exclude>src/main/resources/v2_import_test/data/distcp.txt</exclude> + </excludes> + </licenseSet> + </licenseSets> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/main/resources/v2_import_test/data/distcp.txt</exclude> + </excludes> </configuration> </plugin> <plugin>
