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.

Sign up for GitHub

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

Update library to serve building GraalVM Native Image #21552

Closed
wants to merge 5 commits into from
Closed

Update library to serve building GraalVM Native Image #21552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b574f8a
Update library to serve unit testing inside GraalVM Native Image
linghengqian Oct 10, 2022
7c3e9e6
Merge branch 'master' of github.com:apache/shardingsphere into graalv…
linghengqian Oct 13, 2022
a609ff4
Update other library to serve unit testing inside GraalVM Native Image
linghengqian Oct 13, 2022
ab9abe9
Update the handling of GHA's new cache
linghengqian Oct 14, 2022
6e22b37
fix the error in EtcdRepository
linghengqian Oct 14, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Run checkstyle
run: ./mvnw checkstyle:check -T1C

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build prod with Maven
Expand All @@ -88,9 +88,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/it-scaling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
key: shardingsphere-it-cache-${{ github.sha }}
restore-keys: |
shardingsphere-maven-third-party-it-cache-
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -117,10 +116,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
restore-keys: |
shardingsphere-maven-third-party-it-cache-
shardingsphere-maven-third-party-
key: shardingsphere-it-cache-${{ github.sha }}
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/it-transaction.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-it-cache${{ github.sha }}
key: shardingsphere-it-cache-${{ github.sha }}
restore-keys: |
shardingsphere-maven-third-party-it-cache
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/it.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
key: shardingsphere-it-cache-${{ github.sha }}
restore-keys: |
shardingsphere-maven-third-party-it-cache-
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build IT image
Expand Down Expand Up @@ -109,7 +108,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
key: shardingsphere-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down Expand Up @@ -146,7 +145,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
key: shardingsphere-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down Expand Up @@ -183,7 +182,7 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-it-cache-${{ github.sha }}
key: shardingsphere-it-cache-${{ github.sha }}
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down Expand Up @@ -212,9 +211,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build Project
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/nightly-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-cache-${{ github.sha }}
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-cache-
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/nightly-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-cache-${{ github.sha }}
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-cache-
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Build prod with Maven
run: ./mvnw -T1C -B -ntp clean install
- name: Build examples with Maven
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/nightly-it-example-generator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.m2/repository
key: shardingsphere-maven-third-party-cache-${{ github.sha }}
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
shardingsphere-maven-third-party-cache-
shardingsphere-maven-third-party-
${{ runner.os }}-maven-
- name: Maven resolve ranges
run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build with Maven
Expand Down
5 changes: 5 additions & 0 deletions agent/plugins/tracing/test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions ...a/org/apache/shardingsphere/dialect/postgresql/message/ServerErrorMessageBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
package org.apache.shardingsphere.dialect.postgresql.message;

import org.apache.shardingsphere.dialect.postgresql.vendor.PostgreSQLVendorError;
import org.junit.Assert;
import org.junit.Test;
import org.postgresql.util.ServerErrorMessage;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;

public final class ServerErrorMessageBuilderTest {

@Test
public void assertToServerErrorMessage() {
ServerErrorMessage actual = ServerErrorMessageBuilder.build("FATAL", PostgreSQLVendorError.PRIVILEGE_NOT_GRANTED, "foo_user", "foo_db");
Assert.assertThat(actual.getSeverity(), is("FATAL"));
Assert.assertThat(actual.getSQLState(), is(PostgreSQLVendorError.PRIVILEGE_NOT_GRANTED.getSqlState().getValue()));
Assert.assertThat(actual.getMessage(), is("Access denied for user 'foo_user' to database 'foo_db'"));
assertThat(actual.getSeverity(), is("FATAL"));
assertThat(actual.getSQLState(), is(PostgreSQLVendorError.PRIVILEGE_NOT_GRANTED.getSqlState().getValue()));
assertThat(actual.getMessage(), is("Access denied for user 'foo_user' to database 'foo_db'"));
}
}
74 changes: 37 additions & 37 deletions distribution/proxy/src/main/release-docs/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,36 +222,36 @@ The text of each license is the standard Apache 2.0 license.
avatica-core 1.22.0: https://calcite.apache.org/avatica, Apache 2.0
avatica-metrics 1.22.0: https://calcite.apache.org/avatica, Apache 2.0
auto-service-annotations 1.0: https://github.com/google/auto/tree/master/service, Apache 2.0
caffeine 2.9.2: https://github.com/ben-manes/caffeine, Apache 2.0
caffeine 2.9.3: https://github.com/ben-manes/caffeine, Apache 2.0
calcite-core 1.32.0: https://calcite.apache.org, Apache 2.0
calcite-linq4j 1.32.0: https://calcite.apache.org, Apache 2.0
commons-codec 1.15: https://github.com/apache/commons-codec, Apache 2.0
commons-collections4 4.4: https://github.com/apache/commons-collections, Apache 2.0
commons-exec 1.3: https://github.com/apache/commons-exec, Apache 2.0
commons-io 2.11.0: https://github.com/apache/commons-io, Apache 2.0
commons-lang 2.6: https://github.com/apache/commons-lang, Apache 2.0
commons-lang3 3.8: https://github.com/apache/commons-lang, Apache 2.0
commons-lang3 3.12.0: https://github.com/apache/commons-lang, Apache 2.0
commons-logging 1.1.3: https://github.com/apache/commons-logging, Apache 2.0
curator-client 5.1.0: https://github.com/apache/curator, Apache 2.0
curator-framework 5.1.0: https://github.com/apache/curator, Apache 2.0
curator-recipes 5.1.0: https://github.com/apache/curator, Apache 2.0
curator-client 5.3.0: https://github.com/apache/curator, Apache 2.0
curator-framework 5.3.0: https://github.com/apache/curator, Apache 2.0
curator-recipes 5.3.0: https://github.com/apache/curator, Apache 2.0
cosid-core 1.14.4: https://github.com/Ahoo-Wang/CosId, Apache 2.0
error_prone_annotations 2.3.4: https://github.com/google/error-prone, Apache 2.0
failsafe 2.4.1: https://github.com/jhalterman/failsafe, Apache 2.0
failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
freemarker 2.3.31: https://freemarker.apache.org/, Apache 2.0
groovy 4.0.3: https://groovy.apache.org/, Apache 2.0
grpc-api 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-context 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-core 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-grpclb 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-netty 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-protobuf 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-protobuf-lite 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-stub 1.39.0: https://github.com/grpc/grpc-java, Apache 2.0
groovy 4.0.5: https://groovy.apache.org/, Apache 2.0
grpc-api 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-context 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-core 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-grpclb 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-netty 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-protobuf 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-protobuf-lite 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
grpc-stub 1.41.0: https://github.com/grpc/grpc-java, Apache 2.0
gson 2.9.1: https://github.com/google/gson, Apache 2.0
guava 30.0-jre: https://github.com/google/guava, Apache 2.0
HikariCP 3.4.2: https://github.com/brettwooldridge/HikariCP, Apache 2.0
HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0
httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
Expand All @@ -260,30 +260,30 @@ The text of each license is the standard Apache 2.0 license.
jackson-databind 2.10.0: http://github.com/FasterXML/jackson, Apache 2.0
jackson-dataformat-yaml 2.13.2: http://github.com/FasterXML/jackson, Apache 2.0
jcl-over-slf4j 1.7.36: https://github.com/qos-ch/slf4j, Apache 2.0
jetcd-common 0.5.10: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-core 0.5.10: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-common 0.7.3: https://github.com/etcd-io/jetcd, Apache 2.0
jetcd-core 0.7.3: https://github.com/etcd-io/jetcd, Apache 2.0
json-path 2.7.0: https://github.com/jayway/JsonPath, Apache 2.0
json-smart 2.4.7: https://www.minidev.net/, Apache 2.0
json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache 2.0
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
netty-buffer 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-codec 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-codec-dns 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-codec-http 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-codec-http2 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-codec-socks 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-common 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-handler 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-handler-proxy 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-resolver-dns 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-transport 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.80.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.80.Final-linux-x86_64: https://github.com/netty, Apache 2.0
netty-transport-native-unix-common 4.1.80.Final: https://github.com/netty, Apache 2.0
netty-buffer 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-dns 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-http 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-http2 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-socks 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-common 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-handler 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-handler-proxy 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-resolver-dns 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.84.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.84.Final-linux-x86_64: https://github.com/netty, Apache 2.0
netty-transport-native-unix-common 4.1.84.Final: https://github.com/netty, Apache 2.0
perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.0.1: https://github.com/googleapis/common-protos-java, Apache 2.0
proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
Expand All @@ -293,8 +293,8 @@ The text of each license is the standard Apache 2.0 license.
uzaygezen-core 0.2: https://code.google.com/p/uzaygezen, Apache 2.0
vertx-mysql-client 4.3.3: https://github.com/eclipse-vertx/vertx-sql-client, Apache 2.0
vertx-sql-client 4.3.3: https://github.com/eclipse-vertx/vertx-sql-client, Apache 2.0
zookeeper 3.6.0: https://github.com/apache/zookeeper, Apache 2.0
zookeeper-jute 3.6.0: https://github.com/apache/zookeeper, Apache 2.0
zookeeper 3.8.0: https://github.com/apache/zookeeper, Apache 2.0
zookeeper-jute 3.8.0: https://github.com/apache/zookeeper, Apache 2.0

========================================================================
Apache 2.0 licenses
Expand Down Expand Up @@ -344,8 +344,8 @@ EPL licenses
The following components are provided under the EPL License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.

logback-classic 1.2.10: https://github.com/qos-ch/logback, EPL 1.0
logback-core 1.2.10: https://github.com/qos-ch/logback, EPL 1.0
logback-classic 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
logback-core 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
mchange-commons-java 0.2.15: https://github.com/swaldman/mchange-commons-java, EPL 1.0
h2 2.1.214: https://github.com/h2database/h2database, EPL 1.0

Expand Down
2 changes: 1 addition & 1 deletion docs/document/content/user-manual/shardingsphere-proxy/startup/bin.cn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ShardingSphere-Proxy 支持配置多个逻辑数据源，每个以 `config-` 前

ShardingSphere-Proxy 默认集成 ZooKeeper Curator 客户端，集群模式使用 ZooKeeper 无须引入其他依赖。

如果集群模式使用 Etcd，需要将 Etcd 的客户端驱动程序 [jetcd-core 0.5.0](https://repo1.maven.org/maven2/io/etcd/jetcd-core/0.5.0/jetcd-core-0.5.0.jar) 复制至目录 `ext-lib`。
如果集群模式使用 Etcd，需要将 Etcd 的客户端驱动程序 [jetcd-core 0.5.11](https://repo1.maven.org/maven2/io/etcd/jetcd-core/0.5.11/jetcd-core-0.5.11.jar) 复制至目录 `ext-lib`。

6. （可选）引入分布式事务所需依赖

Expand Down
2 changes: 1 addition & 1 deletion docs/document/content/user-manual/shardingsphere-proxy/startup/bin.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ If the backend is connected to a MySQL database, please download [mysql-connecto

ShardingSphere-Proxy integrates the ZooKeeper Curator client by default. ZooKeeper is used in cluster mode without introducing other dependencies.

If the cluster mode uses Etcd, the client drivers of Etcd [jetcd-core 0.5.0](https://repo1.maven.org/maven2/io/etcd/jetcd-core/0.5.0/jetcd-core-0.5.0.jar) need to be copied into the `ext-lib` directory.
If the cluster mode uses Etcd, the client drivers of Etcd [jetcd-core 0.5.11](https://repo1.maven.org/maven2/io/etcd/jetcd-core/0.5.11/jetcd-core-0.5.11.jar) need to be copied into the `ext-lib` directory.

6. Introduce dependencies required by distributed transactions (Optional)

Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

<seata.version>1.4.2</seata.version>

<junit.version>4.13.2</junit.version>
<junit4.version>4.13.2</junit4.version>
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>2.7.21</mockito.version>

Expand Down Expand Up @@ -373,7 +373,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<version>${junit4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Loading