You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by pu...@apache.org on 2016/12/15 18:39:58 UTC
[04/10] incubator-rya git commit: RYA-123 Merge Tool
RYA-123 Merge Tool
Added the extras project for merge tool.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/8484bbc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/8484bbc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/8484bbc6
Branch: refs/heads/master
Commit: 8484bbc6f7bd9cbf493b552b95498257028b154a
Parents: d4b2e7e
Author: isper3at <sm...@gmail.com>
Authored: Fri Jul 8 17:29:38 2016 -0400
Committer: isper3at <sm...@gmail.com>
Committed: Wed Nov 2 17:51:18 2016 -0400
----------------------------------------------------------------------
extras/pom.xml | 3 +-
extras/rya.export/pom.xml | 93 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8484bbc6/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index eb4245a..2ac129a 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -40,6 +40,7 @@ under the License.
<module>rya.reasoning</module>
<module>vagrantExample</module>
<module>rya.pcj.fluo</module>
+ <module>rya.export</module>
<module>rya.merger</module>
<module>rya.benchmark</module>
</modules>
@@ -52,4 +53,4 @@ under the License.
</modules>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/8484bbc6/extras/rya.export/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.export/pom.xml b/extras/rya.export/pom.xml
new file mode 100644
index 0000000..89f6d27
--- /dev/null
+++ b/extras/rya.export/pom.xml
@@ -0,0 +1,93 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.extras</artifactId>
+ <version>3.2.10-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>rya.export.parent</artifactId>
+
+ <name>Apache Rya Export Parent</name>
+ <description>The parent pom file for any export project.</description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ </modules>
+
+ <properties>
+ <jcommander.version>1.48</jcommander.version>
+ <hadoop.version>2.5.0</hadoop.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!--
+ note, this parent pom can likely be removed provided the contents of its
+ dependencyManagement section are transferred to org.apache.rya:rya-project
+ -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-queryrender</artifactId>
+ <version>${openrdf.sesame.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>${jcommander.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>