Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/05d8a0ad Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05d8a0ad Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/05d8a0ad Branch: refs/heads/master Commit: 05d8a0ad0514126bc2c4c857875585abd9b3aeb5 Parents: fdc2238 9af4cce Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Jun 19 09:11:00 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Jun 19 09:11:00 2017 -0400 ---------------------------------------------------------------------- giraph-gremlin/pom.xml | 3 +- gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +- .../gremlin-archetype-server/pom.xml | 2 +- .../gremlin-archetype-tinkergraph/pom.xml | 2 +- gremlin-archetype/pom.xml | 3 +- gremlin-console/pom.xml | 2 +- gremlin-driver/pom.xml | 2 +- gremlin-server/pom.xml | 2 +- gremlin-shaded/pom.xml | 1 - gremlin-tools/gremlin-benchmark/pom.xml | 1 - hadoop-gremlin/pom.xml | 3 +- neo4j-gremlin/pom.xml | 1 - pom.xml | 45 ++++++++++++++------ spark-gremlin/pom.xml | 3 +- tinkergraph-gremlin/pom.xml | 1 - 15 files changed, 43 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/giraph-gremlin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-archetype/gremlin-archetype-dsl/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-archetype/gremlin-archetype-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-archetype/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-console/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-driver/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-shaded/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/gremlin-tools/gremlin-benchmark/pom.xml ---------------------------------------------------------------------- diff --cc gremlin-tools/gremlin-benchmark/pom.xml index 142a662,0000000..41c7d69 mode 100644,000000..100644 --- a/gremlin-tools/gremlin-benchmark/pom.xml +++ b/gremlin-tools/gremlin-benchmark/pom.xml @@@ -1,138 -1,0 +1,137 @@@ +<!-- +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> + <parent> + <artifactId>gremlin-tools</artifactId> + <groupId>org.apache.tinkerpop</groupId> + <version>3.3.0-SNAPSHOT</version> + </parent> + + <artifactId>gremlin-benchmark</artifactId> + <name>Apache TinkerPop :: Gremlin Benchmark</name> + <properties> + <jmh.version>1.11.3</jmh.version> + <!-- Skip benchmarks by default because they are time consuming. --> + <skipBenchmarks>true</skipBenchmarks> + <skipTests>${skipBenchmarks}</skipTests> + </properties> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.tinkerpop</groupId> + <artifactId>gremlin-core</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>tinkergraph-gremlin</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-core</artifactId> + <version>${jmh.version}</version> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-generator-annprocess</artifactId> + <version>${jmh.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <optional>true</optional> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory> + <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory> + <includes> + <include>**/*Benchmark*.java</include> + </includes> + <excludes> + <exclude>**/*$*.class</exclude> + <exclude>**/Abstract*</exclude> + <exclude>**/*_jmhType*</exclude> + </excludes> + <systemPropertyVariables> + <benchmarkReportDir>${project.build.directory}/reports/benchmark/</benchmarkReportDir> + <jvmArgs>-server -Xms2g -Xmx2g</jvmArgs> + <warmupIterations>10</warmupIterations> + <measureIterations>10</measureIterations> + <forks>2</forks> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> - <version>2.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.openjdk.jmh.Main</mainClass> + </transformer> + </transformers> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + </excludes> + </filter> + </filters> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/hadoop-gremlin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/neo4j-gremlin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index a8f29fa,7b9c57a..03ee395 --- a/pom.xml +++ b/pom.xml @@@ -432,9 -353,10 +435,9 @@@ limitations under the License <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> + <version>2.20</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> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/spark-gremlin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05d8a0ad/tinkergraph-gremlin/pom.xml ----------------------------------------------------------------------
