Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

optimize: Splitting dependencies for common, client, and server #6398

Open
wants to merge 55 commits into
base: 2.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f8ed960
添加 `dependencies-client` 和 `dependencies-server` 模块,并调整依赖结构。
wangliang181230 Mar 6, 2024
6a2269a
部分profile转移到dependencies-server中。
wangliang181230 Mar 6, 2024
36c3051
完善 dependencies 的定义,迁移部分定义到 client 和 server 中,明确依赖的作用范围。
wangliang181230 Mar 6, 2024
adb9cd7
简化依赖。
wangliang181230 Mar 6, 2024
3a7e243
迁移 `dependencies` 中的部分依赖到 `dependencies-client` 和 `dependencies-serve…
wangliang181230 Mar 6, 2024
a50e25c
将 `/build/pom.xml` 中的配置迁移到顶层 `/pom.xml` 中,并删除 `build` 模块。
wangliang181230 Mar 6, 2024
95af31d
com.alipay.sofa:bolt 升级为1.6.7
wangliang181230 Mar 6, 2024
91940af
简化配置
wangliang181230 Mar 6, 2024
89971b0
固定 sofa.hessian 版本为4.0.4
wangliang181230 Mar 6, 2024
2278f6a
固定 sofa.hessian 版本为4.0.3
wangliang181230 Mar 6, 2024
7d43f76
优化seata-all的依赖关系,避免其继承了test相关依赖。
wangliang181230 Mar 6, 2024
36c912f
试一下新的格式。
wangliang181230 Mar 6, 2024
6fcf0b6
Revert "试一下新的格式。"
wangliang181230 Mar 6, 2024
0ce3e31
netty依赖定义优化,覆盖spring-boot-dependencies的配置。
wangliang181230 Mar 6, 2024
a348756
byte-buddy依赖,转移回dependencies中。
wangliang181230 Mar 7, 2024
bca927a
依赖优化。
wangliang181230 Mar 7, 2024
0cf7948
依赖优化。
wangliang181230 Mar 7, 2024
0252f3e
小调整
wangliang181230 Mar 7, 2024
588be1c
依赖关系调整。
wangliang181230 Mar 7, 2024
760d860
添加日志。
wangliang181230 Mar 7, 2024
48b4554
小调整
wangliang181230 Mar 7, 2024
8f97715
AbstractServerTest 日志完善。
wangliang181230 Mar 7, 2024
1b2daea
NettyServerBootstrap优化。
wangliang181230 Mar 7, 2024
0a0ca3f
暂时只测macos
wangliang181230 Mar 7, 2024
62e2948
完善配置日志。
wangliang181230 Mar 7, 2024
818c985
优化测试用例。
wangliang181230 Mar 7, 2024
85f256c
优化 NettyServerBootstrap
wangliang181230 Mar 7, 2024
9781ca3
测试用例调整。
wangliang181230 Mar 7, 2024
1a53535
测试用例优化。
wangliang181230 Mar 8, 2024
4726501
恢复部分配置;优化部分代码。
wangliang181230 Mar 8, 2024
998c753
添加更多测试用例。
wangliang181230 Mar 8, 2024
83357e6
modify 2.x.md
wangliang181230 Mar 8, 2024
5cea4cd
简化 dependencies-server
wangliang181230 Mar 8, 2024
99ecf35
解决server端的spring-boot版本号被workflow中的变量影响了的问题。
wangliang181230 Mar 8, 2024
b22d929
upgrade github actions
wangliang181230 Mar 8, 2024
dd4bcaa
upgrade github actions
wangliang181230 Mar 8, 2024
8313004
调整注释。
wangliang181230 Mar 8, 2024
bdf222b
1)client相关模块,移除logback;2)修复zkclient的一个exclusion的groupId和articleId反了的问题。
wangliang181230 Mar 8, 2024
8d56a26
移除zkclient的一个exclusion
wangliang181230 Mar 8, 2024
ce2b80e
Merge remote-tracking branch 'upstream/2.x' into test-dependency-stru…
wangliang181230 Mar 11, 2024
9604468
dependencies目录结构调整。
wangliang181230 Mar 11, 2024
d28c67d
添加dependencies-base模块,将dependencies-common中的部分配置转移到它里面。
wangliang181230 Mar 11, 2024
17be3bf
revert commons-xxx
wangliang181230 Mar 11, 2024
d5b67d1
小调整。
wangliang181230 Mar 12, 2024
f0aa62d
Merge remote-tracking branch 'upstream/2.x' into test-dependency-stru…
wangliang181230 Mar 12, 2024
8b0906e
简化mockito配置。
wangliang181230 Mar 12, 2024
96927d5
upgrade spring-boot 3.x in test.yml
wangliang181230 Mar 12, 2024
d92dd5d
Fix the version number of junit5 in test.yml
wangliang181230 Mar 12, 2024
d922a76
Fix the version number of mockito in test.yml
wangliang181230 Mar 12, 2024
e59cc3a
java21下,升级mockito的版本。
wangliang181230 Mar 13, 2024
4a2942a
java21下,升级byte-buddy的版本。
wangliang181230 Mar 13, 2024
5ba52d0
Merge remote-tracking branch 'upstream/2.x' into test-dependency-stru…
wangliang181230 Apr 1, 2024
5df0bcf
依赖版本调整。
wangliang181230 Apr 1, 2024
818822e
单测小调整。
wangliang181230 Apr 1, 2024
8261052
单测小调整。
wangliang181230 Apr 1, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 2
- name: "Set up Java JDK"
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v4.1.0
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
Expand All @@ -46,7 +46,7 @@ jobs:
# step 5
- name: "Codecov"
if: matrix.java == '8'
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.1.0

# job 2: Build on 'arm64v8/ubuntu' OS (Skip tests).
build_arm64-binary:
Expand All @@ -57,7 +57,7 @@ jobs:
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 2
- name: "Set up QEMU"
id: qemu
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: "CodeQL"

on:
push:
branches: [ 2.x, develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 2.x, develop ]
Expand All @@ -23,7 +25,7 @@ jobs:
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1

# step 2: Initializes the CodeQL tools for scanning.
- name: "Initialize CodeQL"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/license-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
shell: bash
# step 2 checkout
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 3 https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4.0.2
with:
node-version: '14.x'
# step 4 check license
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 2
- name: "Setup Java JDK"
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v4.1.0
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-ossrh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v2.4.0
uses: actions/checkout@v4.1.1
# step 2
- name: "Setup Java JDK"
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v4.1.0
with:
distribution: 'zulu'
java-version: 8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-druid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ jobs:
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 2
- name: "Set up Java JDK"
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v4.1.0
with:
distribution: 'zulu'
java-version: 8
Expand Down
53 changes: 29 additions & 24 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ jobs:
windows, # Skip tests, because too many errors in unit-test.
]
springboot: [
2.7.18 -D spring-framework.version=5.3.31,
2.6.15 -D spring-framework.version=5.3.27,
2.5.15 -D spring-framework.version=5.3.27,
2.4.13 -D spring-framework.version=5.3.13,
2.3.12.RELEASE -D spring-framework.version=5.2.15.RELEASE,
2.2.13.RELEASE -D spring-framework.version=5.2.12.RELEASE,
2.7.18,
2.6.15,
2.5.15,
2.4.13,
2.3.12.RELEASE,
2.2.13.RELEASE,
#2.1.18.RELEASE,
#2.0.9.RELEASE,
#2.0.9.RELEASE
]
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 2
- name: "Set up Java JDK"
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v4.1.0
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
Expand All @@ -45,7 +45,9 @@ jobs:
run: |
./mvnw -version;
./mvnw -T 4C clean test \
-P test-by-java${{ matrix.java }} \
-P args-for-client-test \
-P priority-spring-boot-dependencies \
-Dspring-boot.version=${{ matrix.springboot }} \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
Expand All @@ -54,7 +56,7 @@ jobs:
if: matrix.os == 'windows'
run: | # Skip tests, because too many errors in unit-test.
./mvnw.cmd -version;
./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
./mvnw.cmd clean install -DskipTests -P test-by-java${{ matrix.java }} -P args-for-client-test -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

# job 2
test-springboot3x:
Expand All @@ -70,17 +72,17 @@ jobs:
windows, # Skip tests, because too many errors in unit-test.
]
springboot: [
3.2.0 -D spring-framework.version=6.1.1,
3.1.6 -D spring-framework.version=6.0.14,
3.0.13 -D spring-framework.version=6.0.14,
3.2.3,
3.1.9,
3.0.13
]
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 2
- name: "Set up Java JDK"
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v4.1.0
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
Expand All @@ -91,7 +93,9 @@ jobs:
run: |
./mvnw -version;
./mvnw -T 4C clean install \
-P test-by-java${{ matrix.java }} \
-P args-for-client-test \
-P priority-spring-boot-dependencies \
-Dspring-boot.version=${{ matrix.springboot }} \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
Expand All @@ -100,7 +104,7 @@ jobs:
if: matrix.os == 'windows'
run: | # Skip tests, because too many errors in unit-test.
./mvnw.cmd -version;
./mvnw.cmd clean install -P args-for-client-test -DskipTests -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
./mvnw.cmd clean install -DskipTests -P test-by-java${{ matrix.java }} -P args-for-client-test -P priority-spring-boot-dependencies -D spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true -e -B -D org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

# job 3
test-arm64:
Expand All @@ -110,19 +114,19 @@ jobs:
fail-fast: false
matrix:
springboot: [
#2.7.18 -Dspring-framework.version=5.3.31, # The maven-compiler-plugin will throw an error for an unknown reason.
#2.6.15 -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason.
#2.5.15 -Dspring-framework.version=5.3.27, # The maven-compiler-plugin will throw an error for an unknown reason.
2.4.13 -Dspring-framework.version=5.3.13,
2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,
2.7.18,
2.6.15,
2.5.15,
2.4.13,
2.3.12.RELEASE,
2.2.13.RELEASE,
#2.1.18.RELEASE,
#2.0.9.RELEASE,
]
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
uses: actions/checkout@v4.1.1
# step 2
- name: "Set up QEMU"
id: qemu
Expand All @@ -136,8 +140,9 @@ jobs:
apt-get install maven -y && \
mvn -version && \
mvn -T 4C clean install \
-Dspring-boot.version=${{ matrix.springboot }} \
-Prelease-seata \
-Ppriority-spring-boot-dependencies \
-Dspring-boot.version=${{ matrix.springboot }} \
-DskipTests \
-Dmaven.git-commit-id.skip=true \
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
20 changes: 3 additions & 17 deletions all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.seata</groupId>
<artifactId>seata-build</artifactId>
<artifactId>seata-parent</artifactId>
<version>${revision}</version>
<relativePath>../build/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.seata</groupId>
<artifactId>seata-dependencies</artifactId>
<artifactId>seata-dependencies-client</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
Expand Down Expand Up @@ -381,11 +381,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
Expand Down Expand Up @@ -428,10 +423,6 @@
<artifactId>edas-sdk</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
Expand All @@ -452,11 +443,6 @@
<artifactId>hessian</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alibaba.spring</groupId>
<artifactId>spring-context-support</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.seata</groupId>
<artifactId>seata-build</artifactId>
<artifactId>seata-parent</artifactId>
<version>${revision}</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading
Loading