You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by ca...@apache.org on 2017/08/16 22:47:47 UTC
incubator-rya git commit: RYA-340 Added dependency filtering to
rya.pcj.fluo.app for deployments. Closes #207.
Repository: incubator-rya
Updated Branches:
refs/heads/master 2f6052692 -> 30475023d
RYA-340 Added dependency filtering to rya.pcj.fluo.app for deployments. Closes #207.
- Also improved scoping of dependencies and dependencyManagement.
- Updated integration tests to use -Djava.net.preferIPv4Stack=true.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/30475023
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/30475023
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/30475023
Branch: refs/heads/master
Commit: 30475023dcf75b6c2d2df26172af2aca22376b98
Parents: 2f60526
Author: jdasch <jd...@localhost.localdomain>
Authored: Mon Aug 14 16:18:42 2017 -0400
Committer: Caleb Meier <ca...@parsons.com>
Committed: Wed Aug 16 15:46:44 2017 -0700
----------------------------------------------------------------------
dao/accumulo.rya/pom.xml | 5 +-
extras/indexing/pom.xml | 6 +-
extras/rya.geoindexing/pom.xml | 5 +-
extras/rya.indexing.pcj/pom.xml | 3 +-
extras/rya.pcj.fluo/pcj.fluo.app/pom.xml | 179 ++++++++-----------
.../pcj.fluo.app/src/main/assembly/fluo-app.xml | 52 ++++++
.../pcj/fluo/app/util/FluoClientFactory.java | 8 +-
.../rya.pcj.fluo/pcj.fluo.integration/pom.xml | 1 -
extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml | 16 +-
.../periodic.service.integration.tests/pom.xml | 15 --
extras/shell/pom.xml | 2 +-
pom.xml | 30 ++++
12 files changed, 180 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/dao/accumulo.rya/pom.xml
----------------------------------------------------------------------
diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml
index 623d38e..be062e9 100644
--- a/dao/accumulo.rya/pom.xml
+++ b/dao/accumulo.rya/pom.xml
@@ -55,12 +55,12 @@ under the License.
<artifactId>sesame-queryalgebra-evaluation</artifactId>
</dependency>
+ <!-- testing dependencies -->
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-trig</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -70,11 +70,12 @@ under the License.
<groupId>org.apache.mrunit</groupId>
<artifactId>mrunit</artifactId>
<classifier>hadoop2</classifier>
- <version>1.1.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/indexing/pom.xml b/extras/indexing/pom.xml
index 44e3e41..7961b9f 100644
--- a/extras/indexing/pom.xml
+++ b/extras/indexing/pom.xml
@@ -112,16 +112,14 @@
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>accumulo.rya</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>mongodb.rya</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.geoindexing/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/pom.xml b/extras/rya.geoindexing/pom.xml
index 9d74fc9..a2127aa 100644
--- a/extras/rya.geoindexing/pom.xml
+++ b/extras/rya.geoindexing/pom.xml
@@ -109,15 +109,14 @@
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>accumulo.rya</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>mongodb.rya</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools.xsd</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.indexing.pcj/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.indexing.pcj/pom.xml b/extras/rya.indexing.pcj/pom.xml
index 82eff4a..bd6e179 100644
--- a/extras/rya.indexing.pcj/pom.xml
+++ b/extras/rya.indexing.pcj/pom.xml
@@ -73,7 +73,6 @@ under the License.
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
- <version>${accumulo.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -84,8 +83,8 @@ under the License.
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>accumulo.rya</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
index b151c0e..0a03876 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/pom.xml
@@ -1,28 +1,38 @@
<?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. -->
+<!--
+
+ 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">
+ 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.pcj.fluo.parent</artifactId>
- <version>3.2.11-incubating-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.pcj.fluo.parent</artifactId>
+ <version>3.2.11-incubating-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>rya.pcj.fluo.app</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>rya.pcj.fluo.app</artifactId>
- <name>Apache Rya PCJ Fluo App</name>
- <description>
+ <name>Apache Rya PCJ Fluo App</name>
+ <description>
A Fluo implementation of Rya Precomputed Join Indexing. This module produces
a jar that may be executed by the 'fluo' command line tool as a YARN job.
</description>
@@ -30,88 +40,51 @@
<kryo.version>3.0.3</kryo.version>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <!-- Uncommment this block when rya.pcj.fluo.app becomes a leaf project. RYA-341 -->
+ <!-- <version>13.0</version> Overriding Rya's Guava version to be compatible with Fluo's required version. Alternative is relocation with shade. -->
+ </dependency>
+
<!-- Rya Runtime Dependencies. -->
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>rya.indexing.pcj</artifactId>
<exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
-
+
<!-- 3rd Party Runtime Dependencies. -->
<dependency>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.fluo</groupId>
- <artifactId>fluo-core</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.fluo</groupId>
- <artifactId>fluo-recipes-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.fluo</groupId>
- <artifactId>fluo-recipes-accumulo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-queryrender</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>0.10.1.0</version>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-queryrender</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.11</artifactId>
- <version>0.10.1.0</version>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
+ <artifactId>kafka-clients</artifactId>
</dependency>
+
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
<version>${kryo.version}</version>
</dependency>
-
- <!-- Testing dependencies. -->
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>0.10.1.0</version>
- <classifier>test</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.11</artifactId>
- <version>0.10.1.0</version>
- <classifier>test</classifier>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
+
<!-- Testing dependencies. -->
<dependency>
<groupId>junit</groupId>
@@ -120,29 +93,25 @@
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <!-- Use the pre-build 'jar-with-dependencies' assembly to package the
- dependent class files into the final jar. This creates a jar file that can
- be deployed to Fluo without having to include any dependent jars. -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fluo-app</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/fluo-app.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.pcj.fluo/pcj.fluo.app/src/main/assembly/fluo-app.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/assembly/fluo-app.xml b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/assembly/fluo-app.xml
new file mode 100644
index 0000000..19ade6e
--- /dev/null
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/assembly/fluo-app.xml
@@ -0,0 +1,52 @@
+<!--
+
+ 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.
+
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+ <!-- This jar is similar to jar-with-dependencies, but excludes dependencies
+ that are provided by the fluo runtime. Typically this problem is something
+ that would be handled by properly scoping this project's dependencies as
+ provided, however that then causes problems with rya projects dependent on
+ this project. RYA-341 should eliminate the need for this assembly descriptor -->
+ <id>fluo-app</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <excludes>
+ <!-- All of these dependencies are provided by the Fluo runtime -->
+ <exclude>org.apache.hadoop:hadoop-common</exclude>
+ <exclude>org.apache.accumulo:accumulo-core</exclude>
+ <exclude>org.apache.zookeeper:zookeeper</exclude>
+ <exclude>org.apache.fluo:fluo-api</exclude>
+ <exclude>com.google.guava:guava</exclude> <!-- Use Fluo's provided Guava v13.0 -->
+ </excludes>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FluoClientFactory.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FluoClientFactory.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FluoClientFactory.java
index 9446c87..9cf76f5 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FluoClientFactory.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/util/FluoClientFactory.java
@@ -21,8 +21,8 @@ package org.apache.rya.indexing.pcj.fluo.app.util;
import java.util.Optional;
import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
import org.apache.fluo.api.config.FluoConfiguration;
-import org.apache.fluo.core.client.FluoClientImpl;
import org.apache.rya.accumulo.AccumuloRdfConfiguration;
/**
@@ -38,8 +38,8 @@ public class FluoClientFactory {
* @param conf - AccumuloConfiguration (must contain Accumulo User, Accumulo Instance, Accumulo Password, and Accumulo Zookeepers)
* @return FluoClient for connecting to Fluo
*/
- public static FluoClient getFluoClient(String appName, Optional<String> tableName, AccumuloRdfConfiguration conf) {
- FluoConfiguration fluoConfig = new FluoConfiguration();
+ public static FluoClient getFluoClient(final String appName, final Optional<String> tableName, final AccumuloRdfConfiguration conf) {
+ final FluoConfiguration fluoConfig = new FluoConfiguration();
fluoConfig.setAccumuloInstance(conf.getAccumuloInstance());
fluoConfig.setAccumuloUser(conf.getAccumuloUser());
fluoConfig.setAccumuloPassword(conf.getAccumuloPassword());
@@ -51,6 +51,6 @@ public class FluoClientFactory {
} else {
fluoConfig.setAccumuloTable(appName);
}
- return new FluoClientImpl(fluoConfig);
+ return FluoFactory.newClient(fluoConfig);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
index 9591e55..ddf6822 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.test.base</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.fluo</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml b/extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml
index 2df81ff..27a71b7 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml
+++ b/extras/rya.pcj.fluo/pcj.fluo.test.base/pom.xml
@@ -53,7 +53,12 @@ under the License.
<artifactId>fluo-api</artifactId>
</dependency>
- <!-- Testing dependencies. -->
+ <!-- Testing dependencies. (should be compile scope for this project) -->
+ <dependency>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>accumulo.rya</artifactId>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
@@ -67,12 +72,15 @@ under the License.
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>0.10.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <classifier>test</classifier>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.11</artifactId>
- <version>0.10.1.0</version>
<exclusions>
<exclusion>
<artifactId>slf4j-log4j12</artifactId>
@@ -80,11 +88,9 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <!-- Testing dependencies. -->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.11</artifactId>
- <version>0.10.1.0</version>
<classifier>test</classifier>
<scope>compile</scope>
<exclusions>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/rya.periodic.service/periodic.service.integration.tests/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.periodic.service/periodic.service.integration.tests/pom.xml b/extras/rya.periodic.service/periodic.service.integration.tests/pom.xml
index bcd60aa..1b784a6 100644
--- a/extras/rya.periodic.service/periodic.service.integration.tests/pom.xml
+++ b/extras/rya.periodic.service/periodic.service.integration.tests/pom.xml
@@ -27,7 +27,6 @@
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.test.base</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j-1.2-api</artifactId>
@@ -60,18 +59,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/extras/shell/pom.xml
----------------------------------------------------------------------
diff --git a/extras/shell/pom.xml b/extras/shell/pom.xml
index 37a5503..0f95649 100644
--- a/extras/shell/pom.xml
+++ b/extras/shell/pom.xml
@@ -96,8 +96,8 @@
<dependency>
<groupId>org.apache.rya</groupId>
<artifactId>accumulo.rya</artifactId>
- <version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/30475023/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66356c5..0d11b44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,8 +176,20 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.rya</groupId>
+ <artifactId>accumulo.rya</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>mongodb.rya</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rya</groupId>
<artifactId>mongodb.rya</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.rya</groupId>
@@ -243,6 +255,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.rya</groupId>
+ <artifactId>rya.pcj.fluo.test.base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rya</groupId>
<artifactId>rya.pcj.fluo.integration</artifactId>
<version>${project.version}</version>
</dependency>
@@ -705,6 +722,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <classifier>test</classifier>
+ <version>${kafka.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.11</artifactId>
<version>${kafka.version}</version>
<exclusions>
@@ -780,6 +803,12 @@ under the License.
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
+ <!--
+ Zookeeper tries to resolve localhost to IPv6 by default.
+ If on an IPv4 network, using -Djava.net.preferIPv4Stack=true
+ can make some IT's that create many connections run 3-5x faster.
+ -->
+ <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemPropertyVariables>
</configuration>
@@ -958,6 +987,7 @@ under the License.
<configuration>
<skipITs>${skip.rya.it}</skipITs>
<reuseForks>false</reuseForks> <!-- Temporary fix until RYA-331 is resolved. -->
+ <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds> <!-- kill fork after 10 minutes -->
</configuration>
</execution>
</executions>