Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-atlas into branch-0.6-incubating
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index 71d6d4d..4b0ac0f 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>hive-bridge</artifactId>
diff --git a/client/pom.xml b/client/pom.xml
index d41b5bf..8691843 100755
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-client</artifactId>
<description>Apache Atlas Client</description>
diff --git a/common/pom.xml b/common/pom.xml
index a7a5544..fbf6182 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-common</artifactId>
<description>Apache Atlas Common</description>
diff --git a/dashboard/pom.xml b/dashboard/pom.xml
index 2b79c44..19a5db1 100644
--- a/dashboard/pom.xml
+++ b/dashboard/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-dashboard</artifactId>
diff --git a/distro/pom.xml b/distro/pom.xml
index d88805b..2b137a7 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>atlas-distro</artifactId>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>hive-bridge</artifactId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</dependency>
</dependencies>
</project>
diff --git a/docs/pom.xml b/docs/pom.xml
index 502876f..253430c 100755
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-docs</artifactId>
<description>Apache Atlas Documentation</description>
diff --git a/notification/pom.xml b/notification/pom.xml
index 125ef75..7329cff 100644
--- a/notification/pom.xml
+++ b/notification/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-notification</artifactId>
<description>Apache Atlas Notification</description>
diff --git a/pom.xml b/pom.xml
index 0c3ab4d..3a368f3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
<description>Metadata Management and Data Governance Platform over Hadoop</description>
<name>apache-atlas</name>
<packaging>pom</packaging>
diff --git a/repository/pom.xml b/repository/pom.xml
index 5810956..0722c85 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-repository</artifactId>
<description>Apache Atlas Repository Module</description>
diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java b/repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java
index 2cc1a50..6ab7a21 100755
--- a/repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java
+++ b/repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java
@@ -24,7 +24,10 @@
import com.thinkaurelius.titan.core.TitanGraph;
import com.thinkaurelius.titan.core.schema.TitanManagement;
import com.thinkaurelius.titan.diskstorage.StandardIndexProvider;
+import com.thinkaurelius.titan.diskstorage.indexing.IndexInformation;
import com.thinkaurelius.titan.diskstorage.solr.Solr5Index;
+import com.thinkaurelius.titan.graphdb.configuration.GraphDatabaseConfiguration;
+import com.thinkaurelius.titan.graphdb.database.StandardTitanGraph;
import org.apache.atlas.ApplicationProperties;
import org.apache.atlas.AtlasException;
import org.apache.commons.configuration.Configuration;
@@ -36,6 +39,7 @@
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
/**
* Default implementation for Graph Provider that doles out Titan Graph.
diff --git a/titan/pom.xml b/titan/pom.xml
index d22b607..09873fa 100644
--- a/titan/pom.xml
+++ b/titan/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-atlas</artifactId>
<groupId>org.apache.atlas</groupId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>atlas-titan</artifactId>
diff --git a/typesystem/pom.xml b/typesystem/pom.xml
index 129de58..bc44b49 100755
--- a/typesystem/pom.xml
+++ b/typesystem/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-typesystem</artifactId>
<description>Apache Atlas Typesystem Module</description>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index a765daa..d893947 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.atlas</groupId>
<artifactId>apache-atlas</artifactId>
- <version>0.6-incubating-SNAPSHOT</version>
+ <version>0.6-incubating</version>
</parent>
<artifactId>atlas-webapp</artifactId>
<description>Apache Atlas Web Application</description>
diff --git a/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
index 73d26ce..f2599b5 100755
--- a/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
+++ b/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
@@ -48,10 +48,12 @@
import org.apache.commons.lang.RandomStringUtils;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONObject;
+import org.junit.AfterClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Guice;
import org.testng.annotations.Test;
