Skip to content

Commit 69c662c

Browse files
committed
update commons lang to 3.18.0
1 parent 586703c commit 69c662c

File tree

11 files changed

+50
-19
lines changed

11 files changed

+50
-19
lines changed

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/test
12
/testIntegration
23
/.idea
34
/build

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ const java = javaInit.getJavaInstance();
164164

165165
```javascript
166166
const java = require("java");
167-
java.classpath.push("commons-lang3-3.1.jar");
167+
java.classpath.push("commons-lang3-3.18.0.jar");
168168
java.classpath.push("commons-io.jar");
169169

170170
const list1 = java.newInstanceSync("java.util.ArrayList");
@@ -243,7 +243,7 @@ java.asyncOptions = {
243243
syncSuffix: "", // Sync methods use the base name(!!)
244244
promiseSuffix: "Promise", // Generate methods returning promises, using the suffix Promise.
245245
};
246-
java.classpath.push("commons-lang3-3.1.jar");
246+
java.classpath.push("commons-lang3-3.18.0.jar");
247247
java.classpath.push("commons-io.jar");
248248

249249
java.import("java.util.ArrayList"); // see NOTE below

scripts/commons-lang/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
target/
2+
dependency-reduced-pom.xml

scripts/commons-lang/pom.xml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>commons-lang</groupId>
4+
<artifactId>commons-lang</artifactId>
5+
<version>1</version>
6+
7+
<dependencies>
8+
<dependency>
9+
<groupId>org.apache.commons</groupId>
10+
<artifactId>commons-lang3</artifactId>
11+
<version>3.5</version>
12+
</dependency>
13+
</dependencies>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-shade-plugin</artifactId>
20+
<version>3.6.0</version>
21+
<executions>
22+
<execution>
23+
<phase>package</phase>
24+
<goals>
25+
<goal>shade</goal>
26+
</goals>
27+
<configuration>
28+
<relocations>
29+
<relocation>
30+
<pattern>org.apache</pattern>
31+
<shadedPattern>nodejava.org.apache</shadedPattern>
32+
</relocation>
33+
</relocations>
34+
</configuration>
35+
</execution>
36+
</executions>
37+
</plugin>
38+
</plugins>
39+
</build>
40+
</project>

scripts/update-commons-lang.sh

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
#!/bin/sh
22
set -eu
3+
SCRIPT_DIR=$(dirname $(realpath $0))
34

4-
SCRIPT_DIR=$(dirname "$0")
5-
cd "${SCRIPT_DIR}/.."
6-
7-
if [ -d build/commons-lang ]; then
8-
cd build/commons-lang
9-
git pull
10-
else
11-
mkdir -p build
12-
cd build
13-
git clone --depth 1 git@github.com:apache/commons-lang.git
14-
cd commons-lang
15-
fi
16-
17-
mvn clean compile package -DskipTests
18-
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
5+
cd "${SCRIPT_DIR}/commons-lang"
6+
mvn package
7+
cp "${SCRIPT_DIR}/commons-lang/target/commons-lang-1.jar" "${SCRIPT_DIR}/../src-java/commons-lang3-node-java.jar"
198

209
echo "complete!"

src-java/commons-lang.jarjar.rules

Lines changed: 0 additions & 1 deletion
This file was deleted.
5.35 KB
Binary file not shown.

src-java/jarjar-1.4.jar

-118 KB
Binary file not shown.

test/commons-lang3-3.1.jar

-308 KB
Binary file not shown.

test/commons-lang3-3.18.0.jar

686 KB
Binary file not shown.

0 commit comments

Comments
 (0)