chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1670 from lovepoem/update_compile_jdk

Browse Source 
update jacoco lib
This commit is contained in:
agapple
2019-04-08 12:28:27 +08:00
committed by GitHub
parent dfab98fce1 55030476ee
commit c5736bd5f3
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java
View File

@@ -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.LogPosition;
import com.alibaba.otter.canal.protocol.position.Position; import com.alibaba.otter.canal.protocol.position.Position;
import com.alibaba.otter.canal.protocol.position.PositionRange; import com.alibaba.otter.canal.protocol.position.PositionRange;
import org.junit.Test;
public class AbstractMetaManagerTest extends AbstractZkTest { public class AbstractMetaManagerTest extends AbstractZkTest {
private static final String MYSQL_ADDRESS = "127.0.0.1"; private static final String MYSQL_ADDRESS = "127.0.0.1";
protected ClientIdentity clientIdentity = new ClientIdentity(destination, (short) 1); ; protected ClientIdentity clientIdentity = new ClientIdentity(destination, (short) 1); ;
@Test
public void doSubscribeTest(CanalMetaManager metaManager) { public void doSubscribeTest(CanalMetaManager metaManager) {
ClientIdentity client1 = new ClientIdentity(destination, (short) 1); ClientIdentity client1 = new ClientIdentity(destination, (short) 1);
metaManager.subscribe(client1); metaManager.subscribe(client1);
@@ -39,6 +41,7 @@ public class AbstractMetaManagerTest extends AbstractZkTest {
} }
@Test
public void doBatchTest(CanalMetaManager metaManager) { public void doBatchTest(CanalMetaManager metaManager) {
metaManager.subscribe(clientIdentity); metaManager.subscribe(clientIdentity);

71
pom.xml
View File

@@ -96,12 +96,15 @@
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<downloadSources>true</downloadSources> <downloadSources>true</downloadSources>
<!-- compiler settings properties --> <!-- compiler settings properties -->
<java_source_version>1.7</java_source_version> <java_source_version>1.8</java_source_version>
<java_target_version>1.7</java_target_version> <java_target_version>1.8</java_target_version>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring_version>3.2.18.RELEASE</spring_version> <spring_version>3.2.18.RELEASE</spring_version>
<maven-jacoco-plugin.version>0.8.3</maven-jacoco-plugin.version> <maven-jacoco-plugin.version>0.8.3</maven-jacoco-plugin.version>
<maven-surefire.version>2.22.1</maven-surefire.version> <maven-surefire.version>2.22.1</maven-surefire.version>
<argline>-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8
-Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m
</argline>
</properties> </properties>
<modules> <modules>
@@ -370,15 +373,39 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.jacoco</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>2.7</version> <version>${maven-jacoco-plugin.version}</version>
<executions>
<execution>
<id>jacoco-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<propertyName>jacocoArgLine</propertyName>
</configuration>
</execution>
<execution>
<id>report-aggregate</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire.version}</version>
<configuration> <configuration>
<formats> <useSystemClassLoader>true</useSystemClassLoader>
<format>html</format> <forkMode>once</forkMode>
<format>xml</format> <argLine>${argline} ${jacocoArgLine}</argLine>
</formats> <systemProperties>
<check /> <!-- common shared -->
</systemProperties>
</configuration> </configuration>
</plugin> </plugin>
<!-- javadoc --> <!-- javadoc -->
@@ -401,30 +428,6 @@
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/.svn/</exclude>
</excludes>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<includes>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/.svn/</exclude>
</excludes>
</testResource>
</testResources>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>