From 4b4ffe20dab367c29809545a43a1f11afa4b0730 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 19 Feb 2020 15:53:49 +0800 Subject: [PATCH 1/6] 1 --- third_party/wjtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wjtx b/third_party/wjtx index 0dc6516..08a1656 160000 --- a/third_party/wjtx +++ b/third_party/wjtx @@ -1 +1 @@ -Subproject commit 0dc6516dcb40753f36ba4f7a555da0f1a30c46c5 +Subproject commit 08a1656183d938830b82fab589acfafd3e3dc0d5 From c189c5f81bb19b4157dc4821b7123701eda78f00 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 19 Feb 2020 16:03:32 +0800 Subject: [PATCH 2/6] 1 --- common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" From e888c3c4c61b11a620aee2f857d901841290b0ab Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 19 Feb 2020 16:06:48 +0800 Subject: [PATCH 3/6] 1 --- third_party/tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3408d8464b5f01b3c592e8bae50b349ef6b77e22 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 19 Feb 2020 16:17:51 +0800 Subject: [PATCH 4/6] 1 --- third_party/wjtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wjtx b/third_party/wjtx index 08a1656..83811d6 160000 --- a/third_party/wjtx +++ b/third_party/wjtx @@ -1 +1 @@ -Subproject commit 08a1656183d938830b82fab589acfafd3e3dc0d5 +Subproject commit 83811d6c4d1e8ca9245151f5601a3ba6641ca97b From ac44300d226c222eda94313016a4488e976ffd9a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 20 Feb 2020 14:11:56 +0800 Subject: [PATCH 5/6] 1 --- third_party/wjtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wjtx b/third_party/wjtx index 83811d6..44397c7 160000 --- a/third_party/wjtx +++ b/third_party/wjtx @@ -1 +1 @@ -Subproject commit 83811d6c4d1e8ca9245151f5601a3ba6641ca97b +Subproject commit 44397c7e688002f997f870c6b0da1e876d901c65 From 8c2fb8693ff6e18e10c8f79b1d0236c9b3e347a4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 25 Feb 2020 13:15:23 +0800 Subject: [PATCH 6/6] 1 --- third_party/wjtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/wjtx b/third_party/wjtx index 44397c7..7bb5f47 160000 --- a/third_party/wjtx +++ b/third_party/wjtx @@ -1 +1 @@ -Subproject commit 44397c7e688002f997f870c6b0da1e876d901c65 +Subproject commit 7bb5f47bff714f05ee5ecf2d9129e4e1f2829656