You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by su...@apache.org on 2016/11/10 22:43:50 UTC
incubator-atlas git commit: Revert "ATLAS-1246 Upgrade versions of
dependencies (shwethags)"
Repository: incubator-atlas
Updated Branches:
refs/heads/master e20d76e3b -> 71714d20f
Revert "ATLAS-1246 Upgrade versions of dependencies (shwethags)"
This reverts commit bf5f53a7f9f32ff3ff98742536f14f665611d48b.
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/71714d20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/71714d20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/71714d20
Branch: refs/heads/master
Commit: 71714d20f1e3d5e4e30332ca3c692e186f90c220
Parents: e20d76e
Author: Suma Shivaprasad <su...@gmail.com>
Authored: Thu Nov 10 14:42:51 2016 -0800
Committer: Suma Shivaprasad <su...@gmail.com>
Committed: Thu Nov 10 14:42:51 2016 -0800
----------------------------------------------------------------------
addons/falcon-bridge/pom.xml | 7 +-
addons/hive-bridge/pom.xml | 7 +-
addons/sqoop-bridge/pom.xml | 7 +-
addons/storm-bridge/pom.xml | 13 ++-
.../atlas/authorize/simple/PolicyParser.java | 13 +--
common/pom.xml | 6 --
graphdb/common/pom.xml | 6 ++
graphdb/titan0/pom.xml | 11 +-
intg/pom.xml | 6 --
notification/pom.xml | 6 ++
pom.xml | 108 +++++++------------
release-log.txt | 1 -
repository/pom.xml | 58 +++++++---
.../atlas/discovery/DataSetLineageService.java | 6 +-
shaded/hbase-client-shaded/pom.xml | 78 --------------
shaded/hbase-server-shaded/pom.xml | 84 ---------------
typesystem/pom.xml | 37 ++++++-
webapp/pom.xml | 23 +---
18 files changed, 162 insertions(+), 315 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index 6c48659..96743e7 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -142,17 +142,17 @@
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-native_${scala.binary.version}</artifactId>
+ <artifactId>json4s-native_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-core_${scala.binary.version}</artifactId>
+ <artifactId>json4s-core_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-ast_${scala.binary.version}</artifactId>
+ <artifactId>json4s-ast_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
@@ -203,6 +203,7 @@
<artifactItem>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
+ <version>${guice.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.kafka</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index b8f1d07..7ab47f1 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -190,17 +190,17 @@
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-native_${scala.binary.version}</artifactId>
+ <artifactId>json4s-native_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-core_${scala.binary.version}</artifactId>
+ <artifactId>json4s-core_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-ast_${scala.binary.version}</artifactId>
+ <artifactId>json4s-ast_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
@@ -251,6 +251,7 @@
<artifactItem>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
+ <version>${guice.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.kafka</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/addons/sqoop-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index ba605c3..e71d64a 100644
--- a/addons/sqoop-bridge/pom.xml
+++ b/addons/sqoop-bridge/pom.xml
@@ -207,17 +207,17 @@
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-native_${scala.binary.version}</artifactId>
+ <artifactId>json4s-native_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-core_${scala.binary.version}</artifactId>
+ <artifactId>json4s-core_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-ast_${scala.binary.version}</artifactId>
+ <artifactId>json4s-ast_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
@@ -263,6 +263,7 @@
<artifactItem>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
+ <version>${guice.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.kafka</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/addons/storm-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index e516f2b..6be55b4 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -95,10 +95,11 @@
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
<version>${storm.version}</version>
+ <type>jar</type>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -167,17 +168,17 @@
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-native_${scala.binary.version}</artifactId>
+ <artifactId>json4s-native_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-core_${scala.binary.version}</artifactId>
+ <artifactId>json4s-core_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
- <artifactId>json4s-ast_${scala.binary.version}</artifactId>
+ <artifactId>json4s-ast_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
@@ -233,18 +234,22 @@
<artifactItem>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <version>${guice.version}</version>
</artifactItem>
<artifactItem>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
+ <version>${guice.version}</version>
</artifactItem>
<artifactItem>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
+ <version>${guice.version}</version>
</artifactItem>
<artifactItem>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-throwingproviders</artifactId>
+ <version>${guice.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.kafka</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/authorization/src/main/java/org/apache/atlas/authorize/simple/PolicyParser.java
----------------------------------------------------------------------
diff --git a/authorization/src/main/java/org/apache/atlas/authorize/simple/PolicyParser.java b/authorization/src/main/java/org/apache/atlas/authorize/simple/PolicyParser.java
index 2a6929a..fe81598 100644
--- a/authorization/src/main/java/org/apache/atlas/authorize/simple/PolicyParser.java
+++ b/authorization/src/main/java/org/apache/atlas/authorize/simple/PolicyParser.java
@@ -17,18 +17,19 @@
*/
package org.apache.atlas.authorize.simple;
-import org.apache.atlas.authorize.AtlasActionTypes;
-import org.apache.atlas.authorize.AtlasResourceTypes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import scala.tools.jline_embedded.internal.Log;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import org.apache.atlas.authorize.AtlasActionTypes;
+import org.apache.atlas.authorize.AtlasResourceTypes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import scala.tools.jline.internal.Log;
+
public class PolicyParser {
private static Logger LOG = LoggerFactory.getLogger(PolicyParser.class);
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 9f7aac9..e3b6465 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -70,11 +70,5 @@
<version>${spring.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/graphdb/common/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/common/pom.xml b/graphdb/common/pom.xml
index f110aff..43d51f6 100644
--- a/graphdb/common/pom.xml
+++ b/graphdb/common/pom.xml
@@ -34,6 +34,12 @@ under the License. -->
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>18.0</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/graphdb/titan0/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/titan0/pom.xml b/graphdb/titan0/pom.xml
index b6a8a3a..ca8c0fb 100644
--- a/graphdb/titan0/pom.xml
+++ b/graphdb/titan0/pom.xml
@@ -83,8 +83,8 @@
</dependency>
<dependency>
- <groupId>org.apache.atlas</groupId>
- <artifactId>atlas-hbase-client-shaded</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
</dependency>
<dependency>
@@ -171,13 +171,8 @@
<exclude>com/thinkaurelius/titan/graphdb/query/graph/GraphCentricQueryBuilder.class</exclude>
</excludes>
</filter>
+
</filters>
- <relocations>
- <relocation>
- <pattern>com.google</pattern>
- <shadedPattern>atlas.shaded.titan.guava</shadedPattern>
- </relocation>
- </relocations>
<createSourcesJar>true</createSourcesJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/intg/pom.xml
----------------------------------------------------------------------
diff --git a/intg/pom.xml b/intg/pom.xml
index 1d3578c..b29a0c2 100644
--- a/intg/pom.xml
+++ b/intg/pom.xml
@@ -62,12 +62,6 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/notification/pom.xml
----------------------------------------------------------------------
diff --git a/notification/pom.xml b/notification/pom.xml
index 868f02d..90d84ec 100644
--- a/notification/pom.xml
+++ b/notification/pom.xml
@@ -92,6 +92,7 @@
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
+ <version>${zkclient.version}</version>
</dependency>
<dependency>
@@ -152,6 +153,11 @@
<version>${commons-lang.version}</version>
</artifactItem>
<artifactItem>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b3975f..2044bfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,7 +432,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<node.version>v0.10.30</node.version>
<node-for-v2.version>v4.4.2</node-for-v2.version>
- <slf4j.version>1.7.21</slf4j.version>
+ <slf4j.version>1.7.7</slf4j.version>
<jetty.version>9.2.12.v20150709</jetty.version>
<jersey.version>1.19</jersey.version>
<tinkerpop.version>2.6.0</tinkerpop.version>
@@ -441,26 +441,22 @@
<hbase.version>1.1.2</hbase.version>
<solr.version>5.5.1</solr.version>
<kafka.version>0.10.0.0</kafka.version>
- <curator.version>2.11.0</curator.version>
- <zookeeper.version>3.4.6</zookeeper.version>
-
<!-- scala versions -->
- <scala.version>2.11.8</scala.version>
- <scala.binary.version>2.11</scala.binary.version>
+ <scala.version>2.10.4</scala.version>
+ <scala.binary.version>2.10</scala.binary.version>
<scala.macros.version>2.0.1</scala.macros.version>
<json.version>3.2.11</json.version>
<log4j.version>1.2.17</log4j.version>
<akka.version>2.3.7</akka.version>
<spray.version>1.3.1</spray.version>
<gson.version>2.5</gson.version>
+ <guava.version>14.0</guava.version>
<fastutil.version>6.5.16</fastutil.version>
- <guice.version>4.1.0</guice.version>
+ <guice.version>4.0</guice.version>
<spring.version>3.1.3.RELEASE</spring.version>
<spring.security.version>3.1.3.RELEASE</spring.security.version>
<spring-ldap-core.version>1.3.1.RELEASE</spring-ldap-core.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
- <guava.version>18.0</guava.version>
-
<!-- Needed for hooks -->
<aopalliance.version>1.0</aopalliance.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
@@ -470,7 +466,7 @@
<commons-lang.version>2.6</commons-lang.version>
<javax-inject.version>1</javax-inject.version>
<jettison.version>1.3.7</jettison.version>
- <paranamer.version>2.7</paranamer.version>
+ <paranamer.version>2.3</paranamer.version>
<zkclient.version>0.8</zkclient.version>
<PermGen>64m</PermGen>
@@ -489,7 +485,7 @@
<titan.storage.backend>berkeleyje</titan.storage.backend>
<titan.index.backend>elasticsearch</titan.index.backend>
<entity.repository.impl>org.apache.atlas.repository.audit.InMemoryEntityAuditRepository</entity.repository.impl>
- <graphdb.backend.impl>org.apache.atlas.repository.graphdb.titan0.Titan0GraphDatabase</graphdb.backend.impl>
+ <graphdb.backend.impl>org.apache.atlas.repository.graphdb.titan0.Titan0GraphDatabase</graphdb.backend.impl>
<atlas.surefire.options></atlas.surefire.options>
</properties>
@@ -544,8 +540,6 @@
<module>notification</module>
<module>client</module>
<module>graphdb</module>
- <module>shaded/hbase-client-shaded</module>
- <module>shaded/hbase-server-shaded</module>
<module>repository</module>
<module>authorization</module>
<module>catalog</module>
@@ -718,10 +712,6 @@
<groupId>commons-httpclient</groupId>
<artifactId>*</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -742,10 +732,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -780,24 +766,6 @@
<scope>test</scope>
</dependency>
- <!-- Zookeeper, curator -->
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- </dependency>
<!-- commons -->
<dependency>
<groupId>commons-configuration</groupId>
@@ -834,12 +802,6 @@
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -1020,7 +982,7 @@
<artifactId>titan-hbase</artifactId>
<version>${titan.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
@@ -1054,12 +1016,14 @@
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
@@ -1072,6 +1036,7 @@
</exclusions>
</dependency>
+
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
@@ -1203,25 +1168,14 @@
<type>war</type>
</dependency>
- <dependency>
- <groupId>org.apache.atlas</groupId>
- <artifactId>atlas-hbase-client-shaded</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.atlas</groupId>
- <artifactId>atlas-hbase-server-shaded</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- use titan 0.5.4 by default -->
+ <!-- use titan 0.5.4 by default -->
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-graphdb-impls</artifactId>
<version>${project.version}</version>
<type>pom</type>
- <!-- exclusions should be added here for all of the non-titan0 implementations -->
+ <!-- exclusions should be added here for all of the non-titan0
+ implementations -->
<scope>test</scope>
</dependency>
@@ -1300,6 +1254,12 @@
<dependency>
<groupId>org.scala-lang</groupId>
+ <artifactId>jline</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
@@ -1317,14 +1277,20 @@
</dependency>
<dependency>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>quasiquotes_${scala.binary.version}</artifactId>
+ <version>${scala.macros.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.json4s</groupId>
- <artifactId>json4s-native_${scala.binary.version}</artifactId>
+ <artifactId>json4s-native_2.10</artifactId>
<version>${json.version}</version>
</dependency>
<dependency>
<groupId>com.github.nscala-time</groupId>
- <artifactId>nscala-time_${scala.binary.version}</artifactId>
+ <artifactId>nscala-time_2.10</artifactId>
<version>1.6.0</version>
</dependency>
@@ -1336,19 +1302,19 @@
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_${scala.binary.version}</artifactId>
+ <artifactId>akka-actor_2.10</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_${scala.binary.version}</artifactId>
+ <artifactId>akka-testkit_2.10</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
+ <artifactId>akka-slf4j_2.10</artifactId>
<version>${akka.version}</version>
</dependency>
@@ -1377,6 +1343,12 @@
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
@@ -1465,12 +1437,6 @@
<artifactId>atlas-plugin-classloader</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>com.101tec</groupId>
- <artifactId>zkclient</artifactId>
- <version>${zkclient.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 6aa1f42..651a2d4 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -11,7 +11,6 @@ ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(s
ALL CHANGES:
ATLAS-1276 fix for webapp test failures (ayubkhan via mneethiraj)
ATLAS-1278 Added API to get typedef header info (apoorvnaik via mneethiraj)
-ATLAS-1246 Upgrade versions of dependencies (shwethags)
ATLAS-1192 Atlas IE support (kevalbhatt)
ATLAS-1273 Test testOnChangeRefresh in DefaultMetadataServiceTest is failing (ayubkhan via shwethags)
ATLAS-1272 updated types bootstrap to load from new format typedef JSON files (mneethiraj)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index 949118b..af5d4a1 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -57,13 +57,15 @@
<artifactId>atlas-graphdb-api</artifactId>
</dependency>
- <dependency>
+
+ <dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-graphdb-impls</artifactId>
- <type>pom</type>
+ <type>pom</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
@@ -101,6 +103,11 @@
<dependency>
<groupId>org.scala-lang</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
@@ -115,6 +122,11 @@
</dependency>
<dependency>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>quasiquotes_${scala.binary.version}</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
</dependency>
@@ -130,35 +142,34 @@
</dependency>
<dependency>
- <groupId>org.apache.atlas</groupId>
- <artifactId>atlas-typesystem</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.atlas</groupId>
- <artifactId>atlas-typesystem</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.atlas</groupId>
- <artifactId>atlas-intg</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
- <artifactId>atlas-hbase-client-shaded</artifactId>
+ <artifactId>atlas-typesystem</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.atlas</groupId>
- <artifactId>atlas-hbase-server-shaded</artifactId>
+ <artifactId>atlas-intg</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -200,6 +211,23 @@
<jvmArg>-Xmx512m</jvmArg>
<jvmArg>-XX:MaxPermSize=128m</jvmArg>
</jvmArgs>
+ <!--
+ <javacArgs>
+ <javacArg>-source</javacArg>
+ <javacArg>${java.version}</javacArg>
+ <javacArg>-target</javacArg>
+ <javacArg>${java.version}</javacArg>
+ </javacArgs>
+ -->
+ <!-- The following plugin is required to use quasiquotes in Scala 2.10 and is used
+ by Spark SQL for code generation. -->
+ <!--<compilerPlugins>
+ <compilerPlugin>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>paradise_${scala.version}</artifactId>
+ <version>${scala.macros.version}</version>
+ </compilerPlugin>
+ </compilerPlugins>-->
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java b/repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java
index fa8d94c..c3fd72b 100644
--- a/repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java
+++ b/repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java
@@ -44,12 +44,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.Option;
import scala.Some;
-import scala.collection.JavaConversions;
import scala.collection.immutable.List;
import javax.inject.Inject;
import javax.inject.Singleton;
-import java.util.Arrays;
import java.util.Iterator;
/**
@@ -61,8 +59,8 @@ public class DataSetLineageService implements LineageService {
private static final Logger LOG = LoggerFactory.getLogger(DataSetLineageService.class);
private static final Option<List<String>> SELECT_ATTRIBUTES =
- Some.apply(JavaConversions.asScalaBuffer(Arrays.asList(AtlasClient.NAME,
- AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME)).toList());
+ Some.<List<String>>apply(List.<String>fromArray(new String[]{AtlasClient.NAME,
+ AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME}));
public static final String SELECT_INSTANCE_GUID = "__guid";
public static final String DATASET_SCHEMA_QUERY_PREFIX = "atlas.lineage.schema.query.";
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/shaded/hbase-client-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/shaded/hbase-client-shaded/pom.xml b/shaded/hbase-client-shaded/pom.xml
deleted file mode 100644
index 0877251..0000000
--- a/shaded/hbase-client-shaded/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>apache-atlas</artifactId>
- <groupId>org.apache.atlas</groupId>
- <version>0.8-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>atlas-hbase-client-shaded</artifactId>
- <description>Shading of guava in apache hbase-client</description>
- <name>Shaded version of Apache hbase client</name>
- <packaging>jar</packaging>
-
- <properties>
- <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <excludes>
- <!-- these are bundled with Atlas -->
- <exclude>org.slf4j:*</exclude>
- </excludes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>com.google</pattern>
- <shadedPattern>atlas.shaded.hbase.guava</shadedPattern>
- </relocation>
- </relocations>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/shaded/hbase-server-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/shaded/hbase-server-shaded/pom.xml b/shaded/hbase-server-shaded/pom.xml
deleted file mode 100644
index 0ebae5d..0000000
--- a/shaded/hbase-server-shaded/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>apache-atlas</artifactId>
- <groupId>org.apache.atlas</groupId>
- <version>0.8-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>atlas-hbase-server-shaded</artifactId>
- <description>Shading of guava in apache hbase-server</description>
- <name>Shaded version of Apache hbase server</name>
- <packaging>jar</packaging>
-
- <properties>
- <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <excludes>
- <!-- these are bundled with Atlas -->
- <exclude>org.slf4j:*</exclude>
- </excludes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>com.google</pattern>
- <shadedPattern>atlas.shaded.hbase.guava</shadedPattern>
- </relocation>
- </relocations>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/typesystem/pom.xml
----------------------------------------------------------------------
diff --git a/typesystem/pom.xml b/typesystem/pom.xml
index ab5f8d0..28c077d 100755
--- a/typesystem/pom.xml
+++ b/typesystem/pom.xml
@@ -49,6 +49,11 @@
<dependency>
<groupId>org.scala-lang</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
@@ -63,13 +68,18 @@
</dependency>
<dependency>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>quasiquotes_${scala.binary.version}</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.json4s</groupId>
- <artifactId>json4s-native_${scala.binary.version}</artifactId>
+ <artifactId>json4s-native_2.10</artifactId>
</dependency>
<dependency>
<groupId>com.github.nscala-time</groupId>
- <artifactId>nscala-time_${scala.binary.version}</artifactId>
+ <artifactId>nscala-time_2.10</artifactId>
</dependency>
<dependency>
@@ -78,6 +88,11 @@
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
@@ -101,7 +116,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-intg</artifactId>
@@ -145,6 +159,23 @@
<jvmArg>-Xmx512m</jvmArg>
<jvmArg>-XX:MaxPermSize=128m</jvmArg>
</jvmArgs>
+ <!--
+ <javacArgs>
+ <javacArg>-source</javacArg>
+ <javacArg>${java.version}</javacArg>
+ <javacArg>-target</javacArg>
+ <javacArg>${java.version}</javacArg>
+ </javacArgs>
+ -->
+ <!-- The following plugin is required to use quasiquotes in Scala 2.10 and is used
+ by Spark SQL for code generation. -->
+ <!--<compilerPlugins>
+ <compilerPlugin>
+ <groupId>org.scalamacros</groupId>
+ <artifactId>paradise_${scala.version}</artifactId>
+ <version>${scala.macros.version}</version>
+ </compilerPlugin>
+ </compilerPlugins>-->
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71714d20/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 883c52a..b9e1111 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -103,12 +103,6 @@
<dependencies>
<dependency>
<groupId>org.apache.atlas</groupId>
- <artifactId>atlas-graphdb-impls</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.atlas</groupId>
<artifactId>atlas-common</artifactId>
</dependency>
@@ -147,7 +141,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
@@ -163,20 +156,10 @@
<artifactId>atlas-catalog</artifactId>
</dependency>
- <!-- Zookeeper, curator -->
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </dependency>
-
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <groupId>org.apache.atlas</groupId>
+ <artifactId>atlas-graphdb-impls</artifactId>
+ <type>pom</type>
</dependency>
<!-- supports simple auth handler -->