You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2013/03/16 02:34:30 UTC

svn commit: r1457191 - in /pig/trunk: CHANGES.txt build.xml

Author: daijy
Date: Sat Mar 16 01:34:30 2013
New Revision: 1457191

URL: http://svn.apache.org/r1457191
Log:
PIG-3236: parametrize snapshot and staging repo id

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=1457191&r1=1457190&r2=1457191&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Mar 16 01:34:30 2013
@@ -28,6 +28,8 @@ PIG-3174:  Remove rpm and deb artifacts 
 
 IMPROVEMENTS
 
+PIG-3236: parametrize snapshot and staging repo id (gkesavan via daijy)
+
 PIG-3244: Make PIG_HOME configurable (robert.schooley@gmail.com via daijy)
 
 PIG-3233: Deploy a Piggybank Jar (njw45 via cheolsoo)

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1457191&r1=1457190&r2=1457191&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Sat Mar 16 01:34:30 2013
@@ -182,6 +182,8 @@
     <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
     <property name="mvnrepo" value="http://repo2.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"/>
     <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
     <property name="ant_task.jar" location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
     <property name="ant_task_repo_url"   value="${mvnrepo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
@@ -1114,7 +1116,7 @@
         <artifact:pom file="${pig.pom}" id="pig"/>
         <artifact:install-provider artifactId="wagon-http" version="${wagon-http.version}"/>
         <artifact:deploy file="${output.jarfile.core}">
-           <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+           <remoteRepository id="${staging_repo_id}" url="${asfstagingrepo}"/>
            <pom refid="pig"/>
            <attach file="${output.jarfile.core}.asc" type="jar.asc"/>
            <attach file="${pig.pom}.asc" type="pom.asc"/>
@@ -1126,19 +1128,19 @@
            <attach file="${output.jarfile.javadoc}" classifier="javadoc" />
         </artifact:deploy>
         <artifact:deploy file="${pigunit.jarfile}">
-           <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+           <remoteRepository id="${staging_repo_id}" url="${asfstagingrepo}"/>
            <pom refid="pigunit"/>
            <attach file="${pigunit.jarfile}.asc" type="jar.asc"/>
            <attach file="${pigunit.pom}.asc" type="pom.asc"/>
         </artifact:deploy>
         <artifact:deploy file="${smoke.tests.jarfile}">
-           <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+           <remoteRepository id="${staging_repo_id}" url="${asfstagingrepo}"/>
            <pom refid="pigsmoke"/>
            <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}"/>
+           <remoteRepository id="${staging_repo_id}" url="${asfstagingrepo}"/>
            <pom refid="piggybank"/>
            <attach file="${piggybank.jarfile}.asc" type="jar.asc"/>
            <attach file="${piggybank.pom}.asc" type="pom.asc"/>
@@ -1149,7 +1151,7 @@
       <artifact:pom file="${pig.pom}" id="pig"/>
       <artifact:install-provider artifactId="wagon-http" version="${wagon-http.version}"/>
       <artifact:deploy file="${output.jarfile.core}">
-              <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+              <remoteRepository id="${snapshots_repo_id}" url="${asfsnapshotrepo}"/>
               <pom refid="pig"/>
               <attach file="${output.jarfile.core-h2}" classifier="h2" />
               <attach file="${output.jarfile.sources}" classifier="sources" />
@@ -1157,17 +1159,17 @@
       </artifact:deploy>
       <artifact:pom file="${pigunit.pom}" id="pigunit"/>
       <artifact:deploy file="${pigunit.jarfile}">
-              <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+              <remoteRepository id="${snapshots_repo_id}" url="${asfsnapshotrepo}"/>
               <pom refid="pigunit"/>
       </artifact:deploy>
       <artifact:pom file="${pigsmoke.pom}" id="pigsmoke"/>
       <artifact:deploy file="${smoke.tests.jarfile}">
-              <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+              <remoteRepository id="${snapshots_repo_id}" 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}"/>
+              <remoteRepository id="${snapshots_repo_id}" url="${asfsnapshotrepo}"/>
               <pom refid="piggybank"/>
       </artifact:deploy>
     </target>