From 6febcf1a0f98502434b762461b2cc2fc47b8bc28 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 16:42:45 +0800 Subject: [PATCH 1/8] add test coverage and jdk11 --- .travis.yml | 2 ++ README.md | 1 + pom.xml | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 168dd989..b08b39cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: java sudo: false # faster builds jdk: + - openjdk11 + - oraclejdk11 - openjdk8 - oraclejdk8 diff --git a/README.md b/README.md index 178ac58d..fa962288 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@
[![Build Status](https://travis-ci.com/alibaba/canal.svg?branch=master)](https://travis-ci.com/alibaba/canal) +[![codecov](https://codecov.io/gh/alibaba/canal/branch/master/graph/badge.svg)](https://codecov.io/gh/alibaba/canal) ![maven](https://img.shields.io/maven-central/v/com.alibaba.otter/canal.svg) ![license](https://img.shields.io/github/license/alibaba/canal.svg) [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/alibaba/canal.svg)](http://isitmaintained.com/project/alibaba/canal "Average time to resolve an issue") diff --git a/pom.xml b/pom.xml index d7472a03..8bb9abe6 100644 --- a/pom.xml +++ b/pom.xml @@ -399,7 +399,25 @@ -Xdoclint:none - + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + + prepare-agent + + + + report + test + + report + + + + src/main/java src/test/java From 95c69bb854e0e17e1cd82d32e0efc4df8e79f2b6 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 16:45:04 +0800 Subject: [PATCH 2/8] add test coverage and jdk11 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8bb9abe6..8ad1d6d4 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,7 @@ 1.7 UTF-8 3.2.18.RELEASE + 0.8.3 @@ -402,7 +403,7 @@ org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} + ${maven_jacoco_version} From 386567a633588a040647a2fccbc8a8d0b654a1ca Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 16:56:03 +0800 Subject: [PATCH 3/8] resove Could not resolve dependencies for project com.alibaba.otter:client-adapter.hbase:jar:1.1.4-SNAPSHOT: Could not find artifact jdk.tools:jdk.tools:jar:1.7 at specified path --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 8ad1d6d4..725248b6 100644 --- a/pom.xml +++ b/pom.xml @@ -313,6 +313,13 @@ rocketmq-client 4.3.0 + + jdk.tools + jdk.tools + 1.7 + system + ${JAVA_HOME}/lib/tools.jar + From 21309cb06518b2366f011418c1547edb5c95543d Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 17:23:48 +0800 Subject: [PATCH 4/8] resove Could not resolve dependencies for project com.alibaba.otter:client-adapter.hbase:jar:1.1.4-SNAPSHOT: Could not find artifact jdk.tools:jdk.tools:jar:1.7 at specified path --- client-adapter/hbase/pom.xml | 4 ++++ pom.xml | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/client-adapter/hbase/pom.xml b/client-adapter/hbase/pom.xml index ffd0f48a..864c948d 100644 --- a/client-adapter/hbase/pom.xml +++ b/client-adapter/hbase/pom.xml @@ -26,6 +26,10 @@ org.slf4j slf4j-log4j12 + + jdk.tools + jdk.tools + diff --git a/pom.xml b/pom.xml index 725248b6..8ad1d6d4 100644 --- a/pom.xml +++ b/pom.xml @@ -313,13 +313,6 @@ rocketmq-client 4.3.0 - - jdk.tools - jdk.tools - 1.7 - system - ${JAVA_HOME}/lib/tools.jar - From 68ebb3a95768df078f100e27515a2c1b49e47894 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 17:35:16 +0800 Subject: [PATCH 5/8] update skipTests=false --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b08b39cb..6e450802 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: install: true script: - - travis_wait 30 ./mvnw clean install -DskipTests=true -Dcheckstyle.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true + - travis_wait 30 ./mvnw clean install -DskipTests=false -Dcheckstyle.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true after_success: - bash <(curl -s https://codecov.io/bash) From 2b8120b6edab3f451c79467f59e39d2851760848 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 17:49:03 +0800 Subject: [PATCH 6/8] update pom --- .travis.yml | 2 +- pom.xml | 43 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e450802..b49df195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: install: true script: - - travis_wait 30 ./mvnw clean install -DskipTests=false -Dcheckstyle.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true + - travis_wait 30 ./mvnw clean install -DskipTests=false -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/pom.xml b/pom.xml index 8ad1d6d4..7f0b77be 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,8 @@ 1.7 UTF-8 3.2.18.RELEASE - 0.8.3 + 0.8.3 + 2.22.1 @@ -368,17 +369,43 @@ + + org.jacoco + jacoco-maven-plugin + ${maven-jacoco-plugin.version} + + + + prepare-agent + + + + ${project.build.directory}/coverage-reports/jacoco.exec + + jacocoArgLine + + + + report + test + + report + + + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.reporting.outputDirectory}/jacoco + + + + org.apache.maven.plugins maven-surefire-plugin - 2.5 + ${maven-surefire.version} - - **/*Test.java - - - **/*NoRunTest.java - + true + once + ${jacocoArgLine} From e139698f6e4196bb6cd08f5b6d4be9be6062be99 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 17:50:05 +0800 Subject: [PATCH 7/8] update pom --- pom.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pom.xml b/pom.xml index 7f0b77be..d00015bf 100644 --- a/pom.xml +++ b/pom.xml @@ -427,25 +427,6 @@ -Xdoclint:none - - org.jacoco - jacoco-maven-plugin - ${maven_jacoco_version} - - - - prepare-agent - - - - report - test - - report - - - - src/main/java src/test/java From e5c7bbffbf4efce8e404519613f5453ddcf738d8 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sat, 6 Apr 2019 18:13:41 +0800 Subject: [PATCH 8/8] update pom --- pom.xml | 43 ++++++++----------------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index d00015bf..f01e1b30 100644 --- a/pom.xml +++ b/pom.xml @@ -370,42 +370,15 @@ - org.jacoco - jacoco-maven-plugin - ${maven-jacoco-plugin.version} - - - - prepare-agent - - - - ${project.build.directory}/coverage-reports/jacoco.exec - - jacocoArgLine - - - - report - test - - report - - - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.reporting.outputDirectory}/jacoco - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire.version} + org.codehaus.mojo + cobertura-maven-plugin + 2.7 - true - once - ${jacocoArgLine} + + html + xml + +