From 99d53f42c1a1a2c1273a6ad4e90e5cd23d34b9d8 Mon Sep 17 00:00:00 2001 From: loong10k <20489781+loong10k@users.noreply.github.com> Date: Fri, 14 Aug 2026 02:42:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=84=B1=E7=A6=BB=E5=B7=B2=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E7=9A=84=20jeebiz-boot-parent=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20CI=20=E5=85=A8=E7=9F=A9=E9=98=B5=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=EF=BC=88JDK=208/17/21=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 根 pom 移除已从仓库消失的 net.jeebiz:jeebiz-boot-parent:1.0.2-SNAPSHOT， 改为独立 pom + 内联 Spring Boot 1.5.22 BOM 与基础编译属性 - 子模块 parent groupId 统一 io.github.hiwepy → io.github.easy4j（28 个 pom） - 修复 swagger2/pf4j-plugin-sample 等 pom 中的嵌套 XML 注释非法语法 - swagger2 补充 springfox/swagger-core 版本管理；文档生成插件默认跳过， 新增 docs profile 按需启用 - pf4j 示例编译级别 1.6/1.7 → 1.8（JDK 21+ 不再支持 7） - ro.fortsoft.pf4j 1.3.0 注解处理器与 JDK 9+ 不兼容：impl 模块禁用注解 处理，改为静态维护 META-INF/extensions.idx - pf4j2-plugin-test 移除未使用且不可解析的 import - 默认 reactor 仅保留可从公共仓库构建的示例，其余依赖未发布构件 （io.github.hiwepy:* starter、com.oracle:ojdbc6 等）的模块移入 legacy-samples profile --- pom.xml | 84 ++++++++++++------- spring-boot-sample-axis2/pom.xml | 2 +- spring-boot-sample-casclient/pom.xml | 2 +- spring-boot-sample-cxf/pom.xml | 2 +- spring-boot-sample-disruptor/pom.xml | 2 +- spring-boot-sample-druid/pom.xml | 2 +- spring-boot-sample-ehcache3/pom.xml | 2 +- spring-boot-sample-flyway/pom.xml | 2 +- spring-boot-sample-hikaricp/pom.xml | 2 +- spring-boot-sample-jetbrick/pom.xml | 2 +- spring-boot-sample-kaptcha/pom.xml | 2 +- spring-boot-sample-log4j2/pom.xml | 2 +- .../pf4j-plugin-api/pom.xml | 2 +- .../pf4j-plugin-impl1/pom.xml | 11 ++- .../main/resources/META-INF/extensions.idx | 1 + .../pf4j-plugin-impl2/pom.xml | 11 ++- .../main/resources/META-INF/extensions.idx | 1 + .../pf4j-plugin-test/pom.xml | 2 +- .../pf4j-plugin-sample/pom.xml | 19 ++--- spring-boot-sample-pf4j/pom.xml | 2 +- .../pf4j2-plugin-api/pom.xml | 2 +- .../pf4j2-plugin-impl1/pom.xml | 6 +- .../pf4j2-plugin-impl2/pom.xml | 6 +- .../pf4j2-plugin-test/pom.xml | 2 +- .../pf4j2/plugin/test/AuthcPluginTest.java | 1 - .../pf4j2-plugin-sample/pom.xml | 19 ++--- spring-boot-sample-pf4j2/pom.xml | 2 +- spring-boot-sample-rocketmq/pom.xml | 2 +- spring-boot-sample-sharding-jdbc/pom.xml | 2 +- spring-boot-sample-socketio/pom.xml | 2 +- spring-boot-sample-swagger2/pom.xml | 71 ++++++++++++++-- spring-boot-sample-websocket/pom.xml | 2 +- 32 files changed, 176 insertions(+), 96 deletions(-) create mode 100644 spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/src/main/resources/META-INF/extensions.idx create mode 100644 spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/src/main/resources/META-INF/extensions.idx diff --git a/pom.xml b/pom.xml index 5bfb1c0..400f3bb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,17 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - - net.jeebiz - jeebiz-boot-parent - 1.0.2-SNAPSHOT - - - io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT @@ -22,26 +11,63 @@ Spring Boot Starter Samples Spring Boot Starter Samples - + + UTF-8 + UTF-8 + 1.8 + 1.8 + 1.5.22.RELEASE + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + - spring-boot-sample-axis2 - spring-boot-sample-casclient - spring-boot-sample-cxf - spring-boot-sample-disruptor - spring-boot-sample-druid - spring-boot-sample-ehcache3 - spring-boot-sample-flyway - spring-boot-sample-hikaricp + + spring-boot-sample-jetbrick - spring-boot-sample-kaptcha - spring-boot-sample-log4j2 - spring-boot-sample-pf4j - spring-boot-sample-rocketmq - spring-boot-sample-swagger2 - spring-boot-sample-websocket spring-boot-sample-sharding-jdbc - spring-boot-sample-pf4j2 - spring-boot-sample-socketio + spring-boot-sample-swagger2 + + spring-boot-sample-pf4j/pf4j-plugin-sample + spring-boot-sample-pf4j2/pf4j2-plugin-sample - + + + + + legacy-samples + + spring-boot-sample-axis2 + spring-boot-sample-casclient + spring-boot-sample-cxf + spring-boot-sample-disruptor + spring-boot-sample-druid + spring-boot-sample-ehcache3 + spring-boot-sample-flyway + spring-boot-sample-hikaricp + spring-boot-sample-kaptcha + spring-boot-sample-log4j2 + spring-boot-sample-pf4j + spring-boot-sample-pf4j2 + spring-boot-sample-rocketmq + spring-boot-sample-socketio + spring-boot-sample-websocket + + + + \ No newline at end of file diff --git a/spring-boot-sample-axis2/pom.xml b/spring-boot-sample-axis2/pom.xml index 02419d5..d6132d7 100644 --- a/spring-boot-sample-axis2/pom.xml +++ b/spring-boot-sample-axis2/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-casclient/pom.xml b/spring-boot-sample-casclient/pom.xml index 08f6015..e1bb307 100644 --- a/spring-boot-sample-casclient/pom.xml +++ b/spring-boot-sample-casclient/pom.xml @@ -5,7 +5,7 @@ - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-cxf/pom.xml b/spring-boot-sample-cxf/pom.xml index 7947135..aac78ba 100644 --- a/spring-boot-sample-cxf/pom.xml +++ b/spring-boot-sample-cxf/pom.xml @@ -5,7 +5,7 @@ - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-disruptor/pom.xml b/spring-boot-sample-disruptor/pom.xml index 40820a7..0e19449 100644 --- a/spring-boot-sample-disruptor/pom.xml +++ b/spring-boot-sample-disruptor/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-druid/pom.xml b/spring-boot-sample-druid/pom.xml index 6e9bd0d..988581b 100644 --- a/spring-boot-sample-druid/pom.xml +++ b/spring-boot-sample-druid/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-ehcache3/pom.xml b/spring-boot-sample-ehcache3/pom.xml index c2bdcc7..88a8e83 100644 --- a/spring-boot-sample-ehcache3/pom.xml +++ b/spring-boot-sample-ehcache3/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-flyway/pom.xml b/spring-boot-sample-flyway/pom.xml index a91c447..36b7554 100644 --- a/spring-boot-sample-flyway/pom.xml +++ b/spring-boot-sample-flyway/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-hikaricp/pom.xml b/spring-boot-sample-hikaricp/pom.xml index e2d7b38..3638bf0 100644 --- a/spring-boot-sample-hikaricp/pom.xml +++ b/spring-boot-sample-hikaricp/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-jetbrick/pom.xml b/spring-boot-sample-jetbrick/pom.xml index 729cef6..137f47e 100644 --- a/spring-boot-sample-jetbrick/pom.xml +++ b/spring-boot-sample-jetbrick/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-kaptcha/pom.xml b/spring-boot-sample-kaptcha/pom.xml index 8c236a3..51a2011 100644 --- a/spring-boot-sample-kaptcha/pom.xml +++ b/spring-boot-sample-kaptcha/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-log4j2/pom.xml b/spring-boot-sample-log4j2/pom.xml index e500a1e..fd66c29 100644 --- a/spring-boot-sample-log4j2/pom.xml +++ b/spring-boot-sample-log4j2/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-api/pom.xml b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-api/pom.xml index f875c7f..2e4a513 100644 --- a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-api/pom.xml +++ b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-api/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j-plugin 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/pom.xml b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/pom.xml index 7262d60..f731a31 100644 --- a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/pom.xml +++ b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j-plugin 1.0.0-SNAPSHOT @@ -64,14 +64,13 @@ maven-compiler-plugin - - ro.fortsoft.pf4j.processor.ExtensionAnnotationProcessor - + + none lib - 1.7 + 1.8 - 1.7 + 1.8 ${project.build.sourceEncoding} diff --git a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/src/main/resources/META-INF/extensions.idx b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/src/main/resources/META-INF/extensions.idx new file mode 100644 index 0000000..066349c --- /dev/null +++ b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl1/src/main/resources/META-INF/extensions.idx @@ -0,0 +1 @@ +pf4j.plugin.impl.extensions.AuthcExtensionPointImpl1 diff --git a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/pom.xml b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/pom.xml index d527ad2..0ee8852 100644 --- a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/pom.xml +++ b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j-plugin 1.0.0-SNAPSHOT @@ -65,14 +65,13 @@ maven-compiler-plugin - - ro.fortsoft.pf4j.processor.ExtensionAnnotationProcessor - + + none lib - 1.7 + 1.8 - 1.7 + 1.8 ${project.build.sourceEncoding} diff --git a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/src/main/resources/META-INF/extensions.idx b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/src/main/resources/META-INF/extensions.idx new file mode 100644 index 0000000..c53aaa7 --- /dev/null +++ b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-impl2/src/main/resources/META-INF/extensions.idx @@ -0,0 +1 @@ +pf4j.plugin.impl.extensions.AuthcExtensionPointImpl2 diff --git a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-test/pom.xml b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-test/pom.xml index ef1732a..5a7d6e8 100644 --- a/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-test/pom.xml +++ b/spring-boot-sample-pf4j/pf4j-plugin-sample/pf4j-plugin-test/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j-plugin 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-pf4j/pf4j-plugin-sample/pom.xml b/spring-boot-sample-pf4j/pf4j-plugin-sample/pom.xml index 68a5e89..1c5aade 100644 --- a/spring-boot-sample-pf4j/pf4j-plugin-sample/pom.xml +++ b/spring-boot-sample-pf4j/pf4j-plugin-sample/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j-plugin 1.0.0-SNAPSHOT pom @@ -185,14 +185,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.13.0 lib - 1.7 + 1.8 - 1.7 + 1.8 ${project.build.sourceEncoding} @@ -411,12 +411,11 @@ org.apache.maven.plugins maven-source-plugin - - - - org.apache.maven.plugins - maven-javadoc-plugin + diff --git a/spring-boot-sample-pf4j/pom.xml b/spring-boot-sample-pf4j/pom.xml index 8217158..ff93d62 100644 --- a/spring-boot-sample-pf4j/pom.xml +++ b/spring-boot-sample-pf4j/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/pom.xml b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/pom.xml index 811eed1..c5e3585 100644 --- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/pom.xml +++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j2-plugin 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl1/pom.xml b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl1/pom.xml index a6bc845..3822e2a 100644 --- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl1/pom.xml +++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl1/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j2-plugin 1.0.0-SNAPSHOT @@ -69,9 +69,9 @@ lib - 1.7 + 1.8 - 1.7 + 1.8 ${project.build.sourceEncoding} diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl2/pom.xml b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl2/pom.xml index a9572db..53af87f 100644 --- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl2/pom.xml +++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-impl2/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j2-plugin 1.0.0-SNAPSHOT @@ -69,9 +69,9 @@ lib - 1.7 + 1.8 - 1.7 + 1.8 ${project.build.sourceEncoding} diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/pom.xml b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/pom.xml index 3d8d8c2..489c829 100644 --- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/pom.xml +++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j2-plugin 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/src/main/java/pf4j2/plugin/test/AuthcPluginTest.java b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/src/main/java/pf4j2/plugin/test/AuthcPluginTest.java index 73726ee..1d7c32b 100644 --- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/src/main/java/pf4j2/plugin/test/AuthcPluginTest.java +++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-test/src/main/java/pf4j2/plugin/test/AuthcPluginTest.java @@ -9,7 +9,6 @@ import org.pf4j.PluginManager; import org.pf4j.PluginWrapper; import org.pf4j.RuntimeMode; -import org.pf4j.spring.boot.ext.Pf4jJarPluginManager; import pf4j2.plugin.api.AuthcExtensionPoint; import pf4j2.plugin.api.annotation.ExtensionMapping; diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml index aa8a1a2..a80926d 100644 --- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml +++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j pf4j2-plugin 1.0.0-SNAPSHOT pom @@ -185,14 +185,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.13.0 lib - 1.7 + 1.8 - 1.7 + 1.8 ${project.build.sourceEncoding} @@ -411,12 +411,11 @@ org.apache.maven.plugins maven-source-plugin - - - - org.apache.maven.plugins - maven-javadoc-plugin + diff --git a/spring-boot-sample-pf4j2/pom.xml b/spring-boot-sample-pf4j2/pom.xml index 6e4613a..2dcb65f 100644 --- a/spring-boot-sample-pf4j2/pom.xml +++ b/spring-boot-sample-pf4j2/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-rocketmq/pom.xml b/spring-boot-sample-rocketmq/pom.xml index 9214d78..cae6317 100644 --- a/spring-boot-sample-rocketmq/pom.xml +++ b/spring-boot-sample-rocketmq/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-sharding-jdbc/pom.xml b/spring-boot-sample-sharding-jdbc/pom.xml index e1ba1f7..628c416 100644 --- a/spring-boot-sample-sharding-jdbc/pom.xml +++ b/spring-boot-sample-sharding-jdbc/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-socketio/pom.xml b/spring-boot-sample-socketio/pom.xml index 2ee3bee..82bb6e0 100644 --- a/spring-boot-sample-socketio/pom.xml +++ b/spring-boot-sample-socketio/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT diff --git a/spring-boot-sample-swagger2/pom.xml b/spring-boot-sample-swagger2/pom.xml index b3704fd..d8bad7d 100644 --- a/spring-boot-sample-swagger2/pom.xml +++ b/spring-boot-sample-swagger2/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT @@ -30,6 +30,9 @@ 1.5.0-alpha.15 9.1.8.0 + true + true + http://localhost:8080/v2/api-docs @@ -39,6 +42,47 @@ ${project.build.directory}/asciidoc + + + + + + io.springfox + springfox-swagger2 + ${springfox.version} + + + io.springfox + springfox-spring-web + ${springfox.version} + + + io.springfox + springfox-swagger-ui + ${springfox.version} + + + io.springfox + springfox-bean-validators + ${springfox.version} + + + io.springfox + springfox-data-rest + ${springfox.version} + + + io.springfox + springfox-spi + ${springfox.version} + + + io.swagger + swagger-core + ${swagger.version} + + + @@ -179,19 +223,18 @@ swagger-jersey-jaxrs ${swagger.version} - + https://mvnrepository.com/artifact/io.swagger/swagger-jersey2-jaxrs --> io.swagger swagger-jersey2-jaxrs ${swagger.version} - + io.swagger swagger-inflector ${swagger-inflector.version} - --> @@ -234,13 +277,13 @@ + https://mvnrepository.com/artifact/org.codehaus.mojo/appassembler-maven-plugin org.codehaus.mojo appassembler-maven-plugin --> - + + ${swagger2markup.skip} ASCIIDOC TAGS @@ -336,6 +381,8 @@ ${asciidoctor.input.directory} + + ${asciidoctor.skip} book @@ -378,5 +425,15 @@ + + + + docs + + false + false + + + \ No newline at end of file diff --git a/spring-boot-sample-websocket/pom.xml b/spring-boot-sample-websocket/pom.xml index b4c3a3d..7e9cd1c 100644 --- a/spring-boot-sample-websocket/pom.xml +++ b/spring-boot-sample-websocket/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.hiwepy + io.github.easy4j spring-boot-starter-samples 1.0.0-SNAPSHOT From acb73b7d79864e3369d2ed73c674252d312dec83 Mon Sep 17 00:00:00 2001 From: loong10k <20489781+loong10k@users.noreply.github.com> Date: Fri, 14 Aug 2026 02:47:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20swagger2markup=20=E5=8F=8A=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=8F=92=E4=BB=B6=E7=A7=BB=E5=85=A5=20docs=20profile?= =?UTF-8?q?=EF=BC=88=E5=85=B6=E4=BC=A0=E9=80=92=E4=BE=9D=E8=B5=96=E5=B7=B2?= =?UTF-8?q?=E9=9A=8F=20jcenter=20=E6=B6=88=E5=A4=B1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - swagger2markup 工程依赖与 swagger2markup/asciidoctor 插件整体移入 docs profile，默认构建不再解析 jcenter 时代的死构件 （nl.jworks.markdown_to_asciidoc、ch.netzwerg:paleo-core） - DemoApplicationTests 中依赖 swagger2markup 的演示方法/imports 注释掉， 保留代码供 docs profile 参考使用 --- spring-boot-sample-swagger2/pom.xml | 41 ++++--- .../spring/boot/DemoApplicationTests.java | 113 +++++++++--------- 2 files changed, 80 insertions(+), 74 deletions(-) diff --git a/spring-boot-sample-swagger2/pom.xml b/spring-boot-sample-swagger2/pom.xml index d8bad7d..8043163 100644 --- a/spring-boot-sample-swagger2/pom.xml +++ b/spring-boot-sample-swagger2/pom.xml @@ -116,13 +116,6 @@ swagger-spring-boot-starter ${spring-boot-starter-swagger.version} - - - io.github.swagger2markup - swagger2markup - ${swagger2markup.version} - - io.springfox @@ -292,6 +285,27 @@ docker-maven-plugin --> + + + + + + + docs + + false + false + + + + + io.github.swagger2markup + swagger2markup + ${swagger2markup.version} + + + + - - - - - - - docs - - false - false - + + diff --git a/spring-boot-sample-swagger2/src/test/java/swagger2/spring/boot/DemoApplicationTests.java b/spring-boot-sample-swagger2/src/test/java/swagger2/spring/boot/DemoApplicationTests.java index c7e48d9..986c46c 100644 --- a/spring-boot-sample-swagger2/src/test/java/swagger2/spring/boot/DemoApplicationTests.java +++ b/spring-boot-sample-swagger2/src/test/java/swagger2/spring/boot/DemoApplicationTests.java @@ -23,10 +23,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import io.github.swagger2markup.Swagger2MarkupConfig; -import io.github.swagger2markup.Swagger2MarkupConverter; -import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder; -import io.github.swagger2markup.markup.builder.MarkupLanguage; +// import io.github.swagger2markup.Swagger2MarkupConfig; +// import io.github.swagger2markup.Swagger2MarkupConverter; +// import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder; +// import io.github.swagger2markup.markup.builder.MarkupLanguage; /** * TODO @@ -37,83 +37,84 @@ //@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) public class DemoApplicationTests { - /** - * 生成AsciiDoc的代码片段： - * https://blog.csdn.net/qq_35873847/article/details/79191848 - */ - //@Test - public void buildAsciiDoc() throws Exception { + // 以下 swagger2markup 演示方法依赖 docs profile 提供的构件，默认不参与编译 + // /** + // * 生成AsciiDoc的代码片段： + // * https://blog.csdn.net/qq_35873847/article/details/79191848 + // */ + // //@Test + // public void buildAsciiDoc() throws Exception { - // 输出Ascii格式 - - /* - * - * MarkupLanguage.ASCIIDOC：指定了要输出的最终格式。除了ASCIIDOC之外，还有MARKDOWN和CONFLUENCE_MARKUP - * from(new URL("http://localhost:8080/v2/api-docs")：指定了生成静态部署文档的源头配置，可以是这样的URL形式，也可以是符合Swagger规范的String类型或者从文件中读取的流。如果是对当前使用的Swagger项目，我们通过使用访问本地Swagger接口的方式，如果是从外部获取的Swagger文档配置文件，就可以通过字符串或读文件的方式 - * toFolder(Paths.get("src/docs/asciidoc/generated")：指定最终生成文件的具体目录位置 - * - */ + // // 输出Ascii格式 - Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder() + // /* + // * + // * MarkupLanguage.ASCIIDOC：指定了要输出的最终格式。除了ASCIIDOC之外，还有MARKDOWN和CONFLUENCE_MARKUP + // * from(new URL("http://localhost:8080/v2/api-docs")：指定了生成静态部署文档的源头配置，可以是这样的URL形式，也可以是符合Swagger规范的String类型或者从文件中读取的流。如果是对当前使用的Swagger项目，我们通过使用访问本地Swagger接口的方式，如果是从外部获取的Swagger文档配置文件，就可以通过字符串或读文件的方式 + // * toFolder(Paths.get("src/docs/asciidoc/generated")：指定最终生成文件的具体目录位置 + // * + // */ - .withMarkupLanguage(MarkupLanguage.ASCIIDOC) + // Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder() - .build(); + // .withMarkupLanguage(MarkupLanguage.ASCIIDOC) - Swagger2MarkupConverter.from(new URL("http://localhost:8080/v2/api-docs")) + // .build(); - .withConfig(config) + // Swagger2MarkupConverter.from(new URL("http://localhost:8080/v2/api-docs")) - .build() + // .withConfig(config) - .toFolder(Paths.get("src/docs/asciidoc/generated")); + // .build() - } + // .toFolder(Paths.get("src/docs/asciidoc/generated")); - /** - * 生成confluence的代码片段： - * https://blog.csdn.net/qq_35873847/article/details/79191971 - */ - //@Test - public void buildMarkdown() throws Exception { + // } - Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder() + // /** + // * 生成confluence的代码片段： + // * https://blog.csdn.net/qq_35873847/article/details/79191971 + // */ + // //@Test + // public void buildMarkdown() throws Exception { - .withMarkupLanguage(MarkupLanguage.MARKDOWN) + // Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder() - .build(); + // .withMarkupLanguage(MarkupLanguage.MARKDOWN) - Swagger2MarkupConverter.from(new URL("http://localhost:8080/v2/api-docs")) + // .build(); - .withConfig(config) + // Swagger2MarkupConverter.from(new URL("http://localhost:8080/v2/api-docs")) - .build() + // .withConfig(config) - .toFolder(Paths.get("src/docs/confluence/generated")); + // .build() - } - - /** - * 生成confluence的代码片段： - * https://blog.csdn.net/qq_35873847/article/details/79191971 - */ - //@Test - public void buildConfluence() throws Exception { + // .toFolder(Paths.get("src/docs/confluence/generated")); - Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder() + // } - .withMarkupLanguage(MarkupLanguage.CONFLUENCE_MARKUP) + // /** + // * 生成confluence的代码片段： + // * https://blog.csdn.net/qq_35873847/article/details/79191971 + // */ + // //@Test + // public void buildConfluence() throws Exception { - .build(); + // Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder() - Swagger2MarkupConverter.from(new URL("http://localhost:8080/v2/api-docs")) + // .withMarkupLanguage(MarkupLanguage.CONFLUENCE_MARKUP) - .withConfig(config) + // .build(); - .build() + // Swagger2MarkupConverter.from(new URL("http://localhost:8080/v2/api-docs")) - .toFolder(Paths.get("src/docs/confluence/generated")); + // .withConfig(config) - } + // .build() + + // .toFolder(Paths.get("src/docs/confluence/generated")); + + // } } \ No newline at end of file