Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

support spring cloud for base #784

Merged
merged 7 commits into from
Nov 23, 2023
Merged

support spring cloud for base #784

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
efba09d
support .* for exclude
lvjing2 Nov 16, 2023
b7da187
support .* for exclude
lvjing2 Nov 16, 2023
4df69ea
support spring cloud
lvjing2 Nov 21, 2023
d4f5059
update to 2.2.5-SNAPSHOT
lvjing2 Nov 21, 2023
4af2af6
remove duplicate version properties setting
lvjing2 Nov 23, 2023
56c0481
Merge branch 'master' into youji-dev
lvjing2 Nov 23, 2023
237eb9a
update to 2.2.5
lvjing2 Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</modules>

<properties>
<sofa.ark.version>2.2.4</sofa.ark.version>
<sofa.ark.version>2.2.5-SNAPSHOT</sofa.ark.version>
<project.encoding>UTF-8</project.encoding>
<java.version>1.8</java.version>
<license.maven.plugin>3.0</license.maven.plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...port-starter/src/main/java/com/alipay/sofa/ark/support/startup/EmbedSofaArkBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions sofa-ark-plugin/web-ark-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@

<artifactId>web-ark-plugin</artifactId>

<properties>
<spring.boot.version>2.7.14</spring.boot.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down