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: support mysql8 in release package #4745

Merged
merged 4 commits into from Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/develop.md
Expand Up @@ -28,6 +28,7 @@ Add changes here for all PR submitted to the develop branch.
- [[#4711](https://github.com/seata/seata/pull/4711)] separate lib dependencies for deployments
- [[#4720](https://github.com/seata/seata/pull/4720)] optimize pom description
- [[#4728](https://github.com/seata/seata/pull/4728)] upgrade logback dependency to 1.2.9
- [[#4745](https://github.com/seata/seata/pull/4745)] support mysql8 in release package

### test:

Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/develop.md
Expand Up @@ -27,6 +27,7 @@
- [[#4711](https://github.com/seata/seata/pull/4711)] 分离部署时 lib 依赖
- [[#4720](https://github.com/seata/seata/pull/4720)] 优化pom描述
- [[#4728](https://github.com/seata/seata/pull/4728)] 将logback版本依赖升级至1.2.9
- [[#4745](https://github.com/seata/seata/pull/4745)] 发行包中支持 mysql8 driver

### test:
- [[#4544](https://github.com/seata/seata/pull/4544)] 优化TransactionContextFilterTest中jackson包依赖问题
Expand Down
10 changes: 10 additions & 0 deletions distribution/release-seata.xml
Expand Up @@ -60,6 +60,16 @@
<directory>../server/target/lib/</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>

<fileSet>
<directory>../script/</directory>
<outputDirectory>script</outputDirectory>
<includes>
<include>**/server/</include>
<include>**/logstash/</include>
<include>**/config-center/</include>
</includes>
</fileSet>
</fileSets>

<files>
Expand Down
31 changes: 30 additions & 1 deletion server/pom.xml
Expand Up @@ -106,6 +106,7 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
<!-- if you run seata-server in IDE and use mysql8 as session store, please rewrite version to ${mysql8.jdbc.version}-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Expand Down Expand Up @@ -258,6 +259,10 @@
<profiles>
<profile>
<id>release-seata</id>
<properties>
<mysql.jdbc.version>5.1.35</mysql.jdbc.version>
<mysql8.jdbc.version>8.0.27</mysql8.jdbc.version>
</properties>
<build>
<finalName>seata-server</finalName>
<plugins>
Expand Down Expand Up @@ -302,7 +307,31 @@
<overWriteIfNewer>true</overWriteIfNewer>
<!--resolve slf4j-simple conflicts-->
<includeScope>runtime</includeScope>
<excludeGroupIds>org.apache.logging.log4j,log4j</excludeGroupIds>
<excludeGroupIds>org.apache.logging.log4j,log4j,mysql</excludeGroupIds>
</configuration>
</execution>
<execution>
<id>copy-mysql</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.jdbc.version}</version>
</artifactItem>
<artifactItem>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql8.jdbc.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>
${project.build.directory}/lib/jdbc
</outputDirectory>
</configuration>
</execution>
</executions>
Expand Down