From efba09dc57239517eac670ed716fcc9f7c64a7e8 Mon Sep 17 00:00:00 2001 From: leojames Date: Thu, 16 Nov 2023 10:52:03 +0800 Subject: [PATCH 1/6] support .* for exclude --- .../main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java b/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java index bacbf9666..f3231312b 100644 --- a/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java +++ b/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java @@ -624,7 +624,7 @@ private boolean checkMatchExclude(List excludeList, Artifact artif || excludeArtifactId.endsWith(Constants.PACKAGE_PREFIX_MARK_2)) { if (excludeArtifactId.endsWith(Constants.PACKAGE_PREFIX_MARK_2)) { excludeArtifactId = StringUtils.removeEnd(excludeArtifactId, - Constants.PACKAGE_PREFIX_MARK_2); + Constants.PACKAGE_PREFIX_MARK_2); } else if (excludeArtifactId.endsWith(Constants.PACKAGE_PREFIX_MARK)) { excludeArtifactId = StringUtils.removeEnd(excludeArtifactId, Constants.PACKAGE_PREFIX_MARK); From b7da1876c3ffd084c15a2486eec95cc60d0d4387 Mon Sep 17 00:00:00 2001 From: leojames Date: Thu, 16 Nov 2023 14:06:36 +0800 Subject: [PATCH 2/6] support .* for exclude --- .../main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java b/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java index f3231312b..bacbf9666 100644 --- a/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java +++ b/sofa-ark-parent/support/ark-maven-plugin/src/main/java/com/alipay/sofa/ark/boot/mojo/RepackageMojo.java @@ -624,7 +624,7 @@ private boolean checkMatchExclude(List excludeList, Artifact artif || excludeArtifactId.endsWith(Constants.PACKAGE_PREFIX_MARK_2)) { if (excludeArtifactId.endsWith(Constants.PACKAGE_PREFIX_MARK_2)) { excludeArtifactId = StringUtils.removeEnd(excludeArtifactId, - Constants.PACKAGE_PREFIX_MARK_2); + Constants.PACKAGE_PREFIX_MARK_2); } else if (excludeArtifactId.endsWith(Constants.PACKAGE_PREFIX_MARK)) { excludeArtifactId = StringUtils.removeEnd(excludeArtifactId, Constants.PACKAGE_PREFIX_MARK); From 4df69eaa633fb79df54b7137b33a56c2b1d1c690 Mon Sep 17 00:00:00 2001 From: leojames Date: Tue, 21 Nov 2023 16:58:46 +0800 Subject: [PATCH 3/6] support spring cloud --- .../alipay/sofa/ark/support/startup/EmbedSofaArkBootstrap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sofa-ark-parent/support/ark-support-starter/src/main/java/com/alipay/sofa/ark/support/startup/EmbedSofaArkBootstrap.java b/sofa-ark-parent/support/ark-support-starter/src/main/java/com/alipay/sofa/ark/support/startup/EmbedSofaArkBootstrap.java index 99ec6d1d3..644a217c4 100644 --- a/sofa-ark-parent/support/ark-support-starter/src/main/java/com/alipay/sofa/ark/support/startup/EmbedSofaArkBootstrap.java +++ b/sofa-ark-parent/support/ark-support-starter/src/main/java/com/alipay/sofa/ark/support/startup/EmbedSofaArkBootstrap.java @@ -46,7 +46,7 @@ public static void launch(Environment environment) { getOrSetDefault( Constants.MASTER_BIZ, environment.getProperty(Constants.MASTER_BIZ, - environment.getProperty("spring.application.name"))); + environment.getProperty("spring.application.name", "master biz"))); getOrSetDefault(Constants.BIZ_CLASS_LOADER_HOOK_DIR, environment.getProperty(Constants.BIZ_CLASS_LOADER_HOOK_DIR)); getOrSetDefault(Constants.PLUGIN_EXPORT_CLASS_ENABLE, From d4f505943a80cbee9aee99594b9c3f4ee90d2f83 Mon Sep 17 00:00:00 2001 From: leojames Date: Tue, 21 Nov 2023 17:02:13 +0800 Subject: [PATCH 4/6] update to 2.2.5-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb0bec253..57f45119d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 2.2.4 + 2.2.5-SNAPSHOT UTF-8 1.8 3.0 From 4af2af66db1cb9ffca2bef36efc9ae3ef5ff971f Mon Sep 17 00:00:00 2001 From: leojames Date: Thu, 23 Nov 2023 14:37:53 +0800 Subject: [PATCH 5/6] remove duplicate version properties setting --- sofa-ark-plugin/web-ark-plugin/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sofa-ark-plugin/web-ark-plugin/pom.xml b/sofa-ark-plugin/web-ark-plugin/pom.xml index 083c48324..a63eba0fc 100644 --- a/sofa-ark-plugin/web-ark-plugin/pom.xml +++ b/sofa-ark-plugin/web-ark-plugin/pom.xml @@ -12,10 +12,6 @@ web-ark-plugin - - 2.7.14 - - org.springframework.boot From 237eb9ad975d492bf9929101dd60708dc1ffac3c Mon Sep 17 00:00:00 2001 From: leojames Date: Thu, 23 Nov 2023 15:19:38 +0800 Subject: [PATCH 6/6] update to 2.2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57f45119d..9896490fc 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 2.2.5-SNAPSHOT + 2.2.5 UTF-8 1.8 3.0