svn commit: r1030674 - in /pig/trunk: CHANGES.txt ivy/ivysettings.xml src/org/apache/pig/Main.java

[pr...@apache.org]

Author: pradeepkth
Date: Wed Nov  3 20:56:59 2010
New Revision: 1030674

URL: http://svn.apache.org/viewvc?rev=1030674&view=rev
Log:
PIG-1707: Allow pig build to pull from alternate maven repo to enable building against newer hadoop versions (pradeepkth)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/ivy/ivysettings.xml
    pig/trunk/src/org/apache/pig/Main.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1030674&r1=1030673&r2=1030674&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Nov  3 20:56:59 2010
@@ -24,6 +24,9 @@ INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
 
+PIG-1707: Allow pig build to pull from alternate maven repo to enable building
+against newer hadoop versions (pradeepkth)
+
 PIG-1618: Switch to new parser generator technology (xuefuz via thejas)
 
 PIG-1531: Pig gobbles up error messages (nrai via hashutosh) 

Modified: pig/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/ivysettings.xml?rev=1030674&r1=1030673&r2=1030674&view=diff
==============================================================================
--- pig/trunk/ivy/ivysettings.xml (original)
+++ pig/trunk/ivy/ivysettings.xml Wed Nov  3 20:56:59 2010
@@ -29,7 +29,7 @@
           http://ibiblio.lsu.edu/main/pub/packages/maven2
           http://www.ibiblio.net/pub/packages/maven2
   -->
-  <property name="repo.maven.org" value="http://repo1.maven.org/maven2/" override="false"/>
+  <property name="repo.maven.org" value="${mvnrepo}" override="true"/>
   <property name="maven2.pattern"  value="[organisation]/[module]/[revision]/[module]-[revision]"/> 
   <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
   <!-- pull in the local repository -->

Modified: pig/trunk/src/org/apache/pig/Main.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/Main.java?rev=1030674&r1=1030673&r2=1030674&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/Main.java (original)
+++ pig/trunk/src/org/apache/pig/Main.java Wed Nov  3 20:56:59 2010
@@ -109,7 +109,10 @@ public static void main(String args[]) {
 
 static int run(String args[], PigProgressNotificationListener listener) {
     int rc = 1;
-    
+    boolean verbose = false;
+    boolean gruntCalled = false;
+    String logFileName = null;
+    try {
     GenericOptionsParser parser = new GenericOptionsParser(args);
     Configuration conf = parser.getConfiguration();    
     
@@ -119,14 +122,12 @@ static int run(String args[], PigProgres
     
     String[] pigArgs = parser.getRemainingArgs();
     
-    boolean verbose = false;
-    boolean gruntCalled = false;
-    String logFileName = null;
+    
     boolean userSpecifiedLog = false;
     
     boolean checkScriptOnly = false;
 
-    try {
+    
         BufferedReader pin = null;
         boolean debug = false;
         boolean dryrun = false;