Merge spring 3.2 #841

hustchaya · 2024-01-30T03:20:29Z

Motivation

support spring boot 3.2

Modification

Describe the idea and modifications you've done.

Result

Resolved or fixed #.

If there is no issue then describe the changes introduced by this PR.

* suit sprignboot 3.2.0 * suit springboot 3.2.0 --------- Co-authored-by: 致节 <hzj266771@antgroup.com>

* Ark support Netty plugin * fix mvn issue * fix pom issue --------- Co-authored-by: Xuhao Wang <1023605039@qq.com> Co-authored-by: leo james <leojames.googol@gmail.com> Co-authored-by: yuanyuancin <yuancin@163.com> (cherry picked from commit 362f9a8)

…RELEASE to 2.5.12 in /sofa-ark-plugin/netty-ark-plugin (#785) * Bump org.springframework.boot:spring-boot-starter-webflux Bumps [org.springframework.boot:spring-boot-starter-webflux](https://github.com/spring-projects/spring-boot) from 2.1.0.RELEASE to 2.5.12. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v2.1.0.RELEASE...v2.5.12) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-webflux dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Update pom.xml --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: leo james <leojames.googol@gmail.com> (cherry picked from commit 6a9f471)

* support .* for exclude * support .* for exclude * support spring cloud * update to 2.2.5-SNAPSHOT * remove duplicate version properties setting * update to 2.2.5 (cherry picked from commit cefc679)

* support .* for exclude * support .* for exclude * update version (cherry picked from commit ef684f6)

* extend ArkNettyReactiveWebServerFactory * fix biz override master ReactorHttpHandlerAdapter * fix Port in use * fix base service faile when biz uninstalled * fix the biz service is still accessible after biz was uninstalled * change version to 2.2.5 * remove unuse code * disposableServer dispose when master stopping * fix ut，sofa-ark-springboot-starter dependent reactor-netty, change netty-handler version * fix ci check --------- Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com> Co-authored-by: leo james <leojames.googol@gmail.com> (cherry picked from commit 361d445)

Co-authored-by: leo james <leojames.googol@gmail.com> (cherry picked from commit 584ac7c)

(cherry picked from commit 9c37315)

* support .* for exclude * support .* for exclude * enable override for plugin * optimize static import * enable classpath for plugin * add test for override * remove unused import * format * update 2.2.5-SNAPSHOT (cherry picked from commit 7de1384)

* feat: export plugin classes by default. * feat: export plugin classes by default. * feat: export plugin classes by default. * feat: export plugin package by default. * feat: export plugin package by default. * default add all packages for plugin * format --------- Co-authored-by: yanhuai.yh <yanhuai.yh@antgroup.com> Co-authored-by: leojames <leojames.googol@gmail.com> (cherry picked from commit 4ade973)

(cherry picked from commit a491814)

Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com> (cherry picked from commit 52910e5)

* add ut * add tests * update test * update format * update test * update jarutils test * update tests * update tests * update web server test * update tests * update tests * update test * update test * update tests * update tests * update format * update tests * update test --------- Co-authored-by: LiuYu <ly109106@alibaba-inc.com> (cherry picked from commit bb17be2)

* Avoid biz logger context being attached early，support for logback * format * fix ut --------- Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com> (cherry picked from commit 3fca4a6)

* default exclude pack rules * formar --------- Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com> Co-authored-by: leo james <leojames.googol@gmail.com> (cherry picked from commit 7ec6184)

* add ut * add tests * update test * update format * update test * update jarutils test * update tests * update tests * update web server test * update tests * update tests * update test * update test * update tests * update tests * update format * update tests * update test * update tests * update test * Delete sofa-ark-parent/core/common/C:\temp dir\b\c directory * update test * update test --------- Co-authored-by: LiuYu <ly109106@alibaba-inc.com> (cherry picked from commit dfef361)

* support delegate from classLoaderHook for getResourceAsStream * rm guice-multibinding * remove guice multi binding lib * Revert "support delegate from classLoaderHook for getResourceAsStream" This reverts commit 5bd306b. * fix typo * remove guice-multibinding * fix format (cherry picked from commit 3bcf96f)

* support delegate from classLoaderHook for getResourceAsStream * Revert "support delegate from classLoaderHook for getResourceAsStream" This reverts commit 5bd306b. * fix typo * plugin default export package without activator, modify to set * fix format (cherry picked from commit 9c5ce37)

* support delegate from classLoaderHook for getResourceAsStream * Revert "support delegate from classLoaderHook for getResourceAsStream" This reverts commit 5bd306b. * fix typo * plugin default export package without activator, modify to set * fix format * export class for plugin as default (cherry picked from commit ef9584d)

* add ut * add tests * update test * update format * update test * update jarutils test * update tests * update tests * update web server test * update tests * update tests * update test * update test * update tests * update tests * update format * update tests * update test * update tests * update test * Delete sofa-ark-parent/core/common/C:\temp dir\b\c directory * update test * update test * update tesst * update test * update test * update test * update test * update test * update test * update test --------- Co-authored-by: LiuYu <ly109106@alibaba-inc.com> (cherry picked from commit c3192d0)

2. support SpringBoot 3.2.0 new LaunchedURLClassLoader class Co-authored-by: 致节 <hzj266771@antgroup.com> (cherry picked from commit 11f5507)

* add ut * add tests * update test * update format * update test * update jarutils test * update tests * update tests * update web server test * update tests * update tests * update test * update test * update tests * update tests * update format * update tests * update test * update tests * update test * Delete sofa-ark-parent/core/common/C:\temp dir\b\c directory * update test * update test * update tesst * update test * update test * update test * update test * update test * update test * update test * update test * update test * update test * update test --------- Co-authored-by: LiuYu <ly109106@alibaba-inc.com> (cherry picked from commit bc52a4c)

qos-ch/logback#765

* support delegate from classLoaderHook for getResourceAsStream * Revert "support delegate from classLoaderHook for getResourceAsStream" This reverts commit 5bd306b. * fix typo * plugin default export package without activator, modify to set * fix format * export class for plugin as default * update to 2.2.6 * ark logger lazy init * format (cherry picked from commit 368a8be)

* update to 2.2.7 * fix windows mvn goal parse (cherry picked from commit 6a97493)

(cherry picked from commit 4f8c7d6)

...-springboot-starter/src/test/java/com/alipay/sofa/ark/springboot/loader/ExplodedArchive.java

sofa-ark-parent/support/ark-maven-plugin/src/test/resources/application.properties

pom.xml

codecov · 2024-02-01T13:20:58Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (d077390) 0.00% compared to head (1a7b627) 0.00%.

Additional details and impacted files

@@          Coverage Diff          @@
##           3.1.x    #841   +/-   ##
=====================================
  Coverage   0.00%   0.00%           
=====================================
  Files        153     153           
  Lines       6405    6405           
  Branches     961     961           
=====================================
  Misses      6405    6405

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

lvjing2

LGTM

HzjNeverStop and others added 30 commits November 27, 2023 11:00

Suit 3.2.0 (#789)

3231d3f

* suit sprignboot 3.2.0 * suit springboot 3.2.0 --------- Co-authored-by: 致节 <hzj266771@antgroup.com>

support spring cloud for base (#784)

8027b2e

* support .* for exclude * support .* for exclude * support spring cloud * update to 2.2.5-SNAPSHOT * remove duplicate version properties setting * update to 2.2.5 (cherry picked from commit cefc679)

update guava or netty (#788)

f307756

* support .* for exclude * support .* for exclude * update version (cherry picked from commit ef684f6)

Create cloud_code_scan.yml (#797)

2f2d24b

Co-authored-by: leo james <leojames.googol@gmail.com> (cherry picked from commit 584ac7c)

Add a newFile method to handle file paths with spaces. (#803)

fd702a5

(cherry picked from commit 9c37315)

enable override for plugin (#790)

d51bc7d

* support .* for exclude * support .* for exclude * enable override for plugin * optimize static import * enable classpath for plugin * add test for override * remove unused import * format * update 2.2.5-SNAPSHOT (cherry picked from commit 7de1384)

插件内部将参数解析成set，避免对maven版本有要求 (#805)

eac9a5d

(cherry picked from commit a491814)

support biz multi context for logback (#807)

783153f

Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com> (cherry picked from commit 52910e5)

Avoid biz logger context being attached early，support for logback (#816)

f9c8aaa

* Avoid biz logger context being attached early，support for logback * format * fix ut --------- Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com> (cherry picked from commit 3fca4a6)

default exclude pack rules (#814)

700b31d

* default exclude pack rules * formar --------- Co-authored-by: yuanyuan <fengjun.zfj@antgroup.com> Co-authored-by: leo james <leojames.googol@gmail.com> (cherry picked from commit 7ec6184)

1. update 2.2.7-SNAPSHOT (#823)

ac415b5

2. support SpringBoot 3.2.0 new LaunchedURLClassLoader class Co-authored-by: 致节 <hzj266771@antgroup.com> (cherry picked from commit 11f5507)

update javadoc to support multi jdk env

f3c5515

ut for the target jdk17 branch

269ae19

update logback

33b878c

remove logback context selector adapter, cause it had beed abandoned by

31ece4e

qos-ch/logback#765

fix autoconfiguration

feb4193

fix windows mvn goal parse (#831)

4d38390

* update to 2.2.7 * fix windows mvn goal parse (cherry picked from commit 6a97493)

enable sub bundle pom analysis first

8ab7fb8

add unit test

696ad82

sofastack-cla bot added cla:yes size/L labels Jan 30, 2024

chaya.cy and others added 9 commits January 30, 2024 18:19

add unit test

26f6da9

resove application.properties extension

3f63006

Update inactive_issues_robot.yml (#840)

dad0f4e

(cherry picked from commit 4f8c7d6)

modify test for zip fill to support jdk9+

a287cf1

add unit test

b1cd6fc

add comment

9bdf64f

fix export import config

be040a3

support multi sdk

d9709f2

format test

f28bd17

lvjing2 reviewed Feb 1, 2024

View reviewed changes

...-springboot-starter/src/test/java/com/alipay/sofa/ark/springboot/loader/ExplodedArchive.java Outdated Show resolved Hide resolved

sofa-ark-parent/support/ark-maven-plugin/src/test/resources/application.properties Outdated Show resolved Hide resolved

lvjing2 and others added 7 commits February 1, 2024 14:43

add guice lib

edbcea0

remove module slimming

b1c58e0

inner test class

fcf719b

unit test repair

82c7b36

unit test

2e700d9

commit

71c93b7

adjust package postion

86b4538

hustchaya changed the base branch from youji-dev-springboot3 to 3.1.x February 1, 2024 09:56

chaya.cy added 2 commits February 1, 2024 18:11

merge target branch

a68619d

unit test

db2f8fa

lvjing2 reviewed Feb 1, 2024

View reviewed changes

pom.xml Outdated Show resolved Hide resolved

chaya.cy and others added 2 commits February 1, 2024 20:55

update version

1465fd8

Merge branch '3.1.x' into merge-spring-3.2

1a7b627

lvjing2 approved these changes Feb 1, 2024

View reviewed changes

lvjing2 merged commit e34491b into 3.1.x Feb 1, 2024
7 checks passed

lvjing2 deleted the merge-spring-3.2 branch April 1, 2024 03:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge spring 3.2 #841

Merge spring 3.2 #841

hustchaya commented Jan 30, 2024 •

edited

Loading

codecov bot commented Feb 1, 2024 •

edited

Loading

lvjing2 left a comment

Merge spring 3.2 #841

Merge spring 3.2 #841

Conversation

hustchaya commented Jan 30, 2024 • edited Loading

Motivation

Modification

Result

codecov bot commented Feb 1, 2024 • edited Loading

Codecov Report

lvjing2 left a comment

Choose a reason for hiding this comment

hustchaya commented Jan 30, 2024 •

edited

Loading

codecov bot commented Feb 1, 2024 •

edited

Loading