This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo.git
The following commit(s) were added to refs/heads/master by this push:
new 2fe8215 Update Fluo to build against Accumulo 2.0.0 (#1074)
2fe8215 is described below
commit 2fe8215d66a73ef44b399bd5aeb50a198c71be0f
Author: Keith Turner <[email protected]>
AuthorDate: Thu Aug 8 13:06:16 2019 -0400
Update Fluo to build against Accumulo 2.0.0 (#1074)
---
.../org/apache/fluo/core/client/FluoAdminImpl.java | 2 +-
.../java/org/apache/fluo/core/impl/Environment.java | 6 +++---
modules/integration-tests/pom.xml | 2 +-
.../java/org/apache/fluo/integration/ITBase.java | 2 +-
modules/mapreduce/pom.xml | 2 +-
pom.xml | 20 +++-----------------
6 files changed, 10 insertions(+), 24 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
index df45c2c..8ff40bd 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/client/FluoAdminImpl.java
@@ -286,7 +286,7 @@ public class FluoAdminImpl implements FluoAdmin {
final String accumuloInstanceName =
client.properties().getProperty(AccumuloProps.CLIENT_INSTANCE_NAME);
- final String accumuloInstanceID = client.getInstanceID();
+ final String accumuloInstanceID =
client.instanceOperations().getInstanceID();
final String fluoApplicationID = UUID.randomUUID().toString();
// Create node specified by chroot suffix of Zookeeper connection string
(if it doesn't exist)
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/Environment.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/Environment.java
index a5c389f..5e4988c 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/impl/Environment.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/impl/Environment.java
@@ -97,9 +97,9 @@ public class Environment implements AutoCloseable {
"unexpected accumulo instance name " + instanceName + " != " +
accumuloInstance);
}
- if (!client.getInstanceID().equals(accumuloInstanceID)) {
- throw new IllegalArgumentException("unexpected accumulo instance id " +
client.getInstanceID()
- + " != " + accumuloInstanceID);
+ if
(!client.instanceOperations().getInstanceID().equals(accumuloInstanceID)) {
+ throw new IllegalArgumentException("unexpected accumulo instance id "
+ + client.instanceOperations().getInstanceID() + " != " +
accumuloInstanceID);
}
try {
diff --git a/modules/integration-tests/pom.xml
b/modules/integration-tests/pom.xml
index 8a0adb9..c53164e 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -112,7 +112,7 @@
<plugins>
<plugin>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-maven-plugin</artifactId>
+ <artifactId>accumulo2-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git
a/modules/integration-tests/src/main/java/org/apache/fluo/integration/ITBase.java
b/modules/integration-tests/src/main/java/org/apache/fluo/integration/ITBase.java
index 3bb62e3..70f74be 100644
---
a/modules/integration-tests/src/main/java/org/apache/fluo/integration/ITBase.java
+++
b/modules/integration-tests/src/main/java/org/apache/fluo/integration/ITBase.java
@@ -73,7 +73,7 @@ public class ITBase {
@BeforeClass
public static void setUpAccumulo() throws Exception {
instanceName = System.getProperty(IT_INSTANCE_NAME_PROP,
"it-instance-default");
- File instanceDir = new File("target/accumulo-maven-plugin/" +
instanceName);
+ File instanceDir = new File("target/accumulo2-maven-plugin/" +
instanceName);
boolean instanceClear =
System.getProperty(IT_INSTANCE_CLEAR_PROP,
"true").equalsIgnoreCase("true");
if (instanceDir.exists() && instanceClear) {
diff --git a/modules/mapreduce/pom.xml b/modules/mapreduce/pom.xml
index c4a1339..b25e273 100644
--- a/modules/mapreduce/pom.xml
+++ b/modules/mapreduce/pom.xml
@@ -100,7 +100,7 @@
<plugins>
<plugin>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-maven-plugin</artifactId>
+ <artifactId>accumulo2-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 58abc63..dd3eed2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<url>https://github.com/apache/fluo/issues</url>
</issueManagement>
<properties>
- <accumulo.version>2.0.0-alpha-2</accumulo.version>
+ <accumulo.version>2.0.0</accumulo.version>
<curator.version>4.0.1</curator.version>
<dropwizard.version>0.8.1</dropwizard.version>
<findbugs.maxRank>11</findbugs.maxRank>
@@ -254,27 +254,13 @@
</dependency>
</dependencies>
</dependencyManagement>
- <pluginRepositories>
- <!--
- needed for accumulo-maven-plugin SNAPSHOT version
- see PR apache/maven-apache-parent#1
- -->
- <pluginRepository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <artifactId>accumulo2-maven-plugin</artifactId>
+ <version>1.0.0</version>
<configuration>
<instanceName>it-instance-maven</instanceName>
<rootPassword>ITSecret</rootPassword>
