Skip to content

Commit

Permalink
Merge 4.0.0 (#1199)
Browse files Browse the repository at this point in the history
* Update 4.0.0 (#1056)

* revert (#1057)

Co-authored-by: 致节 <[email protected]>

* add sofa-boot module unit tests (#1058)

Co-authored-by: 致节 <[email protected]>

* add autoconfiguration module unit tests (#1059)

Co-authored-by: 致节 <[email protected]>

* rpc auto configuration refactor (#1060)

* add runtime module unit tests (#1062)

Co-authored-by: 致节 <[email protected]>

* rpc auto configuration test case (#1063)

* add isle unite tests (#1064)

* add isle module unit tests

---------

Co-authored-by: 致节 <[email protected]>

* fix unit tests (#1066)

Co-authored-by: 致节 <[email protected]>

* remore feign configuration (#1068)

* fix_uts

---------

Co-authored-by: 致节 <[email protected]>

* Fix rpc swagger export (#1069)

* fix_rpc_swagger

---------

Co-authored-by: 致节 <[email protected]>

* rpc smoke tests (#1070)

* rpc smoke test

* fix merged pom.xml

---------

Co-authored-by: yuanxuan <[email protected]>

* Fix rpc properties (#1072)

* add_model_ignore

* update

* merge rpc change

---------

Co-authored-by: 致节 <[email protected]>

* add default endpoints (#1073)

Co-authored-by: 致节 <[email protected]>

* Update test maven config (#1074)

* update test module maven config

---------

Co-authored-by: 致节 <[email protected]>

* Update codes (#1075)

* spring laoder add protected method

* update autoconfigurations

---------

Co-authored-by: 致节 <[email protected]>

* rpc smoke tests modify (#1076)

Co-authored-by: yuanxuan <[email protected]>

* add cpu core constants (#1077)

Co-authored-by: 致节 <[email protected]>

* update dependencies (#1079)

Co-authored-by: 致节 <[email protected]>

* Fix junit4 tests (#1080)

* update dependencies

* update dependecies

* fix junit4 tests

---------

Co-authored-by: 致节 <[email protected]>

* Fix junit4 tests (#1081)

* Fix all tests (#1082)

* 4.0.0 (#1083)

* update sofaboot switch (#1084)

Co-authored-by: 致节 <[email protected]>

* fix rpc unit tests (#1085)

Co-authored-by: 致节 <[email protected]>

* fix gradle tool (#1086)

Co-authored-by: 致节 <[email protected]>

* Update log (#1088)

* update sofa common tools log init

* add config to disable sofa thread pool monitor

* update isle module

---------

Co-authored-by: 致节 <[email protected]>

* add snapshot yaml (#1089)

Co-authored-by: 致节 <[email protected]>

* fix_rpc_configuration_test

* update github workflow

* fix smoke runtime unit tests

* fix rpc unit test

* add isle integration tests (#1091)

Co-authored-by: 致节 <[email protected]>

* Add runtime tets (#1092)

* add sofaboot and sofaruntime tests

* add rumtime and tracer tests

* fix unit tests

* fix unit tests

---------

Co-authored-by: 致节 <[email protected]>

* bean on switch smoke test (#1093)

* bean on switch smoke test

* fix format

* fix format

---------

Co-authored-by: yuanxuan <[email protected]>

* add test module (#1094)

* add test module
add log util

* format

---------

Co-authored-by: 致节 <[email protected]>

* Add test module (#1096)

* add test module
add log util

* format

* add actuator log test

---------

Co-authored-by: 致节 <[email protected]>

* fix_readiness_thredpool_configuration (#1098)

* fix_readiness_thredpool_configuration

* fix readienss ut

* fix readienss ut

---------

Co-authored-by: 致节 <[email protected]>

* update local env (#1099)

Co-authored-by: 致节 <[email protected]>

* support duplicate isle module (#1100)

Co-authored-by: 致节 <[email protected]>

* Fix error properties (#1101)

* support duplicate isle module

* fix tracer properties value

---------

Co-authored-by: 致节 <[email protected]>

* Update maven dependncies (#1102)

* support duplicate isle module

* update maven plugin dependencies

* update maven plugin dependencies

---------

Co-authored-by: 致节 <[email protected]>

* Add sofaboot swtich (#1104)

* update switch feature

* update switch feature

---------

Co-authored-by: 致节 <[email protected]>

* remove health indicator (#1105)

* use BufferedApplicationStartup static startup (#1107)

* use BufferedApplicationStartup static startup

* use BufferedApplicationStartup static startup

* format

---------

Co-authored-by: 致节 <[email protected]>

* support healthcheck startup (#1108)

Co-authored-by: 致节 <[email protected]>

* Update tracer 4.0.0 (#1109)

* update tracer logs

* suit sofa tracer 4.0
add sofa tracer datasource integration tests

* add tracer integration tests

* format

---------

Co-authored-by: 致节 <[email protected]>

* add FeignClientAutoConfigurationTests

* reactor switch on scenes (#1106)

* reactor switch on scenes

* reactor switch on scenes format

* reactor switch on scenes format

* fix cr problem

* add ScenesEnvironmentPostProcessorTests

* add ScenesEnvironmentPostProcessorTests

---------

Co-authored-by: yuanxuan <[email protected]>

* update readme.md (#1110)

Co-authored-by: 致节 <[email protected]>

* Fix components end point (#1078) (#1111)

* Fix components end point (#1078)

(cherry picked from commit 9930d16)

* ensure application context active when custom startup stat

---------

Co-authored-by: Dando <[email protected]>
Co-authored-by: 致节 <[email protected]>

* add scenes log (#1112)

Co-authored-by: 致节 <[email protected]>

* 1. update springboot 3.0.4 (#1113)

* 1. update springboot 3.0.4
2. addPostProcessors avoid duplicate

* add mysql-connector-java

* fix throw exception in SofaGenericApplicaitonContext

* fix ut

---------

Co-authored-by: 致节 <[email protected]>

* support custom readiness actuator http response code (#1114)

* support custom readiness actuator http response code

* rename SofaHttpCodeStatusMapper to ReadinessHttpCodeStatusMapper

---------

Co-authored-by: 致节 <[email protected]>

* Support startup parent self time (#1115)

* update startup bean stats

* support show bean real cost

---------

Co-authored-by: 致节 <[email protected]>

* update swagger and swagger2 version (#1118)

* update swagger and swagger2 version

* fix swagger autoconfig uts

---------

Co-authored-by: 致节 <[email protected]>

* Add rpc actuator configuration (#1119)

* add com.alipay.sofa.boot.actuator.autoconfigure.rpc.RpcActuatorAutoConfiguration

* support use sofa.boot.rpc.enableAutoPublish=true to auto publush rpc services

---------

Co-authored-by: 致节 <[email protected]>

* Fix rpc grpc tests (#1122)

* enable rpc grpc tests

* fix ut: testConnectionNum

* update maven dependencies

* update protobuf dependencies

* update depdencies

* update depdencies

---------

Co-authored-by: 致节 <[email protected]>

* update maven staging plugin to 1.6.13

* upgrade javassit version to 3.29.2-GA ,rpc smoke tests use javassist (#1125)

Co-authored-by: yuanxuan <[email protected]>

* 4.0.0 (#1126)

* rename thread pool monitor config

* rename thread pool monitor config

* rename thread pool monitor config

---------

Co-authored-by: 致节 <[email protected]>

* update springboot 3.0.5 (#1131)

Co-authored-by: 致节 <[email protected]>

* Update dubbo 3.1.8 and curator 4.3.0 (#1128)

* rename thread pool monitor config

* rename thread pool monitor config

* rename thread pool monitor config

* update dubbo 3.1.8
update maven-surefire-plugin 3.0.0

* update dubbo 3.1.8
update curator 5.4.0

* fix xml

* update  curator 4.3.0

* fix dubbo ut

---------

Co-authored-by: 致节 <[email protected]>

* Update guice 5.1.0 (#1139)

* update guice 5.1.0

* skip tests module when deploy

---------

Co-authored-by: 致节 <[email protected]>

* add unit tests for util (#1140)

Co-authored-by: 致节 <[email protected]>

* remove guice-multibindings (#1142)

Co-authored-by: 致节 <[email protected]>

* Add sofa boot ut (#1141)

* add unit tests for util

* add uts for sofa-boot class

---------

Co-authored-by: 致节 <[email protected]>

* add uts (#1143)

* add unit tests for util

* add uts for sofa-boot class

* remove guice-multibindings

* add ut for acutator autoconfigure

---------

Co-authored-by: 致节 <[email protected]>

* Add sofa boot autoconfiguration uts (#1144)


* add sofa-boot autoconfigure unit tests

---------

Co-authored-by: 致节 <[email protected]>

* Update jacoco plugin 0.8.9 (#1145)

* update jacoco maven plugin 0.8.9

---------

Co-authored-by: 致节 <[email protected]>

* Update codecov-action@v3 (#1146)

* update codecov-action@v3

---------

Co-authored-by: 致节 <[email protected]>

* Add jacoco module (#1148)

* add sofa-boot-jacoco-report module

---------

Co-authored-by: 致节 <[email protected]>

* Add codecov configs (#1151)

* add fail_ci_if_error true

---------

Co-authored-by: 致节 <[email protected]>

* Add ark tests (#1152)

* add unit tests for ark-sofa-boot

---------

Co-authored-by: 致节 <[email protected]>

* Fix rpc tests report (#1153)

* add rpc report

---------

Co-authored-by: 致节 <[email protected]>

* Add isle module uts (#1154)

* add unit tests for isle module

---------

Co-authored-by: 致节 <[email protected]>

* add unit tests for runtime (#1157)

* add unit tests for runtime

* add unit tests for runtime

* add unit tests for runtime

---------

Co-authored-by: 致节 <[email protected]>

* Add runtime unittests (#1158)

* add unit tests for runtime

* add unit tests for runtime

* add unit tests for runtime

* add unit tests

---------

Co-authored-by: 致节 <[email protected]>

* add legacy configurations detect (#1161)

Co-authored-by: 致节 <[email protected]>

* Cherry pick from 3.18.0 (#1164)

* cherry pick Feature same module inject (#1116)

* cherry pick 081a24c

* cherry pick refactor aware processor (#1130)

* cherry pick support repeatable @SofaServices annotation (#1132)

* cherry pick modify RuntimeContextBeanFactoryPostProcessor field modifier protected (#1134)

* cherry pick from Support sofareference required optional (#1135)

* cherry pick add startup log in sofa runtime log (#1159)

* use FactoryBean.OBJECT_TYPE_ATTRIBUTE to support ReferenceFactoryBean… (#1156)

* use FactoryBean.OBJECT_TYPE_ATTRIBUTE to support ReferenceFactoryBean by type inject

---------

Co-authored-by: wutao <[email protected]>
Co-authored-by: 致节 <[email protected]>
Co-authored-by: Dando <[email protected]>

* optimize RuntimeContextBeanFactoryPostProcessor (#1165)

* optimize RuntimeContextBeanFactoryPostProcessor

* optimize RuntimeContextBeanFactoryPostProcessor

---------

Co-authored-by: 致节 <[email protected]>

* optimize springcloud bootstrap log properties (#1166)

* optimize springcloud bootstrap log properties

* update ut

* remove unused import

---------

Co-authored-by: 致节 <[email protected]>

* add spring.boot.version properties (#1168)

Co-authored-by: 致节 <[email protected]>

* Add ark tests (#1167)

* remove guice-multibindings

* add unit tests for ark-sofa-boot

* add ark smoke tests

* add sofa ark smoke tests

* update ark smoke tests

---------

Co-authored-by: 致节 <[email protected]>

* add sofarpc endpoint (#1169)

* add sofarpc endpoint

* format

* fix actuator ut

* fix actuator ut

---------

Co-authored-by: 致节 <[email protected]>

* Add isle enable condition (#1171)

* rename EndPoint to Endpoint

* add SofaModuleAvailableCondition

---------

Co-authored-by: 致节 <[email protected]>

* ComponentsDescriptor implements OperationResponseBody

* use spring.factories instead of jdk spi (#1175)

Co-authored-by: 致节 <[email protected]>

* Merge v3.19.0 (#1182)

* avoid npe (#1177)

Co-authored-by: 致节 <[email protected]>
(cherry picked from commit 7e5fd1e)

* Add annotation sofa service bean (#1176)
(cherry picked from commit 123b3eb)

* straight application listener order (#1179)
(cherry picked from commit bb45ec7)

---------

Co-authored-by: Dando <[email protected]>

* update springboot 3.0.7 (#1183)

Co-authored-by: 致节 <[email protected]>

* update listener order (#1184)

Co-authored-by: 致节 <[email protected]>

* 1. distinct requrie modules (#1185)

* 1. distinct requrie modules
2. split loadPropertiesFormUrlResource method
3. remove require modules if module is none spring powered

* 1. distinct requrie modules
2. split loadPropertiesFormUrlResource method
3. remove require modules if module is none spring powered

---------

Co-authored-by: 致节 <[email protected]>

* Revert extenstion package (#1186)

* 1. distinct requrie modules
2. split loadPropertiesFormUrlResource method
3. remove require modules if module is none spring powered

* revert extension package

---------

Co-authored-by: 致节 <[email protected]>

* Add legacy rpc property (#1189)

* 1. distinct requrie modules
2. split loadPropertiesFormUrlResource method
3. remove require modules if module is none spring powered

* revert extension package

* support legacy proeprty for sofarpc

---------

Co-authored-by: 致节 <[email protected]>

* Release dependencies (#1190)

* 1. distinct requrie modules
2. split loadPropertiesFormUrlResource method
3. remove require modules if module is none spring powered

* revert extension package

* support legacy proeprty for sofarpc

* release jars

---------

Co-authored-by: 致节 <[email protected]>

* Cherry pick 3.21.1 (#1195)

* 1. distinct requrie modules
2. split loadPropertiesFormUrlResource method
3. remove require modules if module is none spring powered

* revert extension package

* support legacy proeprty for sofarpc

* 1. update version 3.18.1 (#1192)

* 1. update version 3.18.1
2. fix @SofaService Annotation parse

* format

* format

---------

Co-authored-by: 致节 <[email protected]>

* format

---------

Co-authored-by: 致节 <[email protected]>

* Update springboot version (#1196)


* update_springboot 3.0.7

---------

Co-authored-by: 致节 <[email protected]>

* Release 4.0.0 (#1198)

* release 4.0.0

---------

Co-authored-by: 致节 <[email protected]>

---------

Co-authored-by: 致节 <[email protected]>
Co-authored-by: wutao <[email protected]>
Co-authored-by: yuanxuan <[email protected]>
Co-authored-by: Dando <[email protected]>
  • Loading branch information
5 people authored Jun 28, 2023
1 parent f2915c3 commit 46a8e5a
Show file tree
Hide file tree
Showing 1,236 changed files with 42,253 additions and 37,528 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ name: CI

on:
push:
branches: [ master ]
branches: [ master,4.0.0 ]
pull_request:
branches: [ master ]
branches: [ master,4.0.0 ]

jobs:
build:
runs-on: ubuntu-20.04
strategy:
matrix:
jdk: [8, 11]
jdk: [17]
steps:
- uses: actions/checkout@v2
- name: Set up JDK
Expand All @@ -28,9 +28,8 @@ jobs:
&& mv apache-zookeeper-3.5.6-bin/conf/zoo_sample.cfg apache-zookeeper-3.5.6-bin/conf/zoo.cfg
&& /bin/bash apache-zookeeper-3.5.6-bin/bin/zkServer.sh start
- name: Build with Maven
run: mvn clean install -Pdefault -DskipTests -B -V
run: mvn clean install -B -V
&& sh ./tools/check_format.sh
&& mvn clean test -Pdefault
- name: Codecov
uses: codecov/codecov-action@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '17'
distribution: 'temurin'
cache: maven
server-id: ossrh
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ Please refer to SOFAStack Documentation for [SOFABoot quick start guide](https:/

### Demos
Some SOFABoot demo projects to get your hands dirty:
- [Class Isolation](https://github.com/sofastack-guides/sofa-boot-guides/tree/master/sofaboot-sample-with-isolation)
- [Spring Context Isolation](https://github.com/sofastack-guides/sofa-boot-guides/tree/master/sofaboot-sample-with-isolation)
- [SOFA RPC](https://github.com/sofastack-guides/sofa-boot-guides/tree/master/sofaboot-sample-with-rpc)
- [Scheduler with Batch](https://github.com/sofastack-guides/sofa-boot-guides/tree/master/sofaboot-scheduler-batch-sample)
* [Standard project](https://github.com/sofastack-guides/sofa-boot-guides/tree/4.x/sofaboot-sample)
- [Class Isolation](https://github.com/sofastack-guides/sofa-boot-guides/tree/4.x/sofaboot-sample-with-isolation)
- [Spring Context Isolation](https://github.com/sofastack-guides/sofa-boot-guides/tree/4.x/sofaboot-sample-with-isolation)
- [SOFA RPC](https://github.com/sofastack-guides/sofa-boot-guides/tree/4.x/sofaboot-sample-with-rpc)

## Functionality
To supplement the abilities of deploying large-scale microservices in production environment for Spring Boot, SOFABoot offers following enhancements:
Expand All @@ -44,7 +44,7 @@ While Spring Boot health indicators are practical real-time exposure of applicat
Therefore, readiness check is an indispensable part of deployment automation in production environment and SOFABoot provides the readiness check for application out of box.
For reliable application startup, all SOFAStack middleware services won't reveal themselves (e.g., RPC services publishing to Service Registry) until readiness check passes.

Platform PaaS can also make use of the readiness check result via URL `http://localhost:8080/health/readiness` to control gracefully external traffic originating such as gateway, load balancer, etc.
Platform PaaS can also make use of the readiness check result via URL `http://localhost:8080/actuator/readiness` to control gracefully external traffic originating such as gateway, load balancer, etc.

### Class Isolation
Aimed to solve class or dependency conflicts, [SOFAArk](https://github.com/sofastack/sofa-ark) is created.
Expand Down Expand Up @@ -78,7 +78,7 @@ All of them are packaged as self-contained "starters" to provide the correspondi
## Contribution
We love contributions! Before taking any further steps, please take a look at [Contributing to SOFABoot](./CONTRIBUTING.md).

SOFABoot is compiled under JDK 8 currently and needs [Apache Maven 3.2.5](https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/) or higher version.
SOFABoot is compiled under JDK 17 currently and needs [Apache Maven 3.5.4](https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/) or higher version.

### Community
See our community [materials](https://github.com/sofastack/community/blob/master/ROLES-EN.md).
Expand Down
17 changes: 8 additions & 9 deletions README_ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Spring Boot 是一个非常优秀的开源框架,可以非常方便地就构

针对 Spring Boot 缺少 Readiness Check 能力的情况,SOFABoot 增加了 Spring Boot 现有的健康检查的能力,提供了 Readiness Check 的能力。利用 Readiness Check 的能力,SOFA 中间件中的各个组件只有在 Readiness Check 通过之后,才将流量引入到应用的实例中,比如 RPC,只有在 Readiness Check 通过之后,才会向服务注册中心注册,后面来自上游应用的流量才会进入。

除了中间件可以利用 Readiness Check 的事件来控制流量的进入之外,PAAS 系统也可以通过访问 `http://localhost:8080/health/readiness` 来获取应用的 Readiness Check 的状况,用来控制例如负载均衡设备等等流量的进入。
除了中间件可以利用 Readiness Check 的事件来控制流量的进入之外,PAAS 系统也可以通过访问 `http://localhost:8080/actuator/readiness` 来获取应用的 Readiness Check 的状况,用来控制例如负载均衡设备等等流量的进入。

### 2.2 提供类隔离的能力

Expand All @@ -44,7 +44,7 @@ Spring Boot 是一个非常优秀的开源框架,可以非常方便地就构

### 2.5 模块化开发

SOFABoot 从 2.4.0 版本开始支持基于 Spring 上下文隔离的模块化开发能力,每个 SOFABoot 模块使用独立的 Spring 上下文,避免不同 SOFABoot 模块间的 BeanId 冲突,有效降低企业级多模块开发时团队间的沟通成本。
SOFABoot 支持基于 Spring 上下文隔离的模块化开发能力,每个 SOFABoot 模块使用独立的 Spring 上下文,避免不同 SOFABoot 模块间的 BeanId 冲突,有效降低企业级多模块开发时团队间的沟通成本。

## 三、快速开始

Expand All @@ -54,20 +54,19 @@ SOFABoot 从 2.4.0 版本开始支持基于 Spring 上下文隔离的模块化

在贡献代码之前,请阅读[如何贡献](./CONTRIBUTING.md)来了解如何向 SOFABoot 贡献代码。

SOFABoot 的编译环境的要求为 JDK8,需要采用 [Apache Maven 3.2.5](https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/) 或者更高的版本进行编译。
SOFABoot 的编译环境的要求为 JDK17,需要采用 [Apache Maven 3.5.4](https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/) 或者更高的版本进行编译。

## 五、感谢

SOFA 的第一个版本是阿玺创造的,感谢阿玺给 SOFA 打下了坚实地基础,也非常感谢在 SOFA 的历史中给 SOFA 贡献过代码的人们。

## 六、示例

SOFABoot 的示例工程 [sofaboot-samples](https://github.com/sofastack-guides/sofa-boot-guides/tree/master) 包含以下 demo 项目:
* [SOFABoot 示例工程](https://github.com/sofastack-guides/sofa-boot-guides/tree/master/sofaboot-sample)
* [SOFABoot 示例工程(包含类隔离能力)](https://github.com/sofastack-guides/sofa-boot-guides/blob/master/sofaboot-sample-with-isolation)
* [SOFABoot 示例工程(包含模块化开发能力)](https://github.com/sofastack-guides/sofa-boot-guides/blob/master/sofaboot-sample-with-isle)
* [SOFABoot 示例工程(使用 SOFARPC)](https://github.com/sofastack-guides/sofa-boot-guides/blob/master/sofaboot-sample-with-rpc)
* [SOFABoot 示例工程(使用定时任务)](https://github.com/sofastack-guides/sofa-boot-guides/blob/master/sofaboot-scheduler-batch-sample)
SOFABoot 的示例工程 [sofaboot-samples](https://github.com/sofastack-guides/sofa-boot-guides/tree/4.x) 包含以下 demo 项目:
* [SOFABoot 示例工程](https://github.com/sofastack-guides/sofa-boot-guides/tree/4.x/sofaboot-sample)
* [SOFABoot 示例工程(包含类隔离能力)](https://github.com/sofastack-guides/sofa-boot-guides/blob/4.x/sofaboot-sample-with-isolation)
* [SOFABoot 示例工程(包含模块化开发能力)](https://github.com/sofastack-guides/sofa-boot-guides/blob/4.x/sofaboot-sample-with-isle)
* [SOFABoot 示例工程(使用 SOFARPC)](https://github.com/sofastack-guides/sofa-boot-guides/blob/4.x/sofaboot-sample-with-rpc)

## 七、文档

Expand Down
144 changes: 47 additions & 97 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.10</version>
<!-- Add this to resolve to repository -->
<relativePath />
<version>3.0.7</version>
</parent>

<groupId>com.alipay.sofa</groupId>
Expand All @@ -37,15 +35,22 @@
<description>SOFABoot Build</description>

<properties>
<revision>3.19.1</revision>
<revision>4.0.0</revision>
<sofa.boot.version>${revision}</sofa.boot.version>
<spring.boot.version>3.0.7</spring.boot.version>
<!--project-->
<java.version>17</java.version>
<project.encoding>UTF-8</project.encoding>
<project.build.encoding>UTF-8</project.build.encoding>
<!--maven plugin-->
<maven.staging.plugin>1.6.7</maven.staging.plugin>
<maven.staging.plugin>1.6.13</maven.staging.plugin>
<maven.gpg.pluign>1.6</maven.gpg.pluign>
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
</properties>

<modules>
<!--tests must behind project to make sure nexus deploy success-->
<module>sofa-boot-tests</module>
<module>sofa-boot-project</module>
</modules>

Expand All @@ -54,6 +59,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
Expand All @@ -76,25 +82,6 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-ark-maven-plugin</artifactId>
<version>${sofa.ark.version}</version>
</plugin>
<plugin>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-ark-plugin-maven-plugin</artifactId>
<version>${sofa.ark.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
Expand Down Expand Up @@ -135,86 +122,49 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</profile>

<profile>
<id>snapshot</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${maven.staging.plugin}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven.gpg.pluign}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
<id>default</id>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>release</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>releases</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</pluginRepository>
<pluginRepository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
</distributionManagement>
</profile>
</profiles>

<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>release</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>releases</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</pluginRepository>
<pluginRepository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
</project>
2 changes: 0 additions & 2 deletions sofa-boot-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
<module>sofa-boot-actuator-autoconfigure</module>
<module>sofa-boot-starters</module>
<module>sofa-boot-tools</module>
<module>sofa-boot-plugins</module>
<module>sofa-boot-core</module>
<!--imported or configured as parent by users-->
<module>sofaboot-dependencies</module>
<!--imported or configured as parent by sofa boot module self-->
<module>sofa-boot-parent</module>
<module>sofa-boot-jacoco-report</module>
</modules>

<properties>
Expand Down
Loading

0 comments on commit 46a8e5a

Please sign in to comment.