You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/02/19 02:03:36 UTC
[incubator-skywalking] branch sql-trace-bug updated: Retry new test
plugin.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch sql-trace-bug
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/sql-trace-bug by this push:
new b9e55a0 Retry new test plugin.
b9e55a0 is described below
commit b9e55a0d08bf938ba6b22844db45e1b5470ae3cc
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Feb 19 10:03:26 2019 +0800
Retry new test plugin.
---
.travis.yml | 6 ++++--
apm-checkstyle/pom.xml | 36 +-----------------------------------
pom.xml | 24 ++++++++----------------
3 files changed, 13 insertions(+), 53 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index bd48465..355769e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ language: java
install:
- jdk_switcher use oraclejdk8
- - ./mvnw clean install --quiet jacoco:report coveralls:report
- - ./mvnw clean javadoc:javadoc -Dmaven.test.skip=true --quiet
+ - ./mvnw clean install --quiet
+ - ./mvnw javadoc:javadoc -Dmaven.test.skip=true --quiet
+after_success:
+- ./mvnw clean cobertura:cobertura coveralls:report
diff --git a/apm-checkstyle/pom.xml b/apm-checkstyle/pom.xml
index bf6ef22..9015463 100644
--- a/apm-checkstyle/pom.xml
+++ b/apm-checkstyle/pom.xml
@@ -27,41 +27,7 @@
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-checkstyle</artifactId>
- <version>6.0.0-beta</version>
+ <version>6.1.0</version>
<description>Module to hold Checkstyle for SkyWalking.</description>
- <properties>
- <jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
- <coveralls-maven-plugin.version>4.1.0</coveralls-maven-plugin.version>
- </properties>
-
- <build>
- <plugins>
- <!-- 覆盖率 -->
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eluder.coveralls</groupId>
- <artifactId>coveralls-maven-plugin</artifactId>
- <version>${coveralls-maven-plugin.version}</version>
- <configuration>
- <repoToken>xFwR2GqmxcMxV7tGEpW2NfwIrbCD4cQCS</repoToken>
- <sourceDirectories>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
- </sourceDirectories>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/pom.xml b/pom.xml
index 6886169..3f358f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<versions-maven-plugin.version>2.5</versions-maven-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
- <jacoco-maven-plugin.version>0.8.1</jacoco-maven-plugin.version>
+ <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
</properties>
@@ -390,24 +390,16 @@
</sourceDirectories>
</configuration>
</plugin>
- <!-- 覆盖率 -->
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-maven-plugin.version}</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura-maven-plugin.version}</version>
<configuration>
- <excludes>
- <exclude>*MethodAccess</exclude>
- </excludes>
+ <format>xml</format>
+ <maxmem>256m</maxmem>
+ <!-- aggregated reports for multi-module projects -->
+ <aggregate>true</aggregate>
</configuration>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>