You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/10/30 21:32:40 UTC
[16/50] [abbrv] usergrid git commit: Jacoco reports now built into
every module w/instructions in Coverage.md.
Jacoco reports now built into every module w/instructions in Coverage.md.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/29f5717f
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/29f5717f
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/29f5717f
Branch: refs/heads/USERGRID-872
Commit: 29f5717fcec50bdeea41b4175a31f84a7921fe7b
Parents: 0f6f052
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Oct 20 13:42:18 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Oct 20 13:42:18 2015 -0400
----------------------------------------------------------------------
stack/Coverage.md | 21 +++++
stack/corepersistence/graph/pom.xml | 106 ++++++++------------------
stack/corepersistence/pom.xml | 9 +++
stack/corepersistence/queryindex/pom.xml | 46 +++++------
stack/pom.xml | 7 --
5 files changed, 86 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/29f5717f/stack/Coverage.md
----------------------------------------------------------------------
diff --git a/stack/Coverage.md b/stack/Coverage.md
new file mode 100644
index 0000000..a2c1e47
--- /dev/null
+++ b/stack/Coverage.md
@@ -0,0 +1,21 @@
+Generating Coverage reports
+---
+
+run this command: mvn verify jacoco:report
+
+Once you do that the below coverage reports will be available.
+
+Coverage reports
+---
+
+* [./core/target/site/jacoco/index.html](file:./core/target/site/jacoco/index.html)
+* [./corepersistence/collection/target/site/jacoco/index.html](file:./corepersistence/collection/target/site/jacoco/index.html)
+* [./corepersistence/common/target/site/jacoco/index.html](file:./corepersistence/common/target/site/jacoco/index.html)
+* [./corepersistence/graph/target/site/jacoco/index.html](file:./corepersistence/graph/target/site/jacoco/index.html)
+* [./corepersistence/map/target/site/jacoco/index.html](file:./corepersistence/map/target/site/jacoco/index.html)
+* [./corepersistence/model/target/site/jacoco/index.html](file:./corepersistence/model/target/site/jacoco/index.html)
+* [./corepersistence/queryindex/target/site/jacoco/index.html](file:./corepersistence/queryindex/target/site/jacoco/index.html)
+* [./corepersistence/queue/target/site/jacoco/index.html](file:./corepersistence/queue/target/site/jacoco/index.html)
+* [./services/target/site/jacoco/index.html](file:./services/target/site/jacoco/index.html)
+* [./rest/target/site/jacoco/index.html](file:./services/target/site/jacoco/index.html)
+
http://git-wip-us.apache.org/repos/asf/usergrid/blob/29f5717f/stack/corepersistence/graph/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/pom.xml b/stack/corepersistence/graph/pom.xml
index 776380f..4a3a8a7 100644
--- a/stack/corepersistence/graph/pom.xml
+++ b/stack/corepersistence/graph/pom.xml
@@ -34,20 +34,6 @@
<name>Usergrid Graph</name>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
<dependencies>
@@ -106,64 +92,36 @@
</dependencies>
- <build>
- <plugins>
-
-<!-- <plugin>
- <groupId>org.safehaus.chop</groupId>
- <artifactId>chop-maven-plugin</artifactId>
- <version>${chop.version}</version>
-
-
- NOTE: you should be putting most of these variables into your settings.xml
- as an automatically activated profile.
-
-
- <configuration>
- <accessKey>${aws.s3.key}</accessKey>
- <secretKey>${aws.s3.secret}</secretKey>
- <availabilityZone>${availabilityZone}</availabilityZone>
- <bucketName>${aws.s3.bucket}</bucketName>
- <managerAppUsername>admin</managerAppUsername>
- <managerAppPassword>${manager.app.password}</managerAppPassword>
- <testPackageBase>org.apache.usergrid</testPackageBase>
- <runnerSSHKeyFile>${runner.ssh.key.file}</runnerSSHKeyFile>
- <failIfCommitNecessary>false</failIfCommitNecessary>
- <amiID>${ami.id}</amiID>
- <instanceType>m1.large</instanceType>
- <resultsDirectory>${resultsDirectory}</resultsDirectory>
- <dumpType>${dumpType}</dumpType>
- <coldRestartTomcat>true</coldRestartTomcat>
- <awsSecurityGroup>${security.group}</awsSecurityGroup>
- <runnerKeyPairName>${runner.keypair.name}</runnerKeyPairName>
- <runnerCount>6</runnerCount>
- <runnerName>${runner.name}</runnerName>
- <securityGroupExceptions>
-
- Add your own IP address as an exception to allow access
- but please do this in the settings.xml file .. essentially
- all parameters should be in the settings.xml file.
-
- <param>${myip.address}/32:24981</param>
- <param>${myip.address}/32:22</param>
- </securityGroupExceptions>
- </configuration>
- </plugin>-->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- We want to exclude any chop tests or stress tests. They kill the embedded cassandra and
- aren't intended to be part of the build process-->
- <excludes>
- <exclude>**/*ChopTest.java</exclude>
- <exclude>**/*LoadTest.java</exclude>
- <exclude>**/*StressTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <argLine>
+ -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec
+ </argLine>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- We want to exclude any chop tests or stress tests. They kill the embedded cassandra and
+ aren't intended to be part of the build process-->
+ <excludes>
+ <exclude>**/*ChopTest.java</exclude>
+ <exclude>**/*LoadTest.java</exclude>
+ <exclude>**/*StressTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/29f5717f/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index 09effb5..b98139c 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -75,6 +75,8 @@ limitations under the License.
<surefire.version>2.16</surefire.version>
<aws.version>1.10.6</aws.version>
<metrics.version>3.0.0</metrics.version>
+ <surefire.plugin.version>2.18.1</surefire.plugin.version>
+ <jacoco.version>0.7.5.201505241946</jacoco.version>
</properties>
@@ -129,6 +131,13 @@ limitations under the License.
</execution>
</executions>
</plugin>
+
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+
</plugins>
<resources>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/29f5717f/stack/corepersistence/queryindex/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml
index e6a26b0..e2694c4 100644
--- a/stack/corepersistence/queryindex/pom.xml
+++ b/stack/corepersistence/queryindex/pom.xml
@@ -47,33 +47,35 @@
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*IT.java</include>
- <include>**/*Test.java</include>
- </includes>
- <!-- run this one manually to stress test -->
- <excludes>
- <exclude>**/IndexLoadTestsIT.java</exclude>
- </excludes>
+ <configuration>
+ <includes>
+ <include>**/*IT.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ <!-- run this one manually to stress test -->
+ <excludes>
+ <exclude>**/IndexLoadTestsIT.java</exclude>
+ </excludes>
- </configuration>
+ </configuration>
- </plugin>
+ </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <argLine>
+ -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec
+ </argLine>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
- </configuration>
- </plugin>
+ </plugins>
</build>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/29f5717f/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index ec60200..2236e22 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1681,13 +1681,6 @@
</dependencies>
</plugin>
-<!--
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- </plugin>
--->
-
</plugins>
</build>