From 973f1c7ecef85ec510490cd53087f866100451d5 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Thu, 5 Oct 2023 14:28:30 +0100 Subject: [PATCH] Bug fix. Nodejs invocation was broken Signed-off-by: Prabhu Subramanian --- build.sbt | 2 +- wrapper/nodejs/build.sh | 2 +- wrapper/nodejs/index.js | 4 ++-- wrapper/nodejs/package-lock.json | 4 ++-- wrapper/nodejs/package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index b796512..4ab0045 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "atom" ThisBuild / organization := "io.appthreat" -ThisBuild / version := "1.2.4" +ThisBuild / version := "1.2.5" ThisBuild / scalaVersion := "3.3.1" val chenVersion = "0.0.11" diff --git a/wrapper/nodejs/build.sh b/wrapper/nodejs/build.sh index f46395e..eb1bb92 100755 --- a/wrapper/nodejs/build.sh +++ b/wrapper/nodejs/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -rm -rf plugins/atom* +rm -rf plugins/bin plugins/lib if [ -e "../../target/atom.zip" ]; then cp -rf ../../target/atom.zip plugins/ unzip -q plugins/atom.zip -d plugins diff --git a/wrapper/nodejs/index.js b/wrapper/nodejs/index.js index 300c72b..0f2ca6a 100755 --- a/wrapper/nodejs/index.js +++ b/wrapper/nodejs/index.js @@ -22,7 +22,7 @@ export const JAVA_OPTS = `${ process.env.JAVA_OPTS || "" } -Xmx${freeMemoryGB}G ${JVM_ARGS}`; export const APP_MAIN_CLASS = "io.appthreat.atom.Atom"; -export const ATOM_VERSION = "1.2.0"; +export const ATOM_VERSION = "1.2.5"; export const APP_CLASSPATH = join( APP_LIB_DIR, `io.appthreat.atom-${ATOM_VERSION}-classpath.jar` @@ -57,7 +57,7 @@ export const executeAtom = (atomArgs) => { .concat([ "-cp", atomLibs.join(delimiter), - `-Dlog4j.configurationFile=${LOG4J_CONFIG}`, + `-Dlog4j2.configurationFile=${LOG4J_CONFIG}`, APP_MAIN_CLASS, ...atomArgs ]); diff --git a/wrapper/nodejs/package-lock.json b/wrapper/nodejs/package-lock.json index f2e8743..2febe69 100644 --- a/wrapper/nodejs/package-lock.json +++ b/wrapper/nodejs/package-lock.json @@ -1,12 +1,12 @@ { "name": "@appthreat/atom", - "version": "1.2.4", + "version": "1.2.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@appthreat/atom", - "version": "1.2.4", + "version": "1.2.5", "license": "Apache-2.0", "dependencies": { "@babel/parser": "^7.23.0", diff --git a/wrapper/nodejs/package.json b/wrapper/nodejs/package.json index 925774c..59770b1 100644 --- a/wrapper/nodejs/package.json +++ b/wrapper/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@appthreat/atom", - "version": "1.2.4", + "version": "1.2.5", "description": "Create atom (⚛) representation for your application, packages and libraries", "exports": "./index.js", "type": "module",