You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bi...@apache.org on 2014/06/16 20:48:13 UTC
[3/3] git commit: SLIDER-135 moved protobuf generation to an optional
maven profile
SLIDER-135 moved protobuf generation to an optional maven profile
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4fe442d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4fe442d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4fe442d5
Branch: refs/heads/develop
Commit: 4fe442d540d922ade158947e93b21d2b85d00789
Parents: dd1e18b
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Mon Jun 16 11:47:49 2014 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Mon Jun 16 11:47:49 2014 -0700
----------------------------------------------------------------------
slider-core/pom.xml | 111 +-
.../org/apache/slider/api/proto/Messages.java | 13186 +++++++++++++++++
.../slider/api/proto/SliderClusterAPI.java | 1043 ++
.../src/main/proto/SliderClusterMessages.proto | 4 +
.../src/main/proto/SliderClusterProtocol.proto | 4 +
5 files changed, 14277 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4fe442d5/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 9ab95e8..ca09541 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -158,77 +158,6 @@
</plugin>
<plugin>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-maven-plugins</artifactId>
- <version>${hadoop.version}</version>
-
- <executions>
- <execution>
- <id>version-info</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>version-info</goal>
- </goals>
- <configuration>
- <source>
- <directory>${basedir}/src/main</directory>
- <includes>
- <include>java/**/*.java</include>
- <include>proto/**/*.proto</include>
- </includes>
- </source>
- </configuration>
- </execution>
- <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>${project.build.directory}/generated-sources/java</output>
- </configuration>
- </execution>
- <!--
- <execution>
- <id>compile-test-protoc</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>protoc</goal>
- </goals>
- <configuration>
- <protocVersion>${protobuf.version}</protocVersion>
- <protocCommand>${protoc.path}</protocCommand>
- <imports>
- <param>${basedir}/src/test/proto</param>
- </imports>
- <source>
- <directory>${basedir}/src/test/proto</directory>
- <includes>
- <include>test.proto</include>
- <include>test_rpc_service.proto</include>
- </includes>
- </source>
- <output>${project.build.directory}/generated-test-sources/java
- </output>
- </configuration>
- </execution>
- -->
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
@@ -296,6 +225,9 @@
<exclude>src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
<!-- jQuery jsTree (MIT license) -->
<exclude>src/main/resources/webapps/static/jt/jquery.jstree.js</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>
@@ -580,6 +512,43 @@
<profiles>
+ <profile>
+ <id>compile-protobuf</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-maven-plugins</artifactId>
+ <version>${hadoop.version}</version>
+
+ <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>
<!--
a test run, currently hard-coded for stevel's secure