update commons-lang jar to commit b6b635a00f1e00b205cc02c0f123451e71c…

…617fb
partnerinflight · Jan 29, 2015 · f3ea8d8 · f3ea8d8
1 parent f38de67
commit f3ea8d8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/commons-lang.jarjar.rules b/commons-lang.jarjar.rules
@@ -0,0 +1 @@
+rule org.apache.** nodejava.org.apache.@1
diff --git a/commons-lang3-node-java.jar b/commons-lang3-node-java.jar
diff --git a/jarjar-1.4.jar b/jarjar-1.4.jar
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -636,7 +636,7 @@ jobject javaFindMethod(JNIEnv *env, jclass clazz, std::string& methodName, jobje
 
     return method;
   } else {
-    jclass methodUtilsClazz = env->FindClass("com/nearinfinity/org/apache/commons/lang3/reflect/MethodUtils");
+    jclass methodUtilsClazz = env->FindClass("nodejava/org/apache/commons/lang3/reflect/MethodUtils");
     jmethodID methodUtils_getMatchingAccessibleMethod = env->GetStaticMethodID(methodUtilsClazz, "getMatchingAccessibleMethod", "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;");
     const char *methodNameCStr = methodName.c_str();
     jstring methodNameJavaStr = env->NewStringUTF(methodNameCStr);
@@ -654,7 +654,7 @@ void javaCastArguments(JNIEnv *env, jobjectArray methodArgs, jobject method) {
 }
 
 jobject javaFindConstructor(JNIEnv *env, jclass clazz, jobjectArray methodArgs) {
-  jclass constructorUtilsClazz = env->FindClass("com/nearinfinity/org/apache/commons/lang3/reflect/ConstructorUtils");
+  jclass constructorUtilsClazz = env->FindClass("nodejava/org/apache/commons/lang3/reflect/ConstructorUtils");
   jmethodID constructorUtils_getMatchingAccessibleConstructor = env->GetStaticMethodID(constructorUtilsClazz, "getMatchingAccessibleConstructor", "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/reflect/Constructor;");
   jobjectArray methodArgClasses = javaObjectArrayToClasses(env, methodArgs);
   jobject method = env->CallStaticObjectMethod(constructorUtilsClazz, constructorUtils_getMatchingAccessibleConstructor, clazz, methodArgClasses);

diff --git a/update-commons-lang.sh b/update-commons-lang.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -ex
+
+if [ -d build/commons-lang ]; then
+  cd build/commons-lang
+  git pull
+else
+  mkdir -p build
+  cd build
+  git clone --depth 1 [email protected]:apache/commons-lang.git
+  cd commons-lang
+fi
+
+mvn clean compile package -DskipTests
+java -jar ../../jarjar-1.4.jar process ../../commons-lang.jarjar.rules target/commons-lang3*-SNAPSHOT.jar ../../commons-lang3-node-java.jar
+