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:33:07 UTC
[43/50] [abbrv] usergrid git commit: Fixes to new jacoco profile.
Fixes to new jacoco profile.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b2f62a20
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b2f62a20
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b2f62a20
Branch: refs/heads/USERGRID-872
Commit: b2f62a20011df6e9b5a68ffd6356088c767dc1d1
Parents: 04f59af
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Oct 26 11:09:22 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Oct 26 11:09:22 2015 -0400
----------------------------------------------------------------------
stack/core/pom.xml | 88 ++---------------------
stack/jacoco-pom.xml | 122 ++++++++++++++++++++++++++++++++
stack/pom.xml | 159 +++---------------------------------------
stack/rest/pom.xml | 11 +--
stack/services/pom.xml | 13 ++--
stack/test-utils/pom.xml | 65 +++++++++--------
6 files changed, 185 insertions(+), 273 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2f62a20/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index 5b4ebfc..7f7dcfb 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -76,42 +76,9 @@
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <systemPropertyVariables>
- <storage-config>${basedir}/src/test/conf</storage-config>
- <target.directory>${project.build.directory}</target.directory>
- </systemPropertyVariables>
- <parallel>methods</parallel>
- <forkCount>${usergrid.it.forkCount}</forkCount>
- <threadCount>${usergrid.it.threads}</threadCount>
- <reuseForks>true</reuseForks>
- <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
- <!-- see this page for documentation on classloading issues http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
- <!--<useSystemClassLoader>false</useSystemClassLoader>-->
- <!--<useManifestOnlyJar>false</useManifestOnlyJar>-->
- <includes>
- <include>**/*IT.java</include>
- <include>**/*Test.java</include>
- </includes>
-
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>${surefire.plugin.artifactName}</artifactId>
- <version>${surefire.plugin.version}</version>
- </dependency>
- <!--<dependency>-->
- <!--<groupId>org.codehaus.plexus</groupId>-->
- <!--<artifactId>plexus-utils</artifactId>-->
- <!--<version>3.0.21</version>-->
- <!--</dependency>-->
- </dependencies>
- </plugin>
+ <!--
+ Do not need to configure surefire plugin here, parent POM configuration is sufficient.
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -132,33 +99,6 @@
</executions>
</plugin>
-
-<!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.usergrid.chop</groupId>
- <artifactId>chop-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <configuration>
- <username>${chop.coordinator.username}</username>
- <password>${chop.coordinator.password}</password>
- <endpoint>https://${chop.coordinator.url}:8443</endpoint>
- <testPackageBase>ctest</testPackageBase>
- <runnerCount>1</runnerCount>
- </configuration>
- </plugin>-->
-
</plugins>
</build>
@@ -497,24 +437,8 @@
</dependencies>
-<!--
- <profiles>
- <profile>
- <id>jacoco</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.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>
- </profile>
- </profiles>
--->
+ <!--
+ Do not need jacoco profile here because we do not override the surefire plugin in this POM
+ -->
</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2f62a20/stack/jacoco-pom.xml
----------------------------------------------------------------------
diff --git a/stack/jacoco-pom.xml b/stack/jacoco-pom.xml
new file mode 100644
index 0000000..e1f5054
--- /dev/null
+++ b/stack/jacoco-pom.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>usergrid-coverage-report</artifactId>
+ <version>1.0</version>
+ <name>Usergrid Coverage Report</name>
+ <description>Merges module coverage reports into one aggregated file</description>
+ <packaging>pom</packaging>
+
+ <properties>
+ <jacoco.version>0.7.5.201505241946</jacoco.version>
+ </properties>
+
+ <build>
+
+ <plugins>
+
+ <!-- Jacoco Ant plugin > Jacoco Maven Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- Execute an ant task within maven -->
+ <echo message="Generating JaCoCo Reports" />
+ <taskdef name="report" classname="org.jacoco.ant.ReportTask">
+ <classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
+ </taskdef>
+ <mkdir dir="${basedir}/target/coverage-report" />
+ <report>
+
+ <executiondata>
+ <fileset dir="corepersistence/collection/target">
+ <include name="jacoco.exec" />
+ </fileset>
+ <fileset dir="rest/target">
+ <include name="jacoco.exec" />
+ </fileset>
+ </executiondata>
+
+ <structure name="jacoco-multi Coverage Project">
+ <group name="jacoco-multi">
+ <classfiles>
+ <fileset dir="corepersistence/cache/target/classes" />
+ <fileset dir="corepersistence/collection/target/classes" />
+ <fileset dir="corepersistence/common/target/classes" />
+ <fileset dir="corepersistence/graph/target/classes" />
+
+ <fileset dir="corepersistence/map/target/classes" />
+ <fileset dir="corepersistence/model/target/classes" />
+ <fileset dir="corepersistence/queryindex/target/classes" />
+ <fileset dir="corepersistence/queue/target/classes" />
+
+ <fileset dir="core/target/classes" />
+ <fileset dir="services/target/classes" />
+ <fileset dir="rest/target/classes" />
+ </classfiles>
+ <sourcefiles encoding="UTF-8">
+ <fileset dir="corepersistence/cache/src" />
+ <fileset dir="corepersistence/collection/src" />
+ <fileset dir="corepersistence/common/src" />
+ <fileset dir="corepersistence/graph/src" />
+ <fileset dir="corepersistence/map/src" />
+ <fileset dir="corepersistence/model/src" />
+ <fileset dir="corepersistence/queryindex/src" />
+ <fileset dir="corepersistence/queue/src" />
+ <fileset dir="core/src" />
+ <fileset dir="services/src" />
+ <fileset dir="rest/src" />
+ </sourcefiles>
+ </group>
+
+ </structure>
+ <html destdir="${basedir}/target/coverage-report/html" />
+ <xml destfile="${basedir}/target/coverage-report/coverage-report.xml" />
+ <csv destfile="${basedir}/target/coverage-report/coverage-report.csv" />
+ </report>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+</project>
+
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2f62a20/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index b80e766..395175c 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -578,142 +578,6 @@
</exclusions>
</dependency>
- <!-- Sun and Javax Package Dependencies -->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-core</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-json</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>org.codehaus.jettison</groupId>-->
- <!--<artifactId>jettison</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.codehaus.jackson</groupId>-->
- <!--<artifactId>jackson-core-asl</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.codehaus.jackson</groupId>-->
- <!--<artifactId>jackson-mapper-asl</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.codehaus.jackson</groupId>-->
- <!--<artifactId>jackson-jaxrs</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.codehaus.jackson</groupId>-->
- <!--<artifactId>jackson-xc</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>javax.activation</groupId>-->
- <!--<artifactId>activation</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-client</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-server</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-grizzly2</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.glassfish.grizzly</groupId>-->
- <!--<artifactId>grizzly-http-servlet-server</artifactId>-->
- <!--<version>2.1.2</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.contribs</groupId>-->
- <!--<artifactId>jersey-spring</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>org.springframework</groupId>-->
- <!--<artifactId>spring-aop</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.springframework</groupId>-->
- <!--<artifactId>spring-core</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.springframework</groupId>-->
- <!--<artifactId>spring</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.springframework</groupId>-->
- <!--<artifactId>spring-beans</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.springframework</groupId>-->
- <!--<artifactId>spring-context</artifactId>-->
- <!--</exclusion>-->
-
- <!--<exclusion>-->
- <!--<groupId>org.springframework</groupId>-->
- <!--<artifactId>spring-web</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.contribs</groupId>-->
- <!--<artifactId>jersey-multipart</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.contribs.jersey-oauth</groupId>-->
- <!--<artifactId>oauth-signature</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.contribs.jersey-oauth</groupId>-->
- <!--<artifactId>oauth-server</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
- <!--<artifactId>jersey-test-framework-external</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
- <!--<artifactId>jersey-test-framework-core</artifactId>-->
- <!--<version>${jersey-version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
@@ -1436,16 +1300,14 @@
<plugins>
-
<!--
- <plugin>
- <groupId>com.structure101.java</groupId>
- <artifactId>maven-structure101-plugin</artifactId>
- <version>1.1</version>
- </plugin>
+ <plugin>
+ <groupId>com.structure101.java</groupId>
+ <artifactId>maven-structure101-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
-->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -1472,16 +1334,15 @@
<forkCount>${usergrid.it.forkCount}</forkCount>
<reuseForks>${usergrid.it.reuseForks}</reuseForks>
<threadCount>${usergrid.it.forkCount}</threadCount>
- <!-- see this page for documentation on classloading issues http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
+
+ <!-- see this page for documentation on classloading issues
+ http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
<useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
- <!--<argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>-->
- <testFailureIgnore>false</testFailureIgnore>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
<systemPropertyVariables>
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
</systemPropertyVariables>
-
</configuration>
<!-- TODO, we may need an exclusion. Appears to be a classloader bug
@@ -1544,7 +1405,7 @@
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<!-- we should increase this as our coverage increases -->
- <minimum>0.30</minimum>
+ <minimum>0.15</minimum>
</limit>
</limits>
</rule>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2f62a20/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index e56f705..d70cdd8 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -62,12 +62,14 @@
<plugins>
+ <!--
+ Need to override parent's surefire plugin here to set system properties.
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin.version}</version>
<configuration>
- <!--<skipTests>true</skipTests>-->
<systemPropertyVariables>
<storage-config>${basedir}/src/test/conf</storage-config>
<target.directory>${project.build.directory}</target.directory>
@@ -396,7 +398,9 @@
</dependencies>
-<!--
+ <!--
+ Need jacoco profile here because we override the parent's surefire plugin settings above.
+ -->
<profiles>
<profile>
<id>jacoco</id>
@@ -407,13 +411,12 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin.version}</version>
<configuration>
- <argLine>-javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.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>
+ <argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec -Dwebapp.directory=${basedir}/src/main/webapp -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties ${ug.argline}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
--->
</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2f62a20/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index e634f91..0c66ccf 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -79,11 +79,14 @@
</testResources>
<plugins>
+
+ <!--
+ Need to override parent's surefire plugin here to set system properties.
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.plugin.version}</version>
-
<configuration>
<systemPropertyVariables>
<storage-config>${basedir}/src/test/conf</storage-config>
@@ -100,8 +103,6 @@
<include>**/*IT.java</include>
<include>**/*Test.java</include>
</includes>
-
- <!-- exclude our serial tests -->
<excludes>
<exclude>**/*Scheduler*IT.java</exclude>
<exclude>**/*Notification*IT.java</exclude>
@@ -123,6 +124,7 @@
</dependencies>
</plugin>
+
</plugins>
</build>
@@ -475,7 +477,9 @@
</dependencies>
-<!--
+ <!--
+ Need jacoco profile here because we override the parent's surefire plugin settings above.
+ -->
<profiles>
<profile>
<id>jacoco</id>
@@ -493,6 +497,5 @@
</build>
</profile>
</profiles>
--->
</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2f62a20/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index 590f0e8..c104f0a 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -41,37 +41,35 @@
</testResource>
</testResources>
-
-
-
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <storage-config>${basedir}/src/test/conf</storage-config>
- <target.directory>${project.build.directory}</target.directory>
- </systemPropertyVariables>
- <parallel>classes</parallel>
- <forkCount>${usergrid.it.forkCount}</forkCount>
- <threadCount>${usergrid.it.threads}</threadCount>
- <threadCountClasses></threadCountClasses>
- <reuseForks>true</reuseForks>
- <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
-
-
- <includes>
- <include>**/CassandraResourceITSuite.java</include>
- <!-- <include>**/CassandraResourceTest.java</include>-->
- </includes>
- <excludes>
- <exclude>**/CassandraRunnerTest.java</exclude>
- <exclude>**/OtherRunnerTest.java</exclude>
- </excludes>
- </configuration>
- <version>2.18</version>
- </plugin>
+
+ <!--
+ Need to override parent's surefire plugin here to set system properties.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <storage-config>${basedir}/src/test/conf</storage-config>
+ <target.directory>${project.build.directory}</target.directory>
+ </systemPropertyVariables>
+ <parallel>classes</parallel>
+ <forkCount>${usergrid.it.forkCount}</forkCount>
+ <threadCount>${usergrid.it.threads}</threadCount>
+ <threadCountClasses></threadCountClasses>
+ <reuseForks>true</reuseForks>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
+ <includes>
+ <include>**/CassandraResourceITSuite.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/CassandraRunnerTest.java</exclude>
+ <exclude>**/OtherRunnerTest.java</exclude>
+ </excludes>
+ </configuration>
+ <version>2.18</version>
+ </plugin>
</plugins>
@@ -271,7 +269,9 @@
</dependencies>
-<!--
+ <!--
+ Need jacoco profile here because we override the parent's surefire plugin settings above.
+ -->
<profiles>
<profile>
<id>jacoco</id>
@@ -282,13 +282,12 @@
<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>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
--->
</project>