Skip to content

Commit bfe1dac

Browse files
authored
HADOOP-16560. [YARN] use protobuf-maven-plugin to generate protobuf classes (#1496)
Signed-off-by: Vinayakumar B <[email protected]>
1 parent 0a716bd commit bfe1dac

File tree

39 files changed

+160
-221
lines changed

39 files changed

+160
-221
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -118,45 +118,22 @@
118118
</resources>
119119
<plugins>
120120
<plugin>
121-
<groupId>org.apache.hadoop</groupId>
122-
<artifactId>hadoop-maven-plugins</artifactId>
121+
<groupId>org.xolstice.maven.plugins</groupId>
122+
<artifactId>protobuf-maven-plugin</artifactId>
123123
<executions>
124124
<execution>
125-
<id>compile-protoc</id>
126-
<goals>
127-
<goal>protoc</goal>
128-
</goals>
125+
<id>src-compile-protoc</id>
129126
<configuration>
130-
<protocVersion>${protobuf.version}</protocVersion>
131-
<protocCommand>${protoc.path}</protocCommand>
132-
<imports>
133-
<param>${basedir}/../../../hadoop-common-project/hadoop-common/src/main/proto</param>
134-
<param>${basedir}/src/main/proto</param>
135-
<param>${basedir}/src/main/proto/server</param>
136-
</imports>
137-
<source>
138-
<directory>${basedir}/src/main/proto</directory>
139-
<includes>
140-
<include>yarn_protos.proto</include>
141-
<include>yarn_service_protos.proto</include>
142-
<include>applicationmaster_protocol.proto</include>
143-
<include>applicationclient_protocol.proto</include>
144-
<include>containermanagement_protocol.proto</include>
145-
<include>server/yarn_server_resourcemanager_service_protos.proto</include>
146-
<include>server/resourcemanager_administration_protocol.proto</include>
147-
<include>application_history_client.proto</include>
148-
<include>server/application_history_server.proto</include>
149-
<include>client_SCM_protocol.proto</include>
150-
<include>server/SCM_Admin_protocol.proto</include>
151-
<include>yarn_csi_adaptor.proto</include>
152-
<include>YarnCsiAdaptor.proto</include>
153-
</includes>
154-
</source>
127+
<skip>false</skip>
128+
<additionalProtoPathElements>
129+
<additionalProtoPathElement>
130+
${basedir}/../../../hadoop-common-project/hadoop-common/src/main/proto
131+
</additionalProtoPathElement>
132+
</additionalProtoPathElements>
155133
</configuration>
156134
</execution>
157135
</executions>
158136
</plugin>
159-
160137
<plugin>
161138
<artifactId>maven-jar-plugin</artifactId>
162139
<executions>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/YarnCsiAdaptor.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19+
syntax = "proto2";
1920
option java_package = "org.apache.hadoop.yarn.proto";
2021
option java_outer_classname = "CsiAdaptorProtocol";
2122
option java_generic_services = true;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/application_history_client.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19+
syntax = "proto2";
1920
option java_package = "org.apache.hadoop.yarn.proto";
2021
option java_outer_classname = "ApplicationHistoryProtocol";
2122
option java_generic_services = true;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/applicationclient_protocol.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* for what changes are allowed for a *stable* .proto interface.
2323
*/
2424

25+
syntax = "proto2";
2526
option java_package = "org.apache.hadoop.yarn.proto";
2627
option java_outer_classname = "ApplicationClientProtocol";
2728
option java_generic_services = true;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/applicationmaster_protocol.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19+
syntax = "proto2";
1920
/**
2021
* These .proto interfaces are public and stable.
2122
* Please see http://wiki.apache.org/hadoop/Compatibility

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/client_SCM_protocol.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19+
syntax = "proto2";
1920
option java_package = "org.apache.hadoop.yarn.proto";
2021
option java_outer_classname = "ClientSCMProtocol";
2122
option java_generic_services = true;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/containermanagement_protocol.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* for what changes are allowed for a *stable* .proto interface.
2323
*/
2424

25+
syntax = "proto2";
2526
option java_package = "org.apache.hadoop.yarn.proto";
2627
option java_outer_classname = "ContainerManagementProtocol";
2728
option java_generic_services = true;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/server/SCM_Admin_protocol.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19+
syntax = "proto2";
1920
option java_package = "org.apache.hadoop.yarn.proto";
2021
option java_outer_classname = "SCMAdminProtocol";
2122
option java_generic_services = true;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/server/application_history_server.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19+
syntax = "proto2";
1920
option java_package = "org.apache.hadoop.yarn.proto";
2021
option java_outer_classname = "ApplicationHistoryServerProtos";
2122
option java_generic_services = true;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/server/resourcemanager_administration_protocol.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* for what changes are allowed for a *stable* .proto interface.
2323
*/
2424

25+
syntax = "proto2";
2526
option java_package = "org.apache.hadoop.yarn.proto";
2627
option java_outer_classname = "ResourceManagerAdministrationProtocol";
2728
option java_generic_services = true;

0 commit comments

Comments
 (0)