This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 5a9257e HDDS-5357. Move SCMUpdateProtocol to hdds interface-server
package. (#2348)
5a9257e is described below
commit 5a9257eb8a06abbe45c7dda8bb387aeeadba1973
Author: Xiaoyu Yao <[email protected]>
AuthorDate: Tue Jun 22 04:33:44 2021 -0700
HDDS-5357. Move SCMUpdateProtocol to hdds interface-server package. (#2348)
---
.../org/apache/hadoop/hdds/security/x509/crl/CRLCodec.java | 0
.../org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java | 0
.../apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java | 0
hadoop-hdds/interface-client/pom.xml | 13 -------------
hadoop-hdds/interface-server/pom.xml | 2 ++
.../src/main/proto/SCMUpdateProtocol.proto | 0
6 files changed, 2 insertions(+), 13 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLCodec.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLCodec.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLCodec.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLCodec.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java
similarity index 100%
rename from
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java
rename to
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfoCodec.java
diff --git a/hadoop-hdds/interface-client/pom.xml
b/hadoop-hdds/interface-client/pom.xml
index 6ec7425..a3ccaeb 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -72,7 +72,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<includes>
<include>DatanodeClientProtocol.proto</include>
<include>SCMClientProtocol.proto</include>
- <include>SCMUpdateProtocol.proto</include>
</includes>
<outputDirectory>target/generated-sources/java</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
@@ -121,18 +120,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
value="org.apache.ratis.thirdparty.com.google.common"
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto">
</replace>
- <replace token="com.google.protobuf"
-
value="org.apache.ratis.thirdparty.com.google.protobuf"
-
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
- </replace>
- <replace token="io.grpc"
- value="org.apache.ratis.thirdparty.io.grpc"
-
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
- </replace>
- <replace token="com.google.common"
- value="org.apache.ratis.thirdparty.com.google.common"
-
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
- </replace>
</tasks>
</configuration>
<goals>
diff --git a/hadoop-hdds/interface-server/pom.xml
b/hadoop-hdds/interface-server/pom.xml
index 3ecd715..e1c2744 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -68,6 +68,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
<include>InterSCMProtocol.proto</include>
+ <include>SCMUpdateProtocol.proto</include>
</includes>
<outputDirectory>target/generated-sources/java</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
@@ -90,6 +91,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<excludes>
<exclude>InterSCMProtocol.proto</exclude>
+ <exclude>SCMUpdateProtocol.proto</exclude>
</excludes>
<outputDirectory>target/generated-sources/java</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
diff --git
a/hadoop-hdds/interface-client/src/main/proto/SCMUpdateProtocol.proto
b/hadoop-hdds/interface-server/src/main/proto/SCMUpdateProtocol.proto
similarity index 100%
rename from hadoop-hdds/interface-client/src/main/proto/SCMUpdateProtocol.proto
rename to hadoop-hdds/interface-server/src/main/proto/SCMUpdateProtocol.proto
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
