diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 24fb05543..a0a2867fe 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -29,5 +29,7 @@ jobs: run: mvn clean install -B -U --file pom.xml - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + with: + token: ${{ secrets.CODECOV_TOKEN }} + flags: Merge + name: Merge-Coverage diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 563b1d8fb..c3b2761d2 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -31,5 +31,7 @@ jobs: run: mvn clean install -B -U --file pom.xml - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + with: + token: ${{ secrets.CODECOV_TOKEN }} + flags: pull-request + name: PR-Coverage diff --git a/pom.xml b/pom.xml index a882eb68d..0cdf67e97 100644 --- a/pom.xml +++ b/pom.xml @@ -196,6 +196,7 @@ ${maven.surefire.version} + @{surefireArgLine} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED diff --git a/trpc-admin/trpc-admin-default/pom.xml b/trpc-admin/trpc-admin-default/pom.xml index 3a0526510..4e5948605 100644 --- a/trpc-admin/trpc-admin-default/pom.xml +++ b/trpc-admin/trpc-admin-default/pom.xml @@ -74,10 +74,5 @@ spring-test test - - org.mockito - mockito-core - test - diff --git a/trpc-configcenter/trpc-configcenter-nacos/pom.xml b/trpc-configcenter/trpc-configcenter-nacos/pom.xml index 5fdb72121..bb767e341 100644 --- a/trpc-configcenter/trpc-configcenter-nacos/pom.xml +++ b/trpc-configcenter/trpc-configcenter-nacos/pom.xml @@ -26,10 +26,5 @@ spring-test test - - org.mockito - mockito-core - test - diff --git a/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml b/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml index 02a64b312..47058dec9 100644 --- a/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml +++ b/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.tencent.trpc @@ -28,11 +28,6 @@ spring-test test - - org.mockito - mockito-core - test - \ No newline at end of file diff --git a/trpc-limiter/trpc-limiter-sentinel/pom.xml b/trpc-limiter/trpc-limiter-sentinel/pom.xml index 1a8eb4306..6baafd916 100644 --- a/trpc-limiter/trpc-limiter-sentinel/pom.xml +++ b/trpc-limiter/trpc-limiter-sentinel/pom.xml @@ -16,10 +16,6 @@ jar ${project.artifactId} - - false - - com.alibaba.csp diff --git a/trpc-registry/trpc-registry-api/pom.xml b/trpc-registry/trpc-registry-api/pom.xml index 22462d8a9..e8c8fd449 100644 --- a/trpc-registry/trpc-registry-api/pom.xml +++ b/trpc-registry/trpc-registry-api/pom.xml @@ -27,11 +27,6 @@ com.tencent.trpc trpc-core - - org.mockito - mockito-core - test - diff --git a/trpc-registry/trpc-registry-consul/pom.xml b/trpc-registry/trpc-registry-consul/pom.xml index 91c84174f..7c7f402d9 100644 --- a/trpc-registry/trpc-registry-consul/pom.xml +++ b/trpc-registry/trpc-registry-consul/pom.xml @@ -47,10 +47,5 @@ cn.hutool hutool-all - - org.mockito - mockito-core - test - diff --git a/trpc-registry/trpc-registry-nacos/pom.xml b/trpc-registry/trpc-registry-nacos/pom.xml index dc06d8009..4b49bac7d 100644 --- a/trpc-registry/trpc-registry-nacos/pom.xml +++ b/trpc-registry/trpc-registry-nacos/pom.xml @@ -47,10 +47,5 @@ com.alibaba.nacos nacos-api - - org.mockito - mockito-core - test - diff --git a/trpc-registry/trpc-registry-open-polaris/pom.xml b/trpc-registry/trpc-registry-open-polaris/pom.xml index 4a843ad18..b1c2bae60 100644 --- a/trpc-registry/trpc-registry-open-polaris/pom.xml +++ b/trpc-registry/trpc-registry-open-polaris/pom.xml @@ -15,10 +15,6 @@ jar ${project.artifactId} - - false - - com.tencent.trpc @@ -40,17 +36,5 @@ org.slf4j slf4j-simple - - - org.mockito - mockito-core - test - - - - org.mockito - mockito-junit-jupiter - test - diff --git a/trpc-selector/trpc-selector-consul/pom.xml b/trpc-selector/trpc-selector-consul/pom.xml index 93f77e528..bc77d5645 100644 --- a/trpc-selector/trpc-selector-consul/pom.xml +++ b/trpc-selector/trpc-selector-consul/pom.xml @@ -3,7 +3,17 @@ + + trpc-selector + com.tencent.trpc + 2.0.3-SNAPSHOT + + trpc-selector-consul + 4.0.0 + ${project.artifactId} + jar + trpc-core @@ -18,19 +28,4 @@ org.slf4j - - 4.0.0 - - ${project.artifactId} - jar - - - trpc-selector - com.tencent.trpc - 2.0.3-SNAPSHOT - - - - false -