[parquet-mr] branch parquet-1.13.x updated: PARQUET-2290: Add CI for Hadoop 2 (#1076) (#1083)

[fokko]

This is an automated email from the ASF dual-hosted git repository.

fokko pushed a commit to branch parquet-1.13.x
in repository https://gitbox.apache.org/repos/asf/parquet-mr.git


The following commit(s) were added to refs/heads/parquet-1.13.x by this push:
     new bc5b65826 PARQUET-2290: Add CI for Hadoop 2 (#1076) (#1083)
bc5b65826 is described below

commit bc5b658265b0e6051e79c959c8b0257e30e3b16d
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Wed Apr 26 18:52:24 2023 +0200

    PARQUET-2290: Add CI for Hadoop 2 (#1076) (#1083)
---
 .github/workflows/{test.yml => ci-hadoop2.yml}             | 11 +++++------
 .github/workflows/{test.yml => ci-hadoop3.yml}             |  2 +-
 .../thrift/projection/deprecated/PathGlobPattern.java      | 12 ------------
 pom.xml                                                    | 14 +++++++-------
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/ci-hadoop2.yml
similarity index 84%
copy from .github/workflows/test.yml
copy to .github/workflows/ci-hadoop2.yml
index f96585244..b824e1845 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/ci-hadoop2.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: Test
+name: CI Hadoop 2
 
 on: [push, pull_request]
 
@@ -26,16 +26,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '1.8', '11', '17' ]
         codes: [ 'uncompressed,brotli', 'gzip,snappy' ]
     name: Build Parquet with JDK ${{ matrix.java }} and ${{ matrix.codes }}
 
     steps:
       - uses: actions/checkout@master
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK8
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 1.8
       - name: before_install
         env:
           CI_TARGET_BRANCH: $GITHUB_HEAD_REF
@@ -45,7 +44,7 @@ jobs:
         run: |
           EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate 
-Dexpression=extraJavaTestArgs -q -DforceStdout)
           export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
-          mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true 
-Dsource.skip=true -Djava.version=${{ matrix.java }}
+          mvn install --batch-mode -P hadoop2 -DskipTests=true 
-Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=1.8
       - name: verify
         env:
           TEST_CODECS: ${{ matrix.codes }}
@@ -53,4 +52,4 @@ jobs:
         run: |
           EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate 
-Dexpression=extraJavaTestArgs -q -DforceStdout)
           export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
-          mvn verify --batch-mode javadoc:javadoc -Pci-test
+          mvn verify --batch-mode -P hadoop2 javadoc:javadoc -Pci-test
diff --git a/.github/workflows/test.yml b/.github/workflows/ci-hadoop3.yml
similarity index 99%
rename from .github/workflows/test.yml
rename to .github/workflows/ci-hadoop3.yml
index f96585244..76c758bd5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/ci-hadoop3.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: Test
+name: CI Hadoop 3
 
 on: [push, pull_request]
 
diff --git 
a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java
 
b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java
index 4d4136f11..df5323306 100644
--- 
a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java
+++ 
b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java
@@ -18,8 +18,6 @@
  */
 package org.apache.parquet.thrift.projection.deprecated;
 
-import org.apache.hadoop.fs.GlobPattern;
-
 import com.google.re2j.Pattern;
 import com.google.re2j.PatternSyntaxException;
 
@@ -45,16 +43,6 @@ public class PathGlobPattern {
     set(globPattern);
   }
 
-  /**
-   * Compile glob pattern string
-   *
-   * @param globPattern the glob pattern
-   * @return the pattern object
-   */
-  public static Pattern compile(String globPattern) {
-    return new GlobPattern(globPattern).compiled();
-  }
-
   private static void error(String message, String pattern, int pos) {
     throw new PatternSyntaxException(String.format("%1s at %2d", message, 
pos), pattern);
   }
diff --git a/pom.xml b/pom.xml
index b49b0ce2b..3f2911b4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,13 +59,6 @@
     </repository>
   </repositories>
 
-  <developers>
-    <developer>
-      <name>Julien Le Dem</name>
-      <email>jul...@twitter.com</email>
-    </developer>
-  </developers>
-
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -601,6 +594,13 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>hadoop2</id>
+      <properties>
+        <hadoop.version>2.9.2</hadoop.version>
+      </properties>
+    </profile>
+
     <profile>
       <id>update-github-site</id>
       <reporting>