YARN-5961. Generate native services protobuf classes during build. Contributed by Billie Rinaldi
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/be43905b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/be43905b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/be43905b Branch: refs/heads/yarn-native-services Commit: be43905bdb08e5a667b228f26cebc2c5f14bcbc7 Parents: 8defcbb Author: Jian He <jia...@apache.org> Authored: Sat Dec 3 13:27:04 2016 -0800 Committer: Jian He <jia...@apache.org> Committed: Tue Dec 13 14:46:44 2016 -0800 ---------------------------------------------------------------------- .../hadoop-yarn-slider-core/pom.xml | 65 +- .../org/apache/slider/api/proto/Messages.java | 34473 ----------------- .../slider/api/proto/SliderClusterAPI.java | 2293 -- 3 files changed, 27 insertions(+), 36804 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/be43905b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/pom.xml index 10cf6b1..7453d12 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/pom.xml @@ -37,6 +37,33 @@ <plugins> <plugin> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-maven-plugins</artifactId> + <executions> + <execution> + <id>compile-protoc</id> + <goals> + <goal>protoc</goal> + </goals> + <configuration> + <protocVersion>${protobuf.version}</protocVersion> + <protocCommand>${protoc.path}</protocCommand> + <imports> + <param>${basedir}/src/main/proto</param> + </imports> + <source> + <directory>${basedir}/src/main/proto</directory> + <includes> + <include>SliderClusterMessages.proto</include> + <include>SliderClusterProtocol.proto</include> + </includes> + </source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> @@ -85,9 +112,6 @@ <excludes> <exclude>**/*.json</exclude> <exclude>src/main/resources/webapps/slideram/.keep</exclude> - <!-- protobuf generated classes --> - <exclude>src/main/java/org/apache/slider/api/proto/Messages.java</exclude> - <exclude>src/main/java/org/apache/slider/api/proto/SliderClusterAPI.java</exclude> </excludes> </configuration> </plugin> @@ -362,41 +386,6 @@ </plugins> </build> </profile> - <profile> - <id>compile-protobuf</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-maven-plugins</artifactId> - <executions> - <execution> - <id>compile-protoc</id> - <phase>generate-sources</phase> - <goals> - <goal>protoc</goal> - </goals> - <configuration> - <protocVersion>${protobuf.version}</protocVersion> - <protocCommand>protoc</protocCommand> - <imports> - <param>${basedir}/src/main/proto</param> - </imports> - <source> - <directory>${basedir}/src/main/proto</directory> - <includes> - <include>SliderClusterMessages.proto</include> - <include>SliderClusterProtocol.proto</include> - </includes> - </source> - <output>${basedir}/src/main/java</output> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org