Author: rohini
Date: Wed Jun 18 00:21:22 2025
New Revision: 1926524
URL: http://svn.apache.org/viewvc?rev=1926524&view=rev
Log:
PIG-5472: Update mvn-deploy to publish both hadoop 3 and hadoop 2 jars (rohini)
Modified:
pig/branches/branch-0.18/.eclipse.templates/.classpath
pig/branches/branch-0.18/CHANGES.txt
pig/branches/branch-0.18/NOTICE.txt
pig/branches/branch-0.18/build.xml
pig/branches/branch-0.18/ivy/libraries.properties
pig/branches/branch-0.18/ivy/pig-template.xml
pig/branches/branch-0.18/ivy/piggybank-template.xml
pig/branches/branch-0.18/ivy/pigunit-template.xml
pig/branches/branch-0.18/src/docs/src/documentation/content/xdocs/tabs.xml
Modified: pig/branches/branch-0.18/.eclipse.templates/.classpath
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/.eclipse.templates/.classpath?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/.eclipse.templates/.classpath (original)
+++ pig/branches/branch-0.18/.eclipse.templates/.classpath Wed Jun 18 00:21:22
2025
@@ -40,7 +40,6 @@
<classpathentry exported="true" kind="lib"
path="build/ivy/lib/Pig/hsqldb-1.8.0.10.jar"/>
<classpathentry exported="true" kind="lib"
path="build/ivy/lib/Pig/jasper-compiler-5.5.12.jar"/>
<classpathentry exported="true" kind="lib"
path="build/ivy/lib/Pig/jasper-runtime-5.5.12.jar"/>
- <classpathentry exported="true" kind="lib"
path="build/ivy/lib/Pig/jets3t-0.7.1.jar"/>
<classpathentry exported="true" kind="lib"
path="build/ivy/lib/Pig/jetty-6.1.26.jar"/>
<classpathentry exported="true" kind="lib"
path="build/ivy/lib/Pig/jetty-util-6.1.26.jar"/>
<classpathentry exported="true" kind="lib"
path="build/ivy/lib/Pig/jsp-2.1-6.1.14.jar"/>
Modified: pig/branches/branch-0.18/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/CHANGES.txt?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/CHANGES.txt (original)
+++ pig/branches/branch-0.18/CHANGES.txt Wed Jun 18 00:21:22 2025
@@ -27,6 +27,8 @@ PIG-5282: Upgrade to Java 8 (satishsaley
IMPROVEMENTS
+PIG-5472: Update mvn-deploy to publish both hadoop 3 and hadoop 2 jars (rohini)
+
PIG-5471: Make Hadoop/Hive/Spark 3 as the default version in build.xml (rohini)
PIG-5410: Support Python 3 for streaming_python (vnarayanan7 via rohini)
Modified: pig/branches/branch-0.18/NOTICE.txt
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/NOTICE.txt?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/NOTICE.txt (original)
+++ pig/branches/branch-0.18/NOTICE.txt Wed Jun 18 00:21:22 2025
@@ -1,5 +1,5 @@
Apache Pig
-Copyright 2008-2014 The Apache Software Foundation
+Copyright 2008-2025 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
@@ -39,9 +39,6 @@ This product includes/uses Jython (http:
Copyright (c) 2000-2009 Jython Developers.
All rights reserved.
-This product includes/uses JetS3t (http://www.jets3t.org/)
-Copyright 2006-2010 James Murty
-
This product includes/uses Netty (http://www.jboss.org/netty)
Copyright 2009 Red Hat, Inc.
Modified: pig/branches/branch-0.18/build.xml
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/build.xml?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/build.xml (original)
+++ pig/branches/branch-0.18/build.xml Wed Jun 18 00:21:22 2025
@@ -42,7 +42,7 @@
<property name="pig.version.suffix" value="-SNAPSHOT" />
<property name="version" value="${pig.version}${pig.version.suffix}" />
<property name="final.name" value="${name}-${version}" />
- <property name="year" value="2007-2016" />
+ <property name="year" value="2007-2025" />
<!-- source properties -->
<property name="lib.dir" value="${basedir}/lib" />
@@ -224,10 +224,6 @@
</if>
<property name="hadoopversion" value="3" />
- <condition property="isHadoop2">
- <equals arg1="${hadoopversion}" arg2="2"/>
- </condition>
-
<condition property="isHadoop3">
<equals arg1="${hadoopversion}" arg2="3"/>
</condition>
@@ -301,7 +297,7 @@
<property name="xerces.jar"
value="${ivy.lib.dir}/xercesImpl-${xerces.version}.jar"/>
<property name="jdiff.build.dir" value="${build.docs}/jdiff"/>
<property name="jdiff.xml.dir" value="${docs.dir}/jdiff"/>
- <property name="jdiff.stable" value="0.17.0"/>
+ <property name="jdiff.stable" value="0.18.0"/>
<property name="jdiff.stable.javadoc"
value="http://hadoop.apache.org/${name}/docs/r${jdiff.stable}/api/"/>
<!-- Packaging properties -->
@@ -1358,10 +1354,11 @@
<target name="mvn-install" depends="mvn-taskdef, mvn-build, set-version"
description="To install pig to local filesystem's m2 cache">
<artifact:pom file="${pig.pom}" id="pig"/>
- <artifact:install file="${output.jarfile.core-h2}">
+ <artifact:install file="${output.jarfile.core}">
<pom refid="pig"/>
<attach file="${output.jarfile.sources}" classifier="sources" />
<attach file="${output.jarfile.javadoc}" classifier="javadoc" />
+ <attach file="${output.jarfile.core-h2}" classifier="h2" />
</artifact:install>
<artifact:pom file="${pigunit.pom}" id="pigunit"/>
<artifact:install file="${pigunit.jarfile}">
@@ -1377,10 +1374,36 @@
</artifact:install>
</target>
- <target name="mvn-build" depends="jar, source-jar,
+ <target name="mvn-build" depends="mvn-jar-hadoop2-hadoop3, source-jar,
javadoc-jar, smoketests-jar,
pigunit-jar, piggybank"
description="To build the pig jar artifacts to be deployed to apache
maven repository">
- <move file="${output.jarfile.backcompat-core-h2}"
tofile="${output.jarfile.core-h2}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Facade to build pig.jar for both Hadoop 2 and Hadoop 3. Use only for
mvn-build -->
+ <!-- ================================================================== -->
+ <target name="mvn-jar-hadoop2-hadoop3" description="Create pig jar for
both Hadoop 2 and Hadoop 3">
+ <propertyreset name="hadoopversion" value="2" />
+ <propertyreset name="sparkversion" value="2" />
+ <propertyreset name="hiveversion" value="1" />
+ <propertyreset name="hbaseversion" value="1" />
+ <var name="isHadoop3" unset="true"/>
+ <propertyreset name="src.hive.shims.dir"
value="${basedir}/shims/src/hive${hiveversion}" />
+ <antcall target="clean" inheritRefs="true" inheritall="true"/>
+ <antcall target="jar" inheritRefs="true" inheritall="true"/>
+ <!-- Prefix mvn to avoid hadoop 2 jar from being deleted by clean
command -->
+ <move file="${basedir}/${final.name}-core-h2.jar"
tofile="${basedir}/mvn-${final.name}-core-h2.jar"/>
+ <propertyreset name="hadoopversion" value="3" />
+ <propertyreset name="sparkversion" value="3" />
+ <propertyreset name="hiveversion" value="3" />
+ <propertyreset name="hbaseversion" value="2" />
+ <propertyreset name="isHadoop3" value="true" />
+ <propertyreset name="src.hive.shims.dir"
value="${basedir}/shims/src/hive${hiveversion}" />
+ <propertyreset name="src.exclude.dir" value="" />
+ <antcall target="clean" inheritRefs="true" inheritall="true"/>
+ <antcall target="jar" inheritRefs="true" inheritall="true"/>
+ <!-- Move hadoop 2 jar file back -->
+ <move file="${basedir}/mvn-${final.name}-core-h2.jar"
tofile="${output.jarfile.core-h2}"/>
</target>
<!-- Expects that mvn-build has already been run but does not run it. In
some cases building
@@ -1400,6 +1423,7 @@
<remoteRepository id="${staging_repo_id}" url="${asfstagingrepo}"/>
<pom refid="pig"/>
<attach file="${output.jarfile.core}.asc" type="jar.asc"/>
+ <attach file="${output.jarfile.core-h2}.asc" type="jar.asc"/>
<attach file="${pig.pom}.asc" type="pom.asc"/>
<attach file="${output.jarfile.sources}.asc" type="jar.asc"
classifier="sources"/>
<attach file="${output.jarfile.sources}" classifier="sources" />
@@ -1437,6 +1461,7 @@
<pom refid="pig"/>
<attach file="${output.jarfile.sources}" classifier="sources" />
<attach file="${output.jarfile.javadoc}" classifier="javadoc" />
+ <attach file="${output.jarfile.core-h2}" classifier="h2" />
</artifact:deploy>
<artifact:pom file="${pigunit.pom}" id="pigunit"/>
<artifact:deploy file="${pigunit.jarfile}">
@@ -1478,6 +1503,8 @@
</macrodef>
<sign-artifact input.file="${output.jarfile.core}"
output.file="${output.jarfile.core}.asc"
gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${output.jarfile.core-h2}"
+ output.file="${output.jarfile.core-h2}.asc"
gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${output.jarfile.sources}"
output.file="${output.jarfile.sources}.asc"
gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${output.jarfile.javadoc}"
Modified: pig/branches/branch-0.18/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/ivy/libraries.properties?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/ivy/libraries.properties (original)
+++ pig/branches/branch-0.18/ivy/libraries.properties Wed Jun 18 00:21:22 2025
@@ -72,7 +72,7 @@ spark3-scala.version=2.12
jackson-module-scala_spark3.version=2.12.7
xerces.version=2.10.0
xalan.version=2.7.1
-wagon-http.version=1.0-beta-2
+wagon-http.version=3.5.3
zookeeper.version=3.7.2
servlet.version=4.0.6
guice.version=3.0
Modified: pig/branches/branch-0.18/ivy/pig-template.xml
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/ivy/pig-template.xml?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/ivy/pig-template.xml (original)
+++ pig/branches/branch-0.18/ivy/pig-template.xml Wed Jun 18 00:21:22 2025
@@ -26,12 +26,12 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <version>1.15</version>
</dependency>
<dependency>
<groupId>commons-el</groupId>
@@ -39,11 +39,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.9.0</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
@@ -81,7 +76,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>11.0</version>
+ <version>11.0.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -96,7 +91,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.9.9</version>
+ <version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -106,7 +101,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.7.5</version>
+ <version>1.7.7</version>
<exclusions>
<exclusion>
<!-- Exclude Avro's version of ant since it conflicts with
Jetty's.-->
@@ -118,12 +113,12 @@
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
- <version>2.2.0</version>
+ <version>2.5.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.4.5</version>
+ <version>2.4.21</version>
</dependency>
</dependencies>
</project>
Modified: pig/branches/branch-0.18/ivy/piggybank-template.xml
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/ivy/piggybank-template.xml?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/ivy/piggybank-template.xml (original)
+++ pig/branches/branch-0.18/ivy/piggybank-template.xml Wed Jun 18 00:21:22 2025
@@ -51,7 +51,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.9.9</version>
+ <version>2.14.0</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
Modified: pig/branches/branch-0.18/ivy/pigunit-template.xml
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/ivy/pigunit-template.xml?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/ivy/pigunit-template.xml (original)
+++ pig/branches/branch-0.18/ivy/pigunit-template.xml Wed Jun 18 00:21:22 2025
@@ -26,12 +26,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.6</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -41,7 +41,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>11.0</version>
+ <version>11.0.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified:
pig/branches/branch-0.18/src/docs/src/documentation/content/xdocs/tabs.xml
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.18/src/docs/src/documentation/content/xdocs/tabs.xml?rev=1926524&r1=1926523&r2=1926524&view=diff
==============================================================================
--- pig/branches/branch-0.18/src/docs/src/documentation/content/xdocs/tabs.xml
(original)
+++ pig/branches/branch-0.18/src/docs/src/documentation/content/xdocs/tabs.xml
Wed Jun 18 00:21:22 2025
@@ -32,6 +32,6 @@
-->
<tab label="Project" href="http://hadoop.apache.org/pig/"; type="visible" />
<tab label="Wiki" href="http://wiki.apache.org/pig/"; type="visible" />
- <tab label="Pig 0.17.0 Documentation" dir="" type="visible" />
+ <tab label="Pig 0.18.0 Documentation" dir="" type="visible" />
</tabs>
