TINKERPOP-1878 sparql-gremlin is now building Fixed some basic pom.xml issues and resolved dependency conflicts.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a80cad70 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a80cad70 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a80cad70 Branch: refs/heads/TINKERPOP-1878 Commit: a80cad704888e2e6e771853092bb8c9b3d8d29b0 Parents: 8651c99 Author: Stephen Mallette <[email protected]> Authored: Wed Jan 24 15:23:57 2018 -0500 Committer: Stephen Mallette <[email protected]> Committed: Fri Jan 26 08:15:48 2018 -0500 ---------------------------------------------------------------------- gremlin-console/pom.xml | 1 - gremlin-server/pom.xml | 1 - pom.xml | 18 +++++++++++++++ sparql-gremlin/pom.xml | 52 ++++++++++++++++++-------------------------- 4 files changed, 39 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a80cad70/gremlin-console/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml index 365fc90..1209cfe 100644 --- a/gremlin-console/pom.xml +++ b/gremlin-console/pom.xml @@ -39,7 +39,6 @@ limitations under the License. <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.1</version> </dependency> <dependency> <groupId>commons-cli</groupId> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a80cad70/gremlin-server/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml index 5f8fff3..cbd3c10 100644 --- a/gremlin-server/pom.xml +++ b/gremlin-server/pom.xml @@ -92,7 +92,6 @@ limitations under the License. <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.3.5</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a80cad70/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aafa895..fa59bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,18 @@ limitations under the License. <email>[email protected]</email> <url>https://github.com/twilmes</url> </contributor> + <contributor> + <name>Harsh Thakkar</name> + <email>[email protected]</email> + <organization>University of Bonn</organization> + <organizationUrl>http://harshthakkar.in</organizationUrl> + </contributor> + <contributor> + <name>Dharmen Punjani</name> + <email>[email protected]</email> + <organization>National and Kapodistrian University of Athens</organization> + <organizationUrl>http://wdaqua.eu/students/dharmen-punjani</organizationUrl> + </contributor> </contributors> <prerequisites> <maven>3.0.5</maven> @@ -125,6 +137,7 @@ limitations under the License. <module>spark-gremlin</module> <module>giraph-gremlin</module> <module>neo4j-gremlin</module> + <module>sparql-gremlin</module> <module>gremlin-driver</module> <module>gremlin-console</module> <module>gremlin-server</module> @@ -643,6 +656,11 @@ limitations under the License. </exclusions> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.1</version> + </dependency> + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.1</version> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a80cad70/sparql-gremlin/pom.xml ---------------------------------------------------------------------- diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml index e134d31..d38a85d 100644 --- a/sparql-gremlin/pom.xml +++ b/sparql-gremlin/pom.xml @@ -2,55 +2,46 @@ <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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>tinkerpop</artifactId> <groupId>org.apache.tinkerpop</groupId> <version>3.3.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>sparql-gremlin</artifactId> - <organization> - <name>WDAQUA-ITN</name> - <url>http://wdaqua.eu</url> - </organization> - <developers> - <developer> - <name>Harsh Thakkar</name> - <email>[email protected]</email> - <organization>University of Bonn</organization> - <organizationUrl>http://harshthakkar.in</organizationUrl> - </developer> - <developer> - <name>Dharmen Punjani</name> - <email>[email protected]</email> - <organization>National and Kapodistrian University of Athens</organization> - <organizationUrl>http://wdaqua.eu/students/dharmen-punjani</organizationUrl> - </developer> - </developers> + <name>Apache TinkerPop :: SPARQL Gremlin</name> <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jena.version>3.0.0</jena.version> <query.dir>src/test/resources/sparql/queries</query.dir> </properties> <dependencies> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>apache-jena-libs</artifactId> - <type>pom</type> - <version>${jena.version}</version> - </dependency> + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>apache-jena-libs</artifactId> + <type>pom</type> + <version>3.0.0</version> + <exclusions> + <!-- self-conflict --> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> <dependency> <groupId>org.apache.tinkerpop</groupId> <artifactId>gremlin-core</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.tinkerpop</groupId> <artifactId>tinkergraph-gremlin</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.tinkerpop</groupId> @@ -59,5 +50,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> \ No newline at end of file
