Merge branch 'master' into test/plugin

apache · Sep 30, 2019 · 1b3dcb5 · 1b3dcb5
2 parents af5a198 + 13547c6
commit 1b3dcb5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 28 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
             parallel {
                 stage('JDK 1.8 on Linux') {
                     agent {
-                        label 'xenial'
+                        label 'skywalking'
                     }
 
                     tools {
@@ -63,7 +63,7 @@ pipeline {
 
                         stage('Test & Report') {
                             steps {
-                                sh './mvnw -P"agent,backend,ui,dist,CI-with-IT" org.jacoco:jacoco-maven-plugin:0.8.3:prepare-agent clean install org.jacoco:jacoco-maven-plugin:0.8.3:report'
+                                sh './mvnw -P"agent,backend,ui,dist,CI-with-IT" -DrepoToken=${COVERALLS_REPO_TOKEN} -DpullRequest=${ghprbPullLink} clean cobertura:cobertura verify coveralls:report install'
                                 sh './mvnw javadoc:javadoc -Dmaven.test.skip=true'
                             }
                         }

diff --git a/Jenkinsfile-E2E b/Jenkinsfile-E2E
@@ -18,7 +18,7 @@
 
 pipeline {
     agent {
-        label 'xenial'
+        label 'skywalking'
     }
 
     tools {

diff --git a/docker/README.md b/docker/README.md
@@ -1,6 +1,3 @@
 This folder contains Docker files for SkyWalking developers to build images manually. If you want to start SkyWalking backend server with docker-compose for your integration, please visit https://github.com/apache/skywalking-docker repository. 
 
-You can find docker images on hub.docker.com along with user's guide if you want to start them individually. 
-
-https://hub.docker.com/r/apache/skywalking-oap-server
-https://hub.docker.com/r/apache/skywalking-ui
+You can use `Makefile` located at root folder to build docker image with current code base. The enviroment variable `HUB` and `TAG` will help you build the image with dedicated tag.
diff --git a/pom.xml b/pom.xml
@@ -204,9 +204,9 @@
         <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
-        <jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
         <jmh.version>1.21</jmh.version>
         <gmaven-plugin.version>1.5</gmaven-plugin.version>
+        <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -237,12 +237,6 @@
             <version>${jmh.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -328,6 +322,9 @@
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${maven-docker-plugin.version}</version>
+                    <configuration>
+                        <containerNamePattern>%a-%t-%i</containerNamePattern>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -479,25 +476,12 @@
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>${coveralls-maven-plugin.version}</version>
                 <configuration>
-                    <repoToken>xFwR2GqmxcMxV7tGEpW2NfwIrbCD4cQCS</repoToken>
+                    <repoToken>${COVERALLS_REPO_TOKEN}</repoToken>
                     <sourceDirectories>
                         <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                     </sourceDirectories>
                 </configuration>
             </plugin>
-            <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>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>${maven-checkstyle-plugin.version}</version>
@@ -518,6 +502,7 @@
                         **/*.xml
                     </resourceIncludes>
                     <excludes>
+                        **/target/generated-test-sources/**,
                         org/apache/skywalking/apm/network/register/v2/**/*.java,
                         org/apache/skywalking/apm/network/common/**/*.java,
                         org/apache/skywalking/apm/network/servicemesh/**/*.java,
@@ -538,6 +523,29 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>${cobertura-maven-plugin.version}</version>
+                <configuration>
+                    <check/>
+                    <aggregate>true</aggregate>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <quiet>true</quiet>
+                    <format>xml</format>
+                    <instrumentation>
+                        <ignoreTrivial>true</ignoreTrivial>
+                        <ignoreMethodAnnotations>
+                            <ignoreMethodAnnotation>lombok.Generated</ignoreMethodAnnotation>
+                        </ignoreMethodAnnotations>
+                        <excludes>
+                            <exclude>org/apache/skywalking/**/*Test.class</exclude>
+                            <exclude>org/apache/skywalking/**/Test*.class</exclude>
+                            <exclude>**/generated-sources/**</exclude>
+                        </excludes>
+                    </instrumentation>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>