You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by di...@apache.org on 2020/06/21 03:00:25 UTC
[hadoop-ozone] branch master updated: HDDS-3792. Separate client
proto files of Ozone to separated subprojects (#1100)
This is an automated email from the ASF dual-hosted git repository.
dineshc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 8f7852d HDDS-3792. Separate client proto files of Ozone to separated subprojects (#1100)
8f7852d is described below
commit 8f7852d4e7b1491e3ca895920bd8b4086709a630
Author: Elek, Márton <el...@users.noreply.github.com>
AuthorDate: Sun Jun 21 05:00:13 2020 +0200
HDDS-3792. Separate client proto files of Ozone to separated subprojects (#1100)
---
.../common/dev-support/findbugsExcludeFile.xml | 6 --
hadoop-ozone/common/pom.xml | 29 ++------
.../dev-support/findbugsExcludeFile.xml | 1 -
hadoop-ozone/interface-client/pom.xml | 77 ++++++++++++++++++++++
.../src/main/proto/OmClientProtocol.proto} | 0
.../src/main/proto/Security.proto | 0
.../src/main/proto/proto.lock | 2 +-
hadoop-ozone/pom.xml | 6 ++
8 files changed, 88 insertions(+), 33 deletions(-)
diff --git a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
index 33e72fc..55abc26 100644
--- a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
@@ -16,10 +16,4 @@
limitations under the License.
-->
<FindBugsFilter>
- <Match>
- <Package name="org.apache.hadoop.ozone.protocol.proto"/>
- </Match>
- <Match>
- <Package name="org.apache.hadoop.security.proto"/>
- </Match>
</FindBugsFilter>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 4d84337..754351b 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -48,6 +48,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>hadoop-hdds-client</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-ozone-interface-client</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -84,31 +88,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</resources>
<plugins>
<plugin>
- <groupId>com.salesforce.servicelibs</groupId>
- <artifactId>proto-backwards-compatibility</artifactId>
- </plugin>
- <plugin>
- <groupId>org.xolstice.maven.plugins</groupId>
- <artifactId>protobuf-maven-plugin</artifactId>
- <version>${protobuf-maven-plugin.version}</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>compile-protoc</id>
- <goals>
- <goal>compile</goal>
- <goal>test-compile</goal>
- </goals>
- <configuration>
- <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
- <protocArtifact>
- com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
- </protocArtifact>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-maven-plugins</artifactId>
<executions>
diff --git a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml b/hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
similarity index 96%
copy from hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
copy to hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
index 33e72fc..9d0ce5d 100644
--- a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml
new file mode 100644
index 0000000..9a5c5ab
--- /dev/null
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. See accompanying LICENSE file.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-ozone</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>hadoop-ozone-interface-client</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <description>Apache Hadoop Ozone Client interface</description>
+ <name>Apache Hadoop Ozone Client Interface</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdds-interface-client</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.salesforce.servicelibs</groupId>
+ <artifactId>proto-backwards-compatibility</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${protobuf-maven-plugin.version}</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>compile-protoc</id>
+ <goals>
+ <goal>compile</goal>
+ <goal>test-compile</goal>
+ </goals>
+ <configuration>
+ <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
+ <protocArtifact>
+ com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+ </protocArtifact>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <configuration>
+ <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto b/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
similarity index 100%
rename from hadoop-ozone/common/src/main/proto/OzoneManagerProtocol.proto
rename to hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
diff --git a/hadoop-ozone/common/src/main/proto/Security.proto b/hadoop-ozone/interface-client/src/main/proto/Security.proto
similarity index 100%
rename from hadoop-ozone/common/src/main/proto/Security.proto
rename to hadoop-ozone/interface-client/src/main/proto/Security.proto
diff --git a/hadoop-ozone/common/src/main/proto/proto.lock b/hadoop-ozone/interface-client/src/main/proto/proto.lock
similarity index 99%
rename from hadoop-ozone/common/src/main/proto/proto.lock
rename to hadoop-ozone/interface-client/src/main/proto/proto.lock
index 01eedd0..fad9e37 100644
--- a/hadoop-ozone/common/src/main/proto/proto.lock
+++ b/hadoop-ozone/interface-client/src/main/proto/proto.lock
@@ -1,7 +1,7 @@
{
"definitions": [
{
- "protopath": "OzoneManagerProtocol.proto",
+ "protopath": "OmClientProtocol.proto",
"def": {
"enums": [
{
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 0bf236d..3cc5df1 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -30,6 +30,7 @@
<jooq.version>3.11.10</jooq.version>
</properties>
<modules>
+ <module>interface-client</module>
<module>common</module>
<module>client</module>
<module>ozone-manager</module>
@@ -68,6 +69,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-ozone-interface-client</artifactId>
+ <version>${ozone.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-ozone-manager</artifactId>
<version>${ozone.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org