Repository: incubator-reef
Updated Branches:
refs/heads/master 6027631be -> 94414affe
[REEF-165] Moved the protobuf version check to reef-common.
This moves the version check for protobuf introduced in [REEF-160]
from the root POM to the one of reef-common. This has two advantages:
1. It being in the root POM triggered execution in each submodule.
So, moving it ever so slightly improves our build times.
2. It was inherited into the reef-bridge project, where it
interfered with other Ant tasks there.
JIRA:
[REEF-165](https://issues.apache.org/jira/browse/REEF-165)
This closes #86
Author: Markus Weimer <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/94414aff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/94414aff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/94414aff
Branch: refs/heads/master
Commit: 94414affe3e2e073e9112c62a6e21934adbc7cc1
Parents: 6027631
Author: Markus Weimer <[email protected]>
Authored: Thu Feb 19 10:17:32 2015 -0800
Committer: Julia Wang <[email protected]>
Committed: Thu Feb 19 11:12:57 2015 -0800
----------------------------------------------------------------------
lang/java/reef-common/pom.xml | 10 ++++++++++
pom.xml | 30 ++++--------------------------
2 files changed, 14 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/94414aff/lang/java/reef-common/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/pom.xml b/lang/java/reef-common/pom.xml
index 4ea48e2..6768a4b 100644
--- a/lang/java/reef-common/pom.xml
+++ b/lang/java/reef-common/pom.xml
@@ -41,6 +41,16 @@ under the License.
<phase>generate-sources</phase>
<configuration>
<tasks>
+ <exec executable="protoc"
outputproperty="protoc.version">
+ <arg value="--version"/>
+ </exec>
+ <fail message="${protobuf.version} expected,
but protoc version was: ${protoc.version}">
+ <condition>
+ <not>
+ <contains
substring="${protobuf.version}" string="${protoc.version}"/>
+ </not>
+ </condition>
+ </fail>
<mkdir dir="target/generated-sources/proto"/>
<exec executable="protoc">
<arg value="--proto_path=src/main/proto/"/>
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/94414aff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e75002b..8211694 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,28 +134,6 @@ under the License.
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <exec executable="protoc"
outputproperty="protoc.version">
- <arg value="--version"/>
- </exec>
- <fail message="${protobuf.version}
expected, but protoc version was: ${protoc.version}">
- <condition>
- <not>
- <contains
substring="${protobuf.version}" string="${protoc.version}"/>
- </not>
- </condition>
- </fail>
- </tasks>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -259,24 +237,24 @@ under the License.
<exclude>.gitignore</exclude>
<exclude>.git/**</exclude>
<!-- Intellij idea project files -->
- <exclude>lang/java/.idea/**</exclude>
+ <exclude>lang/java/.idea/**</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/target/**</exclude>
- <exclude>**/README.*</exclude>
+ <exclude>**/README.*</exclude>
<!-- The below are sometimes created during tests
-->
<exclude>REEF_LOCAL_RUNTIME/**</exclude>
<!-- The Visual Studio build files -->
<exclude>**/*.sln*</exclude>
<exclude>**/*.vcxproj*</exclude>
<exclude>**/*.csproj*</exclude>
- <!-- The below are auto generated during the .Net
build -->
+ <!-- The below are auto generated during the .Net
build -->
<exclude>**/bin/**</exclude>
<exclude>**/obj/**</exclude>
<exclude>**/Release/**</exclude>
<exclude>**/Debug/**</exclude>
<exclude>**/TestResults/**</exclude>
<exclude>**/x64/**</exclude>
-
+
<!-- NuGet dependencies downloaded as part of the
build -->
<exclude>**/packages/**</exclude>
<!-- The below are auto generated files for
serialization -->
