zhouhao 7 gadi atpakaļ
vecāks
revīzija
474ade913b
3 mainītis faili ar 14 papildinājumiem un 22 dzēšanām
  1. 3 6
      .travis.yml
  2. 2 1
      README.md
  3. 9 15
      pom.xml

+ 3 - 6
.travis.yml

@@ -1,15 +1,12 @@
 language: java
 sudo: false
 install: true
-addons:
-  sonarcloud:
-    organization: "hsweb"
-    token:
-      secure: "fba01e9fb57104fd0cfbed380e8c90301e35ff09"
 jdk:
   - oraclejdk8
 script:
-  - mvn clean jacoco:report package -Dmaven.test.failure.ignore=true sonar:sonar
+  - mvn cobertura:cobertura
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
 cache:
   directories:
     - '$HOME/.m2/repository'

+ 2 - 1
README.md

@@ -1,6 +1,7 @@
 ## hsweb  3.0
 [![Maven Central](https://img.shields.io/maven-central/v/org.hswebframework/hsweb-framework.svg?style=plastic)](http://search.maven.org/#search%7Cga%7C1%7Chswebframework)
-[![Coverage Status](https://sonarcloud.io/api/badges/measure?key=org.hswebframework.web:hsweb-framework&metric=coverage)](https://sonarcloud.io/dashboard?id=org.hswebframework.web%3Ahsweb-framework)
+[![Codecov](https://codecov.io/gh/hs-web/hsweb-framework/branch/master/graph/badge.svg)](https://codecov.io/gh/hs-web/hsweb-framework/branch/master)
+[![sonar](https://sonarcloud.io/api/badges/measure?key=org.hswebframework.web:hsweb-framework&metric=bugs)](https://sonarcloud.io/dashboard?id=org.hswebframework.web%3Ahsweb-framework)
 [![Build Status](https://travis-ci.org/hs-web/hsweb-framework.svg?branch=master)](https://travis-ci.org/hs-web/hsweb-framework)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Insight.io](https://www.insight.io/repoBadge/github.com/hs-web/hsweb-framework)](https://insight.io/github.com/hs-web/hsweb-framework)

+ 9 - 15
pom.xml

@@ -180,25 +180,19 @@
 
         <plugins>
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.9</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
                 <configuration>
-                    <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-                    <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-                    <output>file</output>
-                    <append>true</append>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format>
+                    </formats>
+                    <check />
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
 
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-plugin</artifactId>