diff --git a/.circleci/config.yml b/.circleci/config.yml index cb0469bc..136f93cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: - ~/.m2 - run: name: "Running build" - command: ./mvnw -Pspring -Pdocs clean install cobertura:cobertura -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + command: ./mvnw -Pspring -Pdocs clean install test -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - run: name: "Aggregate test results" when: always diff --git a/pom.xml b/pom.xml index 57652f34..cdcc2d3c 100644 --- a/pom.xml +++ b/pom.xml @@ -81,8 +81,7 @@ 2.8.2 2.21.0 1.6 - 2.1.1 - 2.7 + 0.7.9 @@ -166,25 +165,10 @@ pom import - - net.sourceforge.cobertura - cobertura-runtime - ${cobertura.version} - provided - pom - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.apache.maven.plugins @@ -208,30 +192,25 @@ - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura-maven-plugin.version} - - - org.ow2.asm - asm - 5.0.3 - - + org.jacoco + jacoco-maven-plugin + ${jacoco.version} - true - - html - xml - - - + target/coverage-reports/jacoco-unit.exec + target/coverage-reports/jacoco-unit.exec - package + jacoco-initialize - cobertura + prepare-agent + + + + jacoco-site + test + + report diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 9034205a..29141742 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -453,26 +453,4 @@ - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - diff --git a/spring-cloud-alibaba-docs/pom.xml b/spring-cloud-alibaba-docs/pom.xml index cb755091..87014d57 100644 --- a/spring-cloud-alibaba-docs/pom.xml +++ b/spring-cloud-alibaba-docs/pom.xml @@ -49,28 +49,5 @@ - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - diff --git a/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml b/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml index c7847d51..250a60fb 100644 --- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml +++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml @@ -23,28 +23,11 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot spring-boot-maven-plugin - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml index 2e6ddcb8..af0c708c 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml @@ -29,25 +29,4 @@ spring-boot-starter-actuator - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml index 6289c404..b66c22ff 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml @@ -25,25 +25,4 @@ spring-boot-starter-actuator - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml index 67ce3b6b..fc8f4b67 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml @@ -27,28 +27,11 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot spring-boot-maven-plugin - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml index 8d964fb7..565a732d 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml @@ -34,14 +34,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -55,15 +47,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml index aabf1ec1..6a3af32b 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml @@ -48,14 +48,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -69,15 +61,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml index 52bac0cf..60fd7050 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml @@ -33,14 +33,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -54,15 +46,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml index bea5a0b0..843f6f4c 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml @@ -20,26 +20,4 @@ nacos-discovery-consumer-example nacos-discovery-provider-example - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml index bac2b278..6af752d7 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml @@ -35,14 +35,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -56,15 +48,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml index 8a121fa8..a4bf41d2 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml @@ -33,14 +33,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -54,15 +46,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml index 9b7f638e..c2aa58ed 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml @@ -20,26 +20,4 @@ nacos-gateway-discovery-example nacos-gateway-provider-example - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - diff --git a/spring-cloud-alibaba-examples/oss-example/pom.xml b/spring-cloud-alibaba-examples/oss-example/pom.xml index 75cbfd2f..624b3e66 100644 --- a/spring-cloud-alibaba-examples/oss-example/pom.xml +++ b/spring-cloud-alibaba-examples/oss-example/pom.xml @@ -33,14 +33,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -54,15 +46,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml index 6cd8e731..31e8ca5e 100644 --- a/spring-cloud-alibaba-examples/pom.xml +++ b/spring-cloud-alibaba-examples/pom.xml @@ -40,14 +40,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.apache.maven.plugins @@ -57,16 +49,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - diff --git a/spring-cloud-alibaba-examples/rocketmq-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-example/pom.xml index 12bfbb4f..84ef5029 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/pom.xml +++ b/spring-cloud-alibaba-examples/rocketmq-example/pom.xml @@ -40,14 +40,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -61,15 +53,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml index 7cb076a9..57cb2df5 100644 --- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml +++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml @@ -27,28 +27,11 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot spring-boot-maven-plugin - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml index 25e56597..507e8498 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml @@ -51,14 +51,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -72,15 +64,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml index d594344e..5e0b8f4a 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml @@ -16,14 +16,6 @@ api for sentinel dubbo example - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.apache.maven.plugins @@ -33,15 +25,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml index f3bd3370..f10efec5 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml @@ -40,14 +40,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -61,15 +53,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml index 6aff02b3..5fde98b0 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml @@ -39,14 +39,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -60,15 +52,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml index 6874be2d..060bb532 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml @@ -35,14 +35,6 @@ - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.springframework.boot @@ -56,15 +48,6 @@ true - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - diff --git a/spring-cloud-alibaba-nacos-discovery/pom.xml b/spring-cloud-alibaba-nacos-discovery/pom.xml index 87df397d..fd2dbb80 100644 --- a/spring-cloud-alibaba-nacos-discovery/pom.xml +++ b/spring-cloud-alibaba-nacos-discovery/pom.xml @@ -82,28 +82,4 @@ - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - org/springframework/cloud/alibaba/nacos/**.*class - - - - - - - diff --git a/spring-cloud-starter-alibaba/pom.xml b/spring-cloud-starter-alibaba/pom.xml index c0de3644..d277c389 100644 --- a/spring-cloud-starter-alibaba/pom.xml +++ b/spring-cloud-starter-alibaba/pom.xml @@ -20,26 +20,4 @@ spring-cloud-starter-stream-rocketmq spring-cloud-starter-bus-rocketmq - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - \ No newline at end of file diff --git a/spring-cloud-starter-alicloud/pom.xml b/spring-cloud-starter-alicloud/pom.xml index 3684464e..df47cfbb 100644 --- a/spring-cloud-starter-alicloud/pom.xml +++ b/spring-cloud-starter-alicloud/pom.xml @@ -17,26 +17,4 @@ spring-cloud-starter-alicloud-schedulerx spring-cloud-starter-alicloud-sms - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - org.codehaus.mojo - cobertura-maven-plugin - false - - true - - - - - \ No newline at end of file