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-testing.git
The following commit(s) were added to refs/heads/main by this push:
new e193354 Use ZK 3.5.10 by default
e193354 is described below
commit e19335493bf30b6e86bc5e898554c92d28fcd7fd
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Jun 8 17:22:27 2022 -0400
Use ZK 3.5.10 by default
* Use ZK 3.5.10, to be consistent with the current default Accumulo
version
* Update parent POM version, and formatter/impsort plugins
* Update NOTICE for current copyright year
---
NOTICE | 2 +-
conf/env.sh | 2 +-
pom.xml | 14 +++-----------
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/NOTICE b/NOTICE
index 3b9aef1..99111d9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Accumulo Testing
-Copyright 2011-2019 The Apache Software Foundation
+Copyright 2011-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/conf/env.sh b/conf/env.sh
index 7ba69ba..7bea8da 100644
--- a/conf/env.sh
+++ b/conf/env.sh
@@ -61,7 +61,7 @@ fi
# Versions set below will be what is included in the shaded jar
ACCUMULO_VERSION="$("$ACCUMULO_HOME"/bin/accumulo version | grep -v 'DEBUG')";
export ACCUMULO_VERSION
HADOOP_VERSION="$(hadoop version | head -n1 | awk '{print $2}')"; export
HADOOP_VERSION
-export ZOOKEEPER_VERSION=3.5.9
+export ZOOKEEPER_VERSION=3.5.10
# Path to shaded test jar
at_home=$( cd "$( dirname "$conf_dir" )" && pwd )
export TEST_JAR_PATH="${at_home}/target/accumulo-testing-shaded.jar"
diff --git a/pom.xml b/pom.xml
index b0a3444..257f0dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>24</version>
+ <version>26</version>
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-testing</artifactId>
@@ -157,18 +157,13 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.17.0</version>
+ <version>2.19.0</version>
<configuration>
<configFile>${eclipseFormatterStyle}</configFile>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
<compilerSource>${maven.compiler.source}</compilerSource>
<compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
- <excludes>
- <exclude>**/thrift/*.java</exclude>
- <exclude>**/proto/*.java</exclude>
- </excludes>
<lineEnding>LF</lineEnding>
- <overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
<skipJsFormatting>true</skipJsFormatting>
<skipHtmlFormatting>true</skipHtmlFormatting>
<skipXmlFormatting>true</skipXmlFormatting>
@@ -179,13 +174,10 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
- <version>1.6.2</version>
+ <version>1.7.0</version>
<configuration>
<removeUnused>true</removeUnused>
<groups>java.,javax.,jakarta.,org.,com.</groups>
- <excludes>
- <exclude>**/thrift/*.java</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
