Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit bdfd691

Browse files
committed
merge upstream
2 parents dc9c3f8 + d60cb2d commit bdfd691

File tree

8 files changed

+10
-7
lines changed

8 files changed

+10
-7
lines changed

docs/content/zh-cn/docs/tutorials/module-create/springboot-and-sofaboot.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ spring.application.name = ${替换为实际模块应用名}
2020

2121
### 步骤 2:添加模块需要的依赖和打包插件
2222

23+
**特别注意**: sofa ark 插件定义顺序必须在 springboot 打包插件前;
2324
```xml
2425

2526
<plugins>

samples/springboot-samples/slimming/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ base 为普通 springboot 改造成的基座,改造内容为在主 pom 里增
4646

4747
### biz1
4848
biz1 包含两个打包插件,一个常规 springboot 插件, 构建普通 springboot 包; 另一个插件为 sofaArk biz 模块插件,构建 ark biz jar 包,打包插件配置如下:
49+
50+
**特别注意**: sofa ark 插件定义顺序必须在 springboot 打包插件前;
4951
```xml
5052
<!-- 模块需要引入专门的 log4j2 adapter 做日志适配 -->
5153
<dependency>

samples/springboot3-samples/db/mybatis/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
1111
<groupId>com.alipay.sofa.serverless</groupId>
1212
<artifactId>sofa-serverless-base-starter</artifactId>
1313
<!-- 以上版本支持springboot3 -->
14-
<version>0.5.4-jdk17</version>
14+
<version>0.5.5-jdk17</version>
1515
</dependency>
1616

1717
<dependency>

samples/springboot3-samples/logging/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
1313
<groupId>com.alipay.sofa.serverless</groupId>
1414
<artifactId>sofa-serverless-base-starter</artifactId>
1515
<!-- 以上版本支持springboot3 -->
16-
<version>0.5.4-jdk17</version>
16+
<version>0.5.5-jdk17</version>
1717
</dependency>
1818
<!-- end 动态模块相关依赖 -->
1919

samples/springboot3-samples/msg/kafka/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
1111
<groupId>com.alipay.sofa.serverless</groupId>
1212
<artifactId>sofa-serverless-base-starter</artifactId>
1313
<!-- 以上版本支持springboot3 -->
14-
<version>0.5.4-jdk17</version>
14+
<version>0.5.5-jdk17</version>
1515
</dependency>
1616
<!-- end 动态模块相关依赖 -->
1717

samples/springboot3-samples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<spring.boot.version>3.0.9</spring.boot.version>
2222
<java.version>17</java.version>
2323
<sofa.ark.version>3.0.1</sofa.ark.version>
24-
<sofa.serverless.runtime.version>0.5.4-jdk17</sofa.serverless.runtime.version>
24+
<sofa.serverless.runtime.version>0.5.5-jdk17</sofa.serverless.runtime.version>
2525
<disruptor.version>3.4.2</disruptor.version>
2626
<os.plugin.version>1.7.1</os.plugin.version>
2727
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>

samples/springboot3-samples/web/tomcat/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
1313
<groupId>com.alipay.sofa.serverless</groupId>
1414
<artifactId>sofa-serverless-base-starter</artifactId>
1515
<!-- 以上版本支持springboot3 -->
16-
<version>0.5.4-jdk17</version>
16+
<version>0.5.5-jdk17</version>
1717
</dependency>
1818
<!-- end 动态模块相关依赖 -->
1919

sofa-serverless-runtime/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,8 @@
703703
<properties>
704704
<logback.core>1.2.9</logback.core>
705705
<revision>${revision.default}</revision>
706-
<sofa.ark.version>${sofa.ark.version.jdk17}</sofa.ark.version>
707-
<spring.boot.version>${spring.boot.version.jdk17}</spring.boot.version>
706+
<sofa.ark.version>${sofa.ark.version.jdk8}</sofa.ark.version>
707+
<spring.boot.version>${spring.boot.version.jdk8}</spring.boot.version>
708708
</properties>
709709
<repositories>
710710
<repository>

0 commit comments

Comments
 (0)