diff --git a/common.sh b/common.sh index a2f5ec3..ee5371b 100644 --- a/common.sh +++ b/common.sh @@ -12,8 +12,8 @@ JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApp JAVA_OPTS="$JAVA_OPTS -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector" JAVA_OPTS="$JAVA_OPTS -Dlog4j.configurationFile=${LOG4J2_FILE}" -SOURCE_PATH="third_party/wjtx/legend-admin/guns/trunk" -PRE_COMPILE_CMD="" -COMPILE_CMD="mvn clean package install -Dmaven.test.skip=true" +SOURCE_PATH="third_party/wjtx/trunk/" +PRE_COMPILE_CMD="mvn clean package install -Dmaven.test.skip=true" +COMPILE_CMD="cd ../legend-admin/guns/trunk && mvn clean package install -Dmaven.test.skip=true" POST_COMPILE_CMD="" EXT_PKG_FILES="upload WEB-INF static" diff --git a/third_party/tools b/third_party/tools index 1cc9d69..7a56029 160000 --- a/third_party/tools +++ b/third_party/tools @@ -1 +1 @@ -Subproject commit 1cc9d69831060f204798ab993c21ee9ed9b63d56 +Subproject commit 7a560291e310bb85a4aa72d33017219cc5e7356c