From 16037a41fde7818882bafd6536625b88a436ea53 Mon Sep 17 00:00:00 2001
From: krishnapriawan <krishna.priawan@gmail.com>
Date: Thu, 7 Nov 2024 15:21:05 +0900
Subject: [PATCH 1/2] Parquet-pig-bundle 1.9.0

---
 build.xml                                     | 4 ++--
 ivy.xml                                       | 2 +-
 ivy/libraries.properties                      | 4 ++--
 src/org/apache/pig/builtin/ParquetLoader.java | 8 ++++----
 src/org/apache/pig/builtin/ParquetStorer.java | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.xml b/build.xml
index 84e4b5e125..97880bd76e 100644
--- a/build.xml
+++ b/build.xml
@@ -69,7 +69,7 @@
     <property name="javac.debug" value="on" />
     <property name="javac.optimize" value="on" />
     <property name="javac.deprecation" value="off" />
-    <property name="javac.version" value="1.7" />
+    <property name="javac.version" value="1.8" />
     <property name="javac.args" value="" />
     <condition property="javac.args.warnings" value="-Xmaxwarns 1000000 -Xlint -Xlint:-deprecation" else="-Xmaxwarns 1000000">
         <isset property="all.warnings" />
@@ -247,7 +247,7 @@
 
     <property name="asfrepo" value="https://repository.apache.org"/>
     <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
-    <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
+    <property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
     <property name="asfstagingrepo" value="${asfrepo}/service/local/staging/deploy/maven2"/>
     <property name="staging_repo_id" value="apache.staging.https"/>
     <property name="snapshots_repo_id" value="apache.snapshots.https"/>
diff --git a/ivy.xml b/ivy.xml
index 3f2c94373b..b969ad6092 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -405,7 +405,7 @@
 
     <dependency org="org.mockito" name="mockito-all" rev="${mockito.version}" conf="test->default"/>
 
-    <dependency org="com.twitter" name="parquet-pig-bundle" rev="${parquet-pig-bundle.version}" conf="compile->master"/>
+    <dependency org="org.apache.parquet" name="parquet-pig-bundle" rev="${parquet-pig-bundle.version}" conf="compile->master"/>
 
     <!-- for Spark integration -->
     <dependency org="org.apache.spark" name="spark-core_2.11" rev="${spark.version}" conf="spark->default">
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index a0eb00acd2..44d7bb18a1 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -38,7 +38,7 @@ checkstyle.version=4.2
 ivy.version=2.2.0
 jasper.version=6.1.14
 groovy.version=2.4.5
-guava.version=11.0
+guava.version=20.0
 hadoop-common.version=2.7.3
 hadoop-hdfs.version=2.7.3
 hadoop-mapreduce.version=2.7.3
@@ -91,7 +91,7 @@ jansi.version=1.9
 asm.version=3.3.1
 snappy-java.version=1.1.1.3
 tez.version=0.7.0
-parquet-pig-bundle.version=1.2.3
+parquet-pig-bundle.version=1.9.0
 snappy.version=0.2
 leveldbjni.version=1.8
 curator.version=2.6.0
diff --git a/src/org/apache/pig/builtin/ParquetLoader.java b/src/org/apache/pig/builtin/ParquetLoader.java
index 76516e3b1c..1a245de688 100644
--- a/src/org/apache/pig/builtin/ParquetLoader.java
+++ b/src/org/apache/pig/builtin/ParquetLoader.java
@@ -27,7 +27,7 @@
 import org.apache.pig.impl.util.JarManager;
 
 /**
- * Wrapper class which will delegate calls to parquet.pig.ParquetLoader
+ * Wrapper class which will delegate calls to org.apache.parquet.pig.ParquetLoader
  */
 public class ParquetLoader extends LoadFuncMetadataWrapper implements LoadPushDown {
 
@@ -37,12 +37,12 @@ public ParquetLoader() throws FrontendException {
     
     public ParquetLoader(String requestedSchemaStr) throws FrontendException {
         try {
-            init(new parquet.pig.ParquetLoader(requestedSchemaStr));
+            init(new org.apache.parquet.pig.ParquetLoader(requestedSchemaStr));
         }
         // if compile time dependency not found at runtime
         catch (NoClassDefFoundError e) {
             throw new FrontendException(String.format("Cannot instantiate class %s (%s)",
-                    getClass().getName(), "parquet.pig.ParquetLoader"), 2259, e);
+                    getClass().getName(), "org.apache.parquet.pig.ParquetLoader"), 2259, e);
         }
     }
     
@@ -52,7 +52,7 @@ private void init(LoadMetadata loadMetadata) {
     
     @Override
     public void setLocation(String location, Job job) throws IOException {
-        JarManager.addDependencyJars(job, parquet.Version.class);
+        JarManager.addDependencyJars(job, org.apache.parquet.Version.class);
         super.setLocation(location, job);
     }
 
diff --git a/src/org/apache/pig/builtin/ParquetStorer.java b/src/org/apache/pig/builtin/ParquetStorer.java
index 2052236eae..755fe16842 100644
--- a/src/org/apache/pig/builtin/ParquetStorer.java
+++ b/src/org/apache/pig/builtin/ParquetStorer.java
@@ -25,18 +25,18 @@
 import org.apache.pig.impl.util.JarManager;
 
 /**
- * Wrapper class which will delegate calls to parquet.pig.ParquetStorer
+ * Wrapper class which will delegate calls to org.apache.parquet.pig.ParquetStorer
  */
 public class ParquetStorer extends StoreFuncMetadataWrapper {
 
     public ParquetStorer() throws FrontendException {
         try {
-            init(new parquet.pig.ParquetStorer());
+            init(new org.apache.parquet.pig.ParquetStorer());
         }
         // if compile time dependency not found at runtime
         catch (NoClassDefFoundError e) {
             throw new FrontendException(String.format("Cannot instantiate class %s (%s)",
-                    getClass().getName(), "parquet.pig.ParquetStorer"), 2259, e);
+                    getClass().getName(), "org.apache.parquet.pig.ParquetStorer"), 2259, e);
         }
     }
     
@@ -49,7 +49,7 @@ private void init(StoreMetadata storeMetadata) {
      */
     @Override
     public void setStoreLocation(String location, Job job) throws IOException {
-        JarManager.addDependencyJars(job, parquet.Version.class);
+        JarManager.addDependencyJars(job, org.apache.parquet.Version.class);
         super.setStoreLocation(location, job);
     }
     

From 11010e739bd0b72ad1c961cf744f4df2e99c3a1f Mon Sep 17 00:00:00 2001
From: krishnapriawan <krishna.priawan@gmail.com>
Date: Thu, 7 Nov 2024 16:37:42 +0900
Subject: [PATCH 2/2] Updated versioning

---
 build.xml                | 8 ++++----
 ivy/libraries.properties | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 97880bd76e..32581e4896 100644
--- a/build.xml
+++ b/build.xml
@@ -31,15 +31,15 @@
     <property file="${basedir}/build.properties" />
 
     <!-- name and version properties -->
-    <property name="name" value="pig" />
+    <property name="name" value="pig-23-withouthadoop" />
     <property name="Name" value="Pig" />
     <property name="ant-task.version" value="2.0.10" />
     <property name="pig.pom" value="${basedir}/ivy/pig.pom" />
     <property name="pigsmoke.pom" value="${basedir}/ivy/pigsmoke.pom" />
     <property name="pigunit.pom" value="${basedir}/ivy/pigunit.pom" />
     <property name="piggybank.pom" value="${basedir}/ivy/piggybank.pom" />
-    <property name="pig.version" value="0.17.0" />
-    <property name="pig.version.suffix" value="-SNAPSHOT" />
+    <property name="pig.version" value="0.17.1" />
+    <property name="pig.version.suffix" value="-parquet-pig-bundle-1.9.0" />
     <property name="version" value="${pig.version}${pig.version.suffix}" />
     <property name="final.name" value="${name}-${version}" />
     <property name="year" value="2007-2017" />
@@ -84,7 +84,7 @@
 
     <!-- jar names. TODO we might want to use the svn reversion name in the name in case it is a dev version -->
     <property name="output.jarfile.withouthadoop" value="${build.dir}/${final.name}-withouthadoop.jar" />
-    <property name="output.jarfile.withouthadoop-h2" value="${legacy.dir}/${final.name}-withouthadoop-h2.jar" />
+    <property name="output.jarfile.withouthadoop-h2" value="${legacy.dir}/${final.name}.jar" />
     <property name="output.jarfile.core" value="${build.dir}/${artifact.pig.jar}" />
     <property name="output.jarfile.core-h2" value="${build.dir}/${artifact.pig-h2.jar}" />
     <property name="output.jarfile.sources" value="${build.dir}/${artifact.pig-sources.jar}" />
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 44d7bb18a1..787367a710 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -38,7 +38,7 @@ checkstyle.version=4.2
 ivy.version=2.2.0
 jasper.version=6.1.14
 groovy.version=2.4.5
-guava.version=20.0
+guava.version=23.0
 hadoop-common.version=2.7.3
 hadoop-hdfs.version=2.7.3
 hadoop-mapreduce.version=2.7.3