http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1d64d60/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java index b621a08..57d4287 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java @@ -29,7 +29,7 @@ import org.apache.hadoop.fs.StorageType; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; import org.apache.hadoop.ozone.container.common.helpers.ContainerData; import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; import org.apache.hadoop.ozone.container.common.helpers.KeyData;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1d64d60/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java index 2da6874..a5d268d 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.ozone.genesis; -import com.google.protobuf.ByteString; +import org.apache.ratis.shaded.com.google.protobuf.ByteString; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.RandomStringUtils; @@ -53,15 +53,22 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.apache.hadoop.ozone.OzoneConsts.CONTAINER_ROOT_PREFIX; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.ContainerCommandRequestProto; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.CreateContainerRequestProto; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.ReadChunkRequestProto; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.WriteChunkRequestProto; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.PutKeyRequestProto; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.GetKeyRequestProto; -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos.ContainerData; - -import org.apache.hadoop.hdds.protocol.proto.ContainerProtos; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos + .ContainerCommandRequestProto; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos + .CreateContainerRequestProto; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos + .ReadChunkRequestProto; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos + .WriteChunkRequestProto; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos + .PutKeyRequestProto; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos + .GetKeyRequestProto; +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos + .ContainerData; + +import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor; http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1d64d60/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 793ffb4..862a693 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -104,6 +104,11 @@ <mssql.version>6.2.1.jre7</mssql.version> <okhttp.version>2.7.5</okhttp.version> + <!-- Maven protoc compiler --> + <protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version> + <protobuf-compile.version>3.1.0</protobuf-compile.version> + <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version> + <!-- define the Java language version used by the compiler --> <javac.version>1.8</javac.version> @@ -413,7 +418,7 @@ <version>${hadoop.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-applications-distributedshell</artifactId> <version>${hadoop.version}</version> @@ -1737,8 +1742,8 @@ </ignores> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
