You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2013/03/15 07:11:16 UTC
svn commit: r1456775 - in /pig/trunk: CHANGES.txt build.xml
Author: cheolsoo
Date: Fri Mar 15 06:11:15 2013
New Revision: 1456775
URL: http://svn.apache.org/r1456775
Log:
PIG-3233: Deploy a Piggybank Jar (njw45 via cheolsoo)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/build.xml
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1456775&r1=1456774&r2=1456775&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Mar 15 06:11:15 2013
@@ -28,6 +28,8 @@ PIG-3174: Remove rpm and deb artifacts
IMPROVEMENTS
+PIG-3233: Deploy a Piggybank Jar (njw45 via cheolsoo)
+
PIG-3245: Documentation about HBaseStorage (Daisuke Kobayashi via cheolsoo)
PIG-3211: Allow default Load/Store funcs to be configurable (prkommireddi via cheolsoo)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1456775&r1=1456774&r2=1456775&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Fri Mar 15 06:11:15 2013
@@ -30,6 +30,7 @@
<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.12.0" />
<property name="pig.version.suffix" value="-SNAPSHOT" />
<property name="version" value="${pig.version}${pig.version.suffix}" />
@@ -99,6 +100,7 @@
<property name="test.exclude.file" value="${test.src.dir}/excluded-tests"/>
<property name="test.exclude.file.23" value="${test.src.dir}/excluded-tests-23"/>
<property name="pigunit.jarfile" value="pigunit.jar" />
+ <property name="piggybank.jarfile" value="${basedir}/contrib/piggybank/java/piggybank.jar" />
<property name="smoke.tests.jarfile" value="${build.dir}/${final.name}-smoketests.jar" />
<property name="test.pigunit.src.dir" value="${test.src.dir}/org/apache/pig/test/pigunit" />
<property name="test.pigunit.file" value="${test.src.dir}/pigunit-tests"/>
@@ -307,7 +309,7 @@
<pathelement location="${ivy.lib.dir}/junit-3.8.1.jar"/>
<pathelement location="${build.classes}"/>
<pathelement location="${test.src.dir}"/>
- <pathelement location="contrib/piggybank/java/piggybank.jar"/>
+ <pathelement location="${piggybank.jarfile}"/>
<path refid="classpath"/>
</path>
@@ -1071,7 +1073,7 @@
classpathref="mvn-ant-task.classpath"/>
</target>
<target name="mvn-install" depends="mvn-taskdef,jar, set-version, source-jar,
- javadoc-jar, pigunit-jar, smoketests-jar"
+ javadoc-jar, pigunit-jar, smoketests-jar, piggybank"
description="To install pig to local filesystem's m2 cache">
<artifact:pom file="${pig.pom}" id="pig"/>
<artifact:install file="${output.jarfile.core}">
@@ -1087,10 +1089,14 @@
<artifact:install file="${smoke.tests.jarfile}">
<pom refid="pigsmoke"/>
</artifact:install>
+ <artifact:pom file="${piggybank.pom}" id="piggybank"/>
+ <artifact:install file="${piggybank.jarfile}">
+ <pom refid="piggybank"/>
+ </artifact:install>
</target>
<target name="mvn-build" depends="mvn-jar, source-jar,
- javadoc-jar, smoketests-jar, pigunit-jar"
+ javadoc-jar, smoketests-jar, pigunit-jar, piggybank"
description="To build the pig jar artifacts to be deployed to apache maven repository">
</target>
@@ -1131,6 +1137,12 @@
<attach file="${smoke.tests.jarfile}.asc" type="jar.asc"/>
<attach file="${pigsmoke.pom}.asc" type="pom.asc"/>
</artifact:deploy>
+ <artifact:deploy file="${piggybank.jarfile}">
+ <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+ <pom refid="piggybank"/>
+ <attach file="${piggybank.jarfile}.asc" type="jar.asc"/>
+ <attach file="${piggybank.pom}.asc" type="pom.asc"/>
+ </artifact:deploy>
</target>
<target name="simpledeploy" unless="staging">
@@ -1153,6 +1165,11 @@
<remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
<pom refid="pigsmoke"/>
</artifact:deploy>
+ <artifact:pom file="${piggybank.pom}" id="piggybank"/>
+ <artifact:deploy file="${piggybank.jarfile}">
+ <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+ <pom refid="piggybank"/>
+ </artifact:deploy>
</target>
<target name="sign" depends="clean-sign" if="staging">
@@ -1194,6 +1211,10 @@
output.file="${pigsmoke.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${smoke.tests.jarfile}"
output.file="${smoke.tests.jarfile}.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${piggybank.jarfile}"
+ output.file="${piggybank.jarfile}.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${piggybank.pom}"
+ output.file="${piggybank.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
</target>
<target name="clean-sign" description="Clean. Delete .asc files">
@@ -1202,19 +1223,19 @@
</delete>
</target>
<target name="set-version">
- <delete file="${basedir}/ivy/pig.pom"/>
- <delete file="${basedir}/ivy/pigunit.pom"/>
- <delete file="${basedir}/ivy/pigsmoke.pom"/>
- <copy file="${basedir}/ivy/pig-template.xml" tofile="${basedir}/ivy/pig.pom"/>
- <copy file="${basedir}/ivy/pigunit-template.xml" tofile="${basedir}/ivy/pigunit.pom"/>
- <copy file="${basedir}/ivy/pigsmoke-template.xml" tofile="${basedir}/ivy/pigsmoke.pom"/>
+ <delete file="${pig.pom}"/>
+ <delete file="${pigunit.pom}"/>
+ <delete file="${pigsmoke.pom}"/>
+ <delete file="${piggybank.pom}"/>
+ <copy file="${basedir}/ivy/pig-template.xml" tofile="${pig.pom}"/>
+ <copy file="${basedir}/ivy/pigunit-template.xml" tofile="${pigunit.pom}"/>
+ <copy file="${basedir}/ivy/pigsmoke-template.xml" tofile="${pigsmoke.pom}"/>
+ <copy file="${basedir}/ivy/piggybank-template.xml" tofile="${piggybank.pom}"/>
<replaceregexp byline="true">
<regexp pattern="@version"/>
<substitution expression="${version}"/>
<fileset dir="${basedir}/ivy">
- <include name="pig.pom"/>
- <include name="pigunit.pom"/>
- <include name="pigsmoke.pom"/>
+ <include name="*.pom"/>
</fileset>
</replaceregexp>
</target>