Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/test
/testIntegration
/.idea
/build
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"jvm",
"bridge"
],
"version": "0.16.1",
"version": "0.16.2",
"engines": {
"node": ">=8.0.0"
},
Expand Down
2 changes: 2 additions & 0 deletions scripts/commons-lang/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
target/
dependency-reduced-pom.xml
40 changes: 40 additions & 0 deletions scripts/commons-lang/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>1</version>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<relocations>
<relocation>
<pattern>org.apache</pattern>
<shadedPattern>nodejava.org.apache</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
19 changes: 4 additions & 15 deletions scripts/update-commons-lang.sh
Original file line number Diff line number Diff line change
@@ -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!"
1 change: 0 additions & 1 deletion src-java/commons-lang.jarjar.rules

This file was deleted.

Binary file modified src-java/commons-lang3-node-java.jar
Binary file not shown.
Binary file removed src-java/jarjar-1.4.jar
Binary file not shown.
Binary file removed test/commons-lang3-3.1.jar
Binary file not shown.
Binary file added test/commons-lang3-3.18.0.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion testHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?? {
Expand Down