wip

Author: joeferner

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
 FROM mcr.microsoft.com/devcontainers/javascript-node:22
 
 # need to run update and install at the same time to prevent stale update layer
-RUN apt-get update && apt-get install -y gdb clang-format openjdk-17-jdk maven gradle
+RUN apt-get update && apt-get install -y gdb clang-format openjdk-17-jdk maven

scripts/commons-lang/.gitignore

@@ -0,0 +1,2 @@
+target/
+dependency-reduced-pom.xml

scripts/commons-lang/pom.xml

@@ -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.18.0</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>

scripts/update-commons-lang.sh

@@ -1,48 +1,9 @@
 #!/bin/sh
 set -eu
-SCRIPT_DIR=$(dirname "$0")
+SCRIPT_DIR=$(dirname $(realpath $0))
 
-build_common_lang () {
-  echo "build common lang"
-  cd "${SCRIPT_DIR}/.."
-  if [ -d build/commons-lang ]; then
-    cd build/commons-lang
-    git pull
-  else
-    mkdir -p build
-    cd build
-    git clone https://github.com/apache/commons-lang.git
-    cd commons-lang
-  fi
-  git pull
-  git checkout rel/commons-lang-3.18.0
-  mvn clean compile package -DskipTests
-}
-
-build_jarjar () {
-  echo "build jarjar"
-  cd "${SCRIPT_DIR}/.."
-  if [ -d build/jarjar ]; then
-    cd build/jarjar
-    git pull
-  else
-    mkdir -p build
-    cd build
-    git clone https://github.com/shevek/jarjar.git
-    cd jarjar
-  fi
-  gradle
-}
-
-repackage_common_lang () {
-  echo "repackaging common lang"
-  cd "${SCRIPT_DIR}/.."
-  commons_lang_jar=$(ls build/commons-lang/target/commons-lang3*-SNAPSHOT.jar)
-  java -jar build/jarjar-forkfork/jarjar/target/jarjar-1.3.jar process src-java/commons-lang.jarjar.rules "${commons_lang_jar}" src-java/commons-lang3-node-java.jar
-}
-
-# build_common_lang
-build_jarjar
-repackage_common_lang
+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!"