[parquet-mr] Diff for: [GitHub] zivanfi closed pull request #589: Please ignore. Testing that Travis fails on this PR as intended.

[GitBox <gi...@apache.org>]

diff --git a/.travis.yml b/.travis.yml
index e4e623f03..874435a7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,6 @@
 language: java
 before_install:
-  - date
-  - sudo apt-get update -qq
-  - sudo apt-get install build-essential
-  - sudo apt-get install pv
-  - date
-  - mkdir protobuf_install
-  - pushd protobuf_install
-  - wget https://github.com/google/protobuf/archive/v3.5.1.tar.gz -O protobuf-3.5.1.tar.gz
-  - tar xzf protobuf-3.5.1.tar.gz
-  - cd protobuf-3.5.1
-  - sudo apt-get install autoconf automake libtool curl make g++ unzip
-  - ./autogen.sh
-  - ./configure
-  - make
-  - sudo make install
-  - sudo ldconfig
-  - protoc --version
-  - popd
-  - date
-  - pwd
-  - sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev
-  - wget -nv http://archive.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz
-  - tar zxf thrift-0.9.3.tar.gz
-  - cd thrift-0.9.3
-  - chmod +x ./configure
-  - ./configure --disable-gen-erl --disable-gen-hs --without-ruby --without-haskell --without-erlang --without-php --without-nodejs
-  - sudo make install
-  - cd ..
-  - date
+  - bash dev/travis-before-install.sh
 
 env:
   - HADOOP_PROFILE=default TEST_CODECS=uncompressed,brotli
diff --git a/dev/travis-before-install-master.sh b/dev/travis-before-install-master.sh
new file mode 100644
index 000000000..9197202f8
--- /dev/null
+++ b/dev/travis-before-install-master.sh
@@ -0,0 +1,23 @@
+shopt -s globstar
+fail_the_build=
+reduced_pom="$(tempfile)"
+for pom in **/pom.xml
+do
+  xmlstarlet ed -N pom='http://maven.apache.org/POM/4.0.0' \
+             -d '/pom:project/pom:version|/pom:project/pom:parent/pom:version|//comment()' "$pom" > "$reduced_pom"
+  if grep -q SNAPSHOT "$reduced_pom"
+  then
+    if [[ ! "$fail_the_build" ]]
+    then
+      printf "Error: POM files in the master branch can not refer to SNAPSHOT versions.\n"
+      fail_the_build=YES
+    fi
+    printf "\nOffending POM file: %s\nOffending content:\n" "$pom"
+    xmlstarlet ed -d "//*[count((.|.//*)[contains(text(), 'SNAPSHOT')]) = 0]" "$reduced_pom"
+  fi
+done
+rm "$reduced_pom"
+if [[ "$fail_the_build" ]]
+then
+   exit 1
+fi
diff --git a/dev/travis-before-install.sh b/dev/travis-before-install.sh
new file mode 100644
index 000000000..24d4c6e31
--- /dev/null
+++ b/dev/travis-before-install.sh
@@ -0,0 +1,34 @@
+set -e
+date
+sudo apt-get update -qq
+sudo apt-get install -qq build-essential pv autoconf automake libtool curl make \
+   g++ unzip libboost-dev libboost-test-dev libboost-program-options-dev \
+   libevent-dev automake libtool flex bison pkg-config g++ libssl-dev xmlstarlet
+date
+mkdir protobuf_install
+pushd protobuf_install
+wget https://github.com/google/protobuf/archive/v3.5.1.tar.gz -O protobuf-3.5.1.tar.gz
+tar xzf protobuf-3.5.1.tar.gz
+cd protobuf-3.5.1
+./autogen.sh
+./configure
+make
+sudo make install
+sudo ldconfig
+protoc --version
+popd
+date
+pwd
+wget -nv http://archive.apache.org/dist/thrift/0.9.3/thrift-0.9.3.tar.gz
+tar zxf thrift-0.9.3.tar.gz
+cd thrift-0.9.3
+chmod +x ./configure
+./configure --disable-gen-erl --disable-gen-hs --without-ruby --without-haskell --without-erlang --without-php --without-nodejs
+sudo make install
+cd ..
+branch_specific_script="dev/travis-before-install-${TRAVIS_BRANCH}.sh"
+if [[ -e "$branch_specific_script" ]]
+then
+  . "$branch_specific_script"
+fi
+date
diff --git a/parquet-hadoop/pom.xml b/parquet-hadoop/pom.xml
index 32c162c53..292e8413a 100644
--- a/parquet-hadoop/pom.xml
+++ b/parquet-hadoop/pom.xml
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.6</version>
+      <version>1.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.github.rdblue</groupId>
diff --git a/pom.xml b/pom.xml
index 9324a1a4b..b5009f9fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
     <hadoop1.version>1.2.1</hadoop1.version>
     <cascading.version>2.7.1</cascading.version>
     <cascading3.version>3.1.2</cascading3.version>
-    <parquet.format.version>2.6.0</parquet.format.version>
+    <parquet.format.version>2.1.0-SNAPSHOT</parquet.format.version>
     <previous.version>1.7.0</previous.version>
     <thrift.executable>thrift</thrift.executable>
     <format.thrift.executable>thrift</format.thrift.executable>


With regards,
Apache Git Services