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/11/10 18:41:43 UTC
shiro git commit: tweaking jacoco settings to help report _more
accurate_ sonar data
Repository: shiro
Updated Branches:
refs/heads/master 03c676eda -> 77c59622b
tweaking jacoco settings to help report _more accurate_ sonar data
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/77c59622
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/77c59622
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/77c59622
Branch: refs/heads/master
Commit: 77c59622b0b25651f2afbb7f45d86cee0e810d6c
Parents: 03c676e
Author: Brian Demers <bd...@apache.org>
Authored: Thu Nov 10 13:41:25 2016 -0500
Committer: Brian Demers <bd...@apache.org>
Committed: Thu Nov 10 13:41:25 2016 -0500
----------------------------------------------------------------------
pom.xml | 10 +++++-----
test-coverage/pom.xml | 28 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/77c59622/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 939e78b..1162d41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,11 +308,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.7.201606060606</version>
- <configuration>
- <excludes>
- <exclude>org.apache.shiro.samples.**</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
@@ -420,6 +415,11 @@
<goals>
<goal>prepare-agent-integration</goal>
</goals>
+ <configuration>
+ <excludes>
+ <exclude>**/main/**/samples/**</exclude>
+ </excludes>
+ </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/shiro/blob/77c59622/test-coverage/pom.xml
----------------------------------------------------------------------
diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
index 6c54a8b..460f305 100644
--- a/test-coverage/pom.xml
+++ b/test-coverage/pom.xml
@@ -117,6 +117,34 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jacoco-it-merge</id>
+ <goals>
+ <goal>merge</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/jacoco-it.exec</destFile>
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <includes>
+ <include>**/target/jacoco-it.exec</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>