From cf449bc4d493e5ca8a3bae15a069c1f8843fbef2 Mon Sep 17 00:00:00 2001 From: StarBlues <5053202+starblues@user.noreply.gitee.com> Date: Wed, 4 May 2022 04:31:27 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gitee/starblues/core/DefaultPluginManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java index 3d6fe0b..f5824ac 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java @@ -119,7 +119,6 @@ public class DefaultPluginManager implements PluginManager{ if(loaded.get()){ throw new PluginException("不能重复调用: loadPlugins"); } - pluginListenerFactory = createPluginListenerFactory(); try { pluginListenerFactory = createPluginListenerFactory(); if(ObjectUtils.isEmpty(pluginRootDirs)){ -- Gitee From 0295536fd9618d705274493f02e7ab7235f11c32 Mon Sep 17 00:00:00 2001 From: hanlei109 Date: Thu, 26 May 2022 09:13:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmaven=E5=9D=90?= =?UTF-8?q?=E6=A0=87type=3Dpom=EF=BC=8Crepackage=E5=90=8E=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gitee/starblues/plugin/pack/Constant.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java index a08d41b..8ba0d13 100644 --- a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java +++ b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java @@ -32,6 +32,7 @@ public class Constant { public static final String SCOPE_TEST = "test"; public static final String MAVEN_MAIN_TYPE = "main"; + public static final String MAVEN_POM_TYPE = "pom"; public static final String MODE_MAIN = "main"; public static final String MODE_DEV = "dev"; @@ -51,6 +52,9 @@ public class Constant { if(Constant.isSystemScope(artifact.getScope())){ return includeSystemScope == null || !includeSystemScope; } + if(Constant.filterPomTypeArtifact(artifact)){ + return true; + } return false; } @@ -59,6 +63,10 @@ public class Constant { return MAVEN_MAIN_TYPE.equalsIgnoreCase(artifact.getType()); } + public static boolean filterPomTypeArtifact(Artifact artifact){ + return MAVEN_POM_TYPE.equalsIgnoreCase(artifact.getType()); + } + public static boolean scopeFilter(String scope){ return SCOPE_PROVIDED.equalsIgnoreCase(scope) || SCOPE_TEST.equalsIgnoreCase(scope); -- Gitee