From 5a2efbf9cb59009d003d40316d2513c3bddbbd1b Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sun, 7 Apr 2019 18:23:53 +0800 Subject: [PATCH 1/6] update jacoco lib --- pom.xml | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index f01e1b30..f2db3607 100644 --- a/pom.xml +++ b/pom.xml @@ -96,8 +96,8 @@ true true - 1.7 - 1.7 + 1.8 + 1.<8/java_target_version> UTF-8 3.2.18.RELEASE 0.8.3 @@ -370,15 +370,42 @@ - org.codehaus.mojo - cobertura-maven-plugin - 2.7 + 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} - - html - xml - - + true + once + ${jacocoArgLine} From 0de8f4691e171436d1af683626e4e685eb9877c2 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sun, 7 Apr 2019 18:25:05 +0800 Subject: [PATCH 2/6] update jacoco lib --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2db3607..2b1c8ffe 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ true 1.8 - 1.<8/java_target_version> + 1.8 UTF-8 3.2.18.RELEASE 0.8.3 From 8c68cf833a656942a7343b23a3e3b892d0bee562 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sun, 7 Apr 2019 18:38:50 +0800 Subject: [PATCH 3/6] update jacoco lib --- pom.xml | 46 +++++++++++----------------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 2b1c8ffe..fd31535e 100644 --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,9 @@ 3.2.18.RELEASE 0.8.3 2.22.1 + -server -Xms256m -Xmx512m -Dfile.encoding=UTF-8 + -Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m + @@ -375,26 +378,20 @@ ${maven-jacoco-plugin.version} + jacoco-initialize prepare-agent - - ${project.build.directory}/coverage-reports/jacoco.exec - jacocoArgLine - report - test + report-aggregate + verify - report + report-aggregate - - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.reporting.outputDirectory}/jacoco - @@ -405,7 +402,10 @@ true once - ${jacocoArgLine} + ${argline} ${jacocoArgLine} + + + @@ -428,30 +428,6 @@ - src/main/java - src/test/java - - - src/main/resources - - **/* - - - **/.svn/ - - - - - - src/test/resources - - **/* - - - **/.svn/ - - - From 1fc880f255c14375c398cd694525f428257dd273 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sun, 7 Apr 2019 18:45:54 +0800 Subject: [PATCH 4/6] reverse jdk to 1.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fd31535e..8cff7e50 100644 --- a/pom.xml +++ b/pom.xml @@ -96,8 +96,8 @@ true true - 1.8 - 1.8 + 1.7 + 1.7 UTF-8 3.2.18.RELEASE 0.8.3 From cd007088db6dc37c17a388eb76e6e8908da15f82 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sun, 7 Apr 2019 18:52:35 +0800 Subject: [PATCH 5/6] reverse jdk to 1.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8cff7e50..fd31535e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,8 +96,8 @@ true true - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 3.2.18.RELEASE 0.8.3 From 55030476ee3d64a24ec98c542b734bcfebb25dce Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Sun, 7 Apr 2019 19:14:46 +0800 Subject: [PATCH 6/6] reverse jdk to 1.8 --- .../com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java index 23f9b8da..e70cf777 100644 --- a/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java +++ b/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java @@ -14,12 +14,14 @@ import com.alibaba.otter.canal.protocol.position.LogIdentity; import com.alibaba.otter.canal.protocol.position.LogPosition; import com.alibaba.otter.canal.protocol.position.Position; import com.alibaba.otter.canal.protocol.position.PositionRange; +import org.junit.Test; public class AbstractMetaManagerTest extends AbstractZkTest { private static final String MYSQL_ADDRESS = "127.0.0.1"; protected ClientIdentity clientIdentity = new ClientIdentity(destination, (short) 1); ; + @Test public void doSubscribeTest(CanalMetaManager metaManager) { ClientIdentity client1 = new ClientIdentity(destination, (short) 1); metaManager.subscribe(client1); @@ -39,6 +41,7 @@ public class AbstractMetaManagerTest extends AbstractZkTest { } + @Test public void doBatchTest(CanalMetaManager metaManager) { metaManager.subscribe(clientIdentity);