Merge branch '2.1'
diff --git a/conf/accumulo-testing.properties b/conf/accumulo-testing.properties
index 93c3227..36f618c 100644
--- a/conf/accumulo-testing.properties
+++ b/conf/accumulo-testing.properties
@@ -45,8 +45,8 @@
test.ci.common.auths=
# Accumulo tserver properties to set when creating a table
test.ci.common.accumulo.server.props=\
-compaction.service.cs1.planner=org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner \
-compaction.service.cs1.planner.opts.executors=\
+tserver.compaction.major.service.cs1.planner=org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner \
+tserver.compaction.major.service.cs1.planner.opts.executors=\
[{"name":"small","type":"internal","maxSize":"16M","numThreads":8},\
{"name":"medium","type":"internal","maxSize":"128M","numThreads":4},\
{"name":"large","type":"internal","numThreads":2}]
diff --git a/pom.xml b/pom.xml
index 8cb867e..7c2a15a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,15 +24,15 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>30</version>
+ <version>31</version>
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-testing</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.4-SNAPSHOT</version>
<name>Apache Accumulo Testing</name>
<description>Testing tools for Apache Accumulo</description>
<properties>
- <accumulo.version>3.1.0-SNAPSHOT</accumulo.version>
+ <accumulo.version>2.1.4-SNAPSHOT</accumulo.version>
<!-- prevent introduction of new compiler warnings -->
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
<maven.compiler.release>11</maven.compiler.release>
