diff --git a/.npmignore b/.npmignore index 4c82cca7..5c81151b 100644 --- a/.npmignore +++ b/.npmignore @@ -1,3 +1,4 @@ +/test /testIntegration /.idea /build diff --git a/README.md b/README.md index 2969aa89..7629bada 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ const java = javaInit.getJavaInstance(); ```javascript const java = require("java"); -java.classpath.push("commons-lang3-3.1.jar"); +java.classpath.push("commons-lang3-3.18.0.jar"); java.classpath.push("commons-io.jar"); const list1 = java.newInstanceSync("java.util.ArrayList"); @@ -243,7 +243,7 @@ java.asyncOptions = { syncSuffix: "", // Sync methods use the base name(!!) promiseSuffix: "Promise", // Generate methods returning promises, using the suffix Promise. }; -java.classpath.push("commons-lang3-3.1.jar"); +java.classpath.push("commons-lang3-3.18.0.jar"); java.classpath.push("commons-io.jar"); java.import("java.util.ArrayList"); // see NOTE below diff --git a/package.json b/package.json index ebd426c3..8f73decf 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "jvm", "bridge" ], - "version": "0.16.1", + "version": "0.16.2", "engines": { "node": ">=8.0.0" }, diff --git a/scripts/commons-lang/.gitignore b/scripts/commons-lang/.gitignore new file mode 100644 index 00000000..8b8c81d7 --- /dev/null +++ b/scripts/commons-lang/.gitignore @@ -0,0 +1,2 @@ +target/ +dependency-reduced-pom.xml diff --git a/scripts/commons-lang/pom.xml b/scripts/commons-lang/pom.xml new file mode 100644 index 00000000..5ec9c25a --- /dev/null +++ b/scripts/commons-lang/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + commons-lang + commons-lang + 1 + + + + org.apache.commons + commons-lang3 + 3.5 + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + org.apache + nodejava.org.apache + + + + + + + + + \ No newline at end of file diff --git a/scripts/update-commons-lang.sh b/scripts/update-commons-lang.sh index d3e2d92e..e3eb71ae 100755 --- a/scripts/update-commons-lang.sh +++ b/scripts/update-commons-lang.sh @@ -1,20 +1,9 @@ #!/bin/sh set -eu +SCRIPT_DIR=$(dirname $(realpath $0)) -SCRIPT_DIR=$(dirname "$0") -cd "${SCRIPT_DIR}/.." - -if [ -d build/commons-lang ]; then - cd build/commons-lang - git pull -else - mkdir -p build - cd build - git clone --depth 1 git@github.com:apache/commons-lang.git - cd commons-lang -fi - -mvn clean compile package -DskipTests -java -jar ../../src-java/jarjar-1.4.jar process ../../src-java/commons-lang.jarjar.rules target/commons-lang3*-SNAPSHOT.jar ../../src-java/commons-lang3-node-java.jar +cd "${SCRIPT_DIR}/commons-lang" +mvn package +cp "${SCRIPT_DIR}/commons-lang/target/commons-lang-1.jar" "${SCRIPT_DIR}/../src-java/commons-lang3-node-java.jar" echo "complete!" diff --git a/src-java/commons-lang.jarjar.rules b/src-java/commons-lang.jarjar.rules deleted file mode 100644 index a7f18d32..00000000 --- a/src-java/commons-lang.jarjar.rules +++ /dev/null @@ -1 +0,0 @@ -rule org.apache.** nodejava.org.apache.@1 diff --git a/src-java/commons-lang3-node-java.jar b/src-java/commons-lang3-node-java.jar index 7a9b0200..7a44d7e7 100644 Binary files a/src-java/commons-lang3-node-java.jar and b/src-java/commons-lang3-node-java.jar differ diff --git a/src-java/jarjar-1.4.jar b/src-java/jarjar-1.4.jar deleted file mode 100644 index 68b9db9a..00000000 Binary files a/src-java/jarjar-1.4.jar and /dev/null differ diff --git a/test/commons-lang3-3.1.jar b/test/commons-lang3-3.1.jar deleted file mode 100644 index a85e539b..00000000 Binary files a/test/commons-lang3-3.1.jar and /dev/null differ diff --git a/test/commons-lang3-3.18.0.jar b/test/commons-lang3-3.18.0.jar new file mode 100644 index 00000000..9359e524 Binary files /dev/null and b/test/commons-lang3-3.18.0.jar differ diff --git a/testHelpers.ts b/testHelpers.ts index 7e44ee65..f5543a14 100644 --- a/testHelpers.ts +++ b/testHelpers.ts @@ -23,7 +23,7 @@ async function _getJava(asyncOptions?: AsyncOptions | null, options?: GetJavaOpt //java.options.push('-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005'); java.classpath.push("test/"); - java.classpath.push("test/commons-lang3-3.1.jar"); + java.classpath.push("test/commons-lang3-3.18.0.jar"); if (asyncOptions !== null) { java.asyncOptions = asyncOptions ?? {