Author: aching
Date: Fri Mar 23 07:02:11 2012
New Revision: 1304211

URL: http://svn.apache.org/viewvc?rev=1304211&view=rev
Log:
GIRAPH-167: mvn -Phadoop_non_secure clean verify fails (ekoontz via
aching).

Modified:
    incubator/giraph/trunk/CHANGELOG
    incubator/giraph/trunk/pom.xml
    incubator/giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java
    
incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/RPCCommunications.java

Modified: incubator/giraph/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/incubator/giraph/trunk/CHANGELOG?rev=1304211&r1=1304210&r2=1304211&view=diff
==============================================================================
--- incubator/giraph/trunk/CHANGELOG (original)
+++ incubator/giraph/trunk/CHANGELOG Fri Mar 23 07:02:11 2012
@@ -2,6 +2,9 @@ Giraph Change Log
 
 Release 0.2.0 - unreleased
 
+  GIRAPH-167: mvn -Phadoop_non_secure clean verify fails (ekoontz via
+  aching).
+
   GIRAPH-163: bin/giraph script overwrites CLASSPATH if "dev
   environment" detected (this also removes USER_JAR from CLASSPATH)
   (metaman via aching).

Modified: incubator/giraph/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/giraph/trunk/pom.xml?rev=1304211&r1=1304210&r2=1304211&view=diff
==============================================================================
--- incubator/giraph/trunk/pom.xml (original)
+++ incubator/giraph/trunk/pom.xml Fri Mar 23 07:02:11 2012
@@ -505,6 +505,19 @@ under the License.
               <showWarnings>true</showWarnings>
             </configuration>
           </plugin>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-surefire-plugin</artifactId>
+           <version>2.6</version>
+           <configuration>
+             <systemProperties>
+               <property>
+                 <name>prop.jarLocation</name>
+                 
<value>target/munged/giraph-${project.version}-jar-with-dependencies.jar</value>
+               </property>
+             </systemProperties>
+           </configuration>
+         </plugin>
         </plugins>
       </build>
     </profile>

Modified: 
incubator/giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java
URL: 
http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java?rev=1304211&r1=1304210&r2=1304211&view=diff
==============================================================================
--- incubator/giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java 
(original)
+++ incubator/giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java 
Fri Mar 23 07:02:11 2012
@@ -151,7 +151,7 @@ public class GiraphRunner implements Too
     }
 
     if (cmd.hasOption("ca")) {
-      Configuration conf = job.getConfiguration();
+      Configuration jobConf = job.getConfiguration();
       for (String paramValue :
           Splitter.on(',').split(cmd.getOptionValue("ca"))) {
         String[] parts = Iterables.toArray(Splitter.on('=').split(paramValue),
@@ -164,7 +164,7 @@ public class GiraphRunner implements Too
           LOG.info("Setting custom argument [" + parts[0] + "] to [" +
               parts[1] + "]");
         }
-        conf.set(parts[0], parts[1]);
+        jobConf.set(parts[0], parts[1]);
       }
     }
 

Modified: 
incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/RPCCommunications.java
URL: 
http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/RPCCommunications.java?rev=1304211&r1=1304210&r2=1304211&view=diff
==============================================================================
--- 
incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/RPCCommunications.java
 (original)
+++ 
incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/RPCCommunications.java
 Fri Mar 23 07:02:11 2012
@@ -167,7 +167,7 @@ public class RPCCommunications<I extends
         @SuppressWarnings("unchecked")
         CommunicationsInterface<I, V, E, M> proxy =
             (CommunicationsInterface<I, V, E, M>)RPC.getProxy(
-                 CommunicationsInterface.class, versionID, addr, config);
+                 CommunicationsInterface.class, VERSION_ID, addr, config);
         return proxy;
       else[HADOOP]*/
     if (jt == null) {


Reply via email to