You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/06/29 17:14:46 UTC
[4/6] shiro git commit: Replaced cobertura with jacoco and added an
aggregated coverage report
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/e2a2161d
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/e2a2161d
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/e2a2161d
Branch: refs/heads/1.3.x
Commit: e2a2161d63f581858beb404e610329d77ad4cb5b
Parents: b633c97
Author: Brian Demers <bd...@stormpath.com>
Authored: Fri Jun 24 16:24:11 2016 -0700
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 28 14:39:07 2016 -0700
----------------------------------------------------------------------
all/pom.xml | 14 ++++++++++++++
pom.xml | 41 ++++++++++++++++++++++++++++++-----------
2 files changed, 44 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/e2a2161d/all/pom.xml
----------------------------------------------------------------------
diff --git a/all/pom.xml b/all/pom.xml
index f3aa3d0..0bfb5f4 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -119,6 +119,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/e2a2161d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91eff02..1929dfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,6 +344,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>
@@ -369,6 +374,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>
@@ -876,17 +894,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>
@@ -972,6 +979,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>