Skip to content

Commit

Permalink
完善 dependencies 的定义，迁移部分定义到 client 和 server 中，明确依赖的作用范围。
Browse files Browse the repository at this point in the history
  • Loading branch information
@wangliang181230
wangliang181230 committed Mar 6, 2024
1 parent 6a2269a commit 36c3051
Show file tree
Hide file tree
Showing 11 changed files with 182 additions and 411 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ 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
Expand Down Expand Up @@ -70,9 +70,9 @@ 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.0,
3.1.6,
3.0.13
]
steps:
# step 1
Expand Down Expand Up @@ -110,14 +110,14 @@ 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, # The maven-compiler-plugin will throw an error for an unknown reason.
#2.6.15, # The maven-compiler-plugin will throw an error for an unknown reason.
#2.5.15, # The maven-compiler-plugin will throw an error for an unknown reason.
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
Expand Down
9 changes: 0 additions & 9 deletions build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- The version of spring-boot for 'spring-boot-dependencies' and 'spring-boot-maven-plugin' -->
<spring-boot.version>2.5.15</spring-boot.version>
<spring-framework.version>5.3.27</spring-framework.version>

<!-- server side dependency-->
<kafka-appender.version>0.2.0-RC2</kafka-appender.version>
<kafka-clients.version>3.6.1</kafka-clients.version>
<snakeyaml.version>2.0</snakeyaml.version>

<!-- For test -->
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<junit-platform.version>1.8.2</junit-platform.version>
Expand Down
2 changes: 1 addition & 1 deletion compatible/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<artifactId>spring-expression</artifactId>
</exclusion>
</exclusions>
<version>5.3.26</version>
<version>5.3.27</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
73 changes: 0 additions & 73 deletions console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,60 +32,6 @@
<name>seata-console ${project.version}</name>
<description>console for Seata built with Maven</description>

<properties>
<spring-boot-for-server.version>2.7.17</spring-boot-for-server.version>
<spring-framework-for-server.version>5.3.30</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
<tomcat-embed.version>9.0.83</tomcat-embed.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- junit5 -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit-jupiter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- spring-framework-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring-framework-for-server.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- spring-boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot-for-server.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
</exclusion>
</exclusions>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml-for-server.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat-embed.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -100,21 +46,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -142,10 +73,6 @@
<artifactId>jjwt-jackson</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>
Expand Down
10 changes: 10 additions & 0 deletions dependencies-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,18 @@
<description>dependencies for Seata client built with Maven</description>

<properties>
<!-- rocketmq -->
<rocketmq-version>5.0.0</rocketmq-version>
</properties>

<dependencyManagement>
<dependencies>
<!-- rocketmq -->
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-client</artifactId>
<version>${rocketmq-version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
49 changes: 47 additions & 2 deletions dependencies-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,56 @@
<description>dependencies for Seata server and console built with Maven</description>

<properties>
<spring-boot.version>2.7.18</spring-boot.version>

<!-- mysql -->
<mysql.jdbc.version>5.1.42</mysql.jdbc.version>
<mysql8.jdbc.version>8.0.27</mysql8.jdbc.version>

<!-- kafka for logback/kafka-appender.xml -->
<kafka-appender.version>0.2.0-RC2</kafka-appender.version>
<kafka-clients.version>3.6.1</kafka-clients.version>

<jcommander.version>1.82</jcommander.version>

<!-- # for test -->
<janino-version>3.1.7</janino-version>
</properties>

<dependencyManagement>
<dependencies>
<!-- # logback appenders -->
<!-- ## for kafka-appender -->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${kafka-clients.version}</version>
</dependency>
<dependency>
<groupId>com.github.danielwegener</groupId>
<artifactId>logback-kafka-appender</artifactId>
<version>${kafka-appender.version}</version>
</dependency>
<!-- ## for logstash-appender -->
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash-logback-encoder.version}</version>
</dependency>

<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>${jcommander.version}</version>
</dependency>

<!-- # for test -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>${janino-version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<profiles>
Expand All @@ -47,8 +94,6 @@
<properties>
<image.publish.skip>false</image.publish.skip>
<dependencies.copy.skip>false</dependencies.copy.skip>
<mysql.jdbc.version>5.1.42</mysql.jdbc.version>
<mysql8.jdbc.version>8.0.27</mysql8.jdbc.version>
</properties>
</profile>
<!-- profile: release-image-based-on-java8 -->
Expand Down
Loading

0 comments on commit 36c3051

Please sign in to comment.