shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject [1/3] shiro git commit: Replaced cobertura with jacoco and added an aggregated coverage report
Date Thu, 07 Jul 2016 20:31:46 GMT
Repository: shiro
Updated Branches:
  refs/heads/master 00beeef0f -> 5b59da340


Replaced cobertura with jacoco and added an aggregated coverage report


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/791867fb
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/791867fb
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/791867fb

Branch: refs/heads/master
Commit: 791867fb39f1b3ba9673cef2dc85ed4bf9615e44
Parents: 00beeef
Author: Brian Demers <bdemers@stormpath.com>
Authored: Fri Jun 24 16:24:11 2016 -0700
Committer: Brian Demers <bdemers@apache.org>
Committed: Thu Jul 7 15:09:25 2016 -0400

----------------------------------------------------------------------
 all/pom.xml | 14 ++++++++++++++
 pom.xml     | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro/blob/791867fb/all/pom.xml
----------------------------------------------------------------------
diff --git a/all/pom.xml b/all/pom.xml
index 98df96b..e555355 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -135,6 +135,20 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <!-- Ideally we want to override the parent here, so the normal report
is not generated
+                         For configuration, we would add the 'combine.self="override"' attribute.
-->
+                    <reportSets>
+                        <reportSet>
+                            <id>javadoc-aggregate</id>
+                            <reports>
+                                <report>report-aggregate</report>
+                            </reports>
+                        </reportSet>
+                    </reportSets>
+                </plugin>
         </plugins>
     </reporting>
 </project>

http://git-wip-us.apache.org/repos/asf/shiro/blob/791867fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index adb8fbd..a1a689d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,6 +380,11 @@
                     <artifactId>dependency-maven-plugin</artifactId>
                     <version>1.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.7.7.201606060606</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -405,6 +410,19 @@
                     <printSummary>true</printSummary>
                 </configuration>
             </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <phase>process-test-classes</phase>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             <!-- Allow Groovy tests to run: -->
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
@@ -1001,17 +1019,6 @@
                 </reportSets>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <formats>
-                        <format>xml</format>
-                        <format>html</format>
-                    </formats>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>2.1</version>
                 <configuration>
@@ -1099,6 +1106,18 @@
                 <artifactId>dashboard-maven-plugin</artifactId>
                 <version>1.0.0-beta-1</version>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <id>javadoc-aggregate</id>
+                        <reports>
+                            <report>report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
         </plugins>
     </reporting>
 


Mime
View raw message