You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/10/07 22:23:06 UTC
tinkerpop git commit: Jacoco and surefire reporting working
Repository: tinkerpop
Updated Branches:
refs/heads/jacoco [created] 822705957
Jacoco and surefire reporting working
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/82270595
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/82270595
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/82270595
Branch: refs/heads/jacoco
Commit: 8227059573761eb9f7891a6b46cd2b481cc4d903
Parents: a829e9d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Oct 7 18:22:33 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Oct 7 18:22:33 2016 -0400
----------------------------------------------------------------------
gremlin-benchmark/pom.xml | 77 +++++++++++++++++++++
gremlin-test/pom.xml | 27 ++++++++
pom.xml | 154 ++++++++++++++++++++++++++++-------------
3 files changed, 211 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/82270595/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml
index 536f6d6..1e8f31c 100644
--- a/gremlin-benchmark/pom.xml
+++ b/gremlin-benchmark/pom.xml
@@ -41,16 +41,46 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-console</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-driver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-python</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>neo4j-gremlin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<version>${project.version}</version>
</dependency>
@@ -131,4 +161,51 @@ limitations under the License.
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>coverage</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jacoco-report-aggregate</id>
+ <phase>install</phase>
+ <goals>
+ <goal>report-aggregate</goal>
+ </goals>
+ <configuration>
+ <title>Apache TinkerPop</title>
+ <footer>Code Coverage Report for Apache TinkerPop ${project.version}</footer>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ <excludes>
+ <exclude>Lib/*.class</exclude>
+ <exclude>Lib/aenum/**</exclude>
+ <exclude>Lib/backports/**</exclude>
+ <exclude>Lib/certifi/**</exclude>
+ <exclude>Lib/setuptools/**</exclude>
+ <exclude>Lib/setuptools.command/**</exclude>
+ <exclude>Lib/tornado/**</exclude>
+ <exclude>Lib/tornado.platform/**</exclude>
+ <exclude>Lib/tornado.test/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/82270595/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index e2c5ee7..1e69051 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -90,4 +90,31 @@ limitations under the License.
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>coverage</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true
+ </argLine>
+ <excludes>
+ <exclude>TraversalInterruptionTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/82270595/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 632ed60..070e48d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,14 @@ limitations under the License.
</dependency>
</dependencies>
</plugin>
+ <!-- we never use this plugin - disabling helps with speeding up other processing like when using -Dcoverage -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -337,8 +345,7 @@ limitations under the License.
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
- <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory}
- -Dis.testing=true
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true
</argLine>
<excludes>
<exclude>**/*IntegrateTest.java</exclude>
@@ -459,51 +466,6 @@ limitations under the License.
</pluginManagement>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin.version}</version>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- <reportSets>
- <reportSet>
- <id>non-aggregate</id>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- <includeDependencySources>true</includeDependencySources>
- <dependencySourceIncludes>
- <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
- </dependencySourceIncludes>
- <overview>${basedir}/docs/javadoc/overview.html</overview>
- <quiet>true</quiet>
- </configuration>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>aggregate</id>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- <includeDependencySources>true</includeDependencySources>
- <dependencySourceIncludes>
- <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
- </dependencySourceIncludes>
- <overview>${basedir}/docs/javadoc/overview.html</overview>
- <quiet>true</quiet>
- </configuration>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -663,6 +625,11 @@ limitations under the License.
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.4.201502262128</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -1200,5 +1167,98 @@ limitations under the License.
</build>
</profile>
+ <profile>
+ <id>coverage</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>coverage</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>target/jacoco.exec</destFile>
+ <append>true</append>
+ <propertyName>surefireArgLine</propertyName>
+ <excludes>
+ <exclude>Lib/*.class</exclude>
+ <exclude>Lib/aenum/**</exclude>
+ <exclude>Lib/backports/**</exclude>
+ <exclude>Lib/certifi/**</exclude>
+ <exclude>Lib/setuptools/**</exclude>
+ <exclude>Lib/setuptools.command/**</exclude>
+ <exclude>Lib/tornado/**</exclude>
+ <exclude>Lib/tornado.platform/**</exclude>
+ <exclude>Lib/tornado.test/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>prepare-it-agent</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${session.executionRootDirectory}/target/jacoco-it.exec</destFile>
+ <append>true</append>
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true ${surefireArgLine}
+ </argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182
+ -Djub.consumers=CONSOLE,H2 -Djub.db.file=target/performance/h2/benchmarks
+ -Djub.charts.dir=target/performance/charts -Djub.customkey=${project.parent.version}
+ -Dbuild.dir=${project.build.directory} -Dis.testing=true ${failsafeArgLine}
+ </argLine>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.19.1</version>
+ <executions>
+ <execution>
+ <id>aggregate-surefire-report</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <phase>install</phase>
+ <configuration>
+ <aggregate>true</aggregate>
+ <alwaysGenerateSurefireReport>true</alwaysGenerateSurefireReport>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
</profiles>
</project>