Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-16664 Backport "HADOOP-16561 [MAPREDUCE] use protobuf-maven-plugin to generate protobuf classes" to all active branches

This commit is contained in:
Duo Zhang 2019-09-24 08:52:12 +08:00 committed by Masatake Iwasaki
parent 1d053b0c65
commit 57fd58bc3c
7 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
View File

@ -51,31 +51,21 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.hadoop</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>hadoop-maven-plugins</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>compile-protoc</id> <id>src-compile-protoc</id>
<goals>
<goal>protoc</goal>
</goals>
<configuration> <configuration>
<protocVersion>${protobuf.version}</protocVersion> <skip>false</skip>
<protocCommand>${protoc.path}</protocCommand> <additionalProtoPathElements>
<imports> <additionalProtoPathElement>
<param>${basedir}/../../../hadoop-common-project/hadoop-common/src/main/proto</param> ${basedir}/../../../hadoop-common-project/hadoop-common/src/main/proto
<param>${basedir}/../../../hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto</param> </additionalProtoPathElement>
<param>${basedir}/src/main/proto</param> <additionalProtoPathElement>
</imports> ${basedir}/../../../hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto
<source> </additionalProtoPathElement>
<directory>${basedir}/src/main/proto</directory> </additionalProtoPathElements>
<includes>
<include>HSAdminRefreshProtocol.proto</include>
<include>mr_protos.proto</include>
<include>mr_service_protos.proto</include>
<include>MRClientProtocol.proto</include>
</includes>
</source>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/HSAdminRefreshProtocol.proto
View File

@ -16,6 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
syntax = "proto2";
option java_package = "org.apache.hadoop.mapreduce.v2.hs.proto"; option java_package = "org.apache.hadoop.mapreduce.v2.hs.proto";
option java_outer_classname = "HSAdminRefreshProtocolProtos"; option java_outer_classname = "HSAdminRefreshProtocolProtos";
option java_generic_services = true; option java_generic_services = true;

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/MRClientProtocol.proto
View File

@ -16,6 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
syntax = "proto2";
option java_package = "org.apache.hadoop.yarn.proto"; option java_package = "org.apache.hadoop.yarn.proto";
option java_outer_classname = "MRClientProtocol"; option java_outer_classname = "MRClientProtocol";
option java_generic_services = true; option java_generic_services = true;

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto
View File

@ -16,6 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
syntax = "proto2";
option java_package = "org.apache.hadoop.mapreduce.v2.proto"; option java_package = "org.apache.hadoop.mapreduce.v2.proto";
option java_outer_classname = "MRProtos"; option java_outer_classname = "MRProtos";
option java_generic_services = true; option java_generic_services = true;

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_service_protos.proto
View File

@ -16,6 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
syntax = "proto2";
option java_package = "org.apache.hadoop.mapreduce.v2.proto"; option java_package = "org.apache.hadoop.mapreduce.v2.proto";
option java_outer_classname = "MRServiceProtos"; option java_outer_classname = "MRServiceProtos";
option java_generic_services = true; option java_generic_services = true;

27
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
View File

@ -60,27 +60,18 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.hadoop</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>hadoop-maven-plugins</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>compile-protoc</id> <id>src-compile-protoc</id>
<goals>
<goal>protoc</goal>
</goals>
<configuration> <configuration>
<protocVersion>${protobuf.version}</protocVersion> <skip>false</skip>
<protocCommand>${protoc.path}</protocCommand> <additionalProtoPathElements>
<imports> <additionalProtoPathElement>
<param>${basedir}/../../../hadoop-common-project/hadoop-common/src/main/proto</param> ${basedir}/../../../hadoop-common-project/hadoop-common/src/main/proto
<param>${basedir}/src/main/proto</param> </additionalProtoPathElement>
</imports> </additionalProtoPathElements>
<source>
<directory>${basedir}/src/main/proto</directory>
<includes>
<include>ShuffleHandlerRecovery.proto</include>
</includes>
</source>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/proto/ShuffleHandlerRecovery.proto
View File

@ -16,6 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
syntax = "proto2";
option java_package = "org.apache.hadoop.mapred.proto"; option java_package = "org.apache.hadoop.mapred.proto";
option java_outer_classname = "ShuffleHandlerRecoveryProtos"; option java_outer_classname = "ShuffleHandlerRecoveryProtos";
option java_generic_services = true; option java_generic_services = true;