You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by bl...@apache.org on 2014/01/24 03:12:20 UTC
git commit: TAJO-493: maven pom.xml should enforce protobuf 2.5.
(jaehwa)
Updated Branches:
refs/heads/master 0214f0190 -> 5828b752f
TAJO-493: maven pom.xml should enforce protobuf 2.5. (jaehwa)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/5828b752
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/5828b752
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/5828b752
Branch: refs/heads/master
Commit: 5828b752f9633c171c8f26c8baf4b92c85acce1a
Parents: 0214f01
Author: blrunner <jh...@gruter.com>
Authored: Fri Jan 24 11:12:12 2014 +0900
Committer: blrunner <jh...@gruter.com>
Committed: Fri Jan 24 11:12:12 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
pom.xml | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/5828b752/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cb0497e..731b815 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -226,6 +226,8 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-493: maven pom.xml should enforce protobuf 2.5. (jaehwa)
+
TAJO-360: If there is no matched function, catalog causes NPE.
(hyoungjunkim via hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/5828b752/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bcec0cf..495dc1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,36 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo file="${project.build.directory}/verify-protocbuf.sh">
+ PROTOC_VERSION=`protoc --version`
+ if [ "${PROTOC_VERSION}" == "" ]; then
+ echo
+ echo "Protocol buffer is not installed or protocol buffer path did not add to your PATH variable."
+ echo
+ exit -1
+ fi
+ if [ "${PROTOC_VERSION}" != "libprotoc 2.5.0" ]; then
+ echo
+ echo "Tajo requires protocol buffer version 2.5.0, another versions is not supported."
+ echo
+ exit -1
+ fi
+ </echo>
+ <exec executable="sh" dir="${project.build.directory}" failonerror="true">
+ <arg line="./verify-protocbuf.sh"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>