atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shweth...@apache.org
Subject incubator-atlas git commit: ATLAS-1244 added support for KnoxSSO Authentication
Date Wed, 16 Nov 2016 06:57:56 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 854b79280 -> 4bfa5eec8


ATLAS-1244 added support for KnoxSSO Authentication


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/4bfa5eec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/4bfa5eec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/4bfa5eec

Branch: refs/heads/master
Commit: 4bfa5eec8c7276597e12debfb45aeb2d9dba5ecf
Parents: 854b792
Author: Shwetha GS <sshivalingamurthy@hortonworks.com>
Authored: Wed Nov 16 12:27:47 2016 +0530
Committer: Shwetha GS <sshivalingamurthy@hortonworks.com>
Committed: Wed Nov 16 12:27:47 2016 +0530

----------------------------------------------------------------------
 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                          |  13 ++-
 intg/pom.xml                                    |   6 ++
 notification/pom.xml                            |   6 --
 pom.xml                                         | 108 ++++++++++++-------
 release-log.txt                                 |   4 +-
 repository/pom.xml                              |  58 +++-------
 .../atlas/discovery/DataSetLineageService.java  |   6 +-
 shaded/hbase-client-shaded/pom.xml              |  79 ++++++++++++++
 shaded/hbase-server-shaded/pom.xml              |  85 +++++++++++++++
 typesystem/pom.xml                              |  37 +------
 webapp/pom.xml                                  |  27 ++++-
 18 files changed, 324 insertions(+), 164 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4bfa5eec/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index 96743e7..6c48659 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_2.10</artifactId>
+                                            <artifactId>json4s-native_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-core_2.10</artifactId>
+                                            <artifactId>json4s-core_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-ast_2.10</artifactId>
+                                            <artifactId>json4s-ast_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
@@ -203,7 +203,6 @@
                                         <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/4bfa5eec/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index 7ab47f1..b8f1d07 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_2.10</artifactId>
+                                            <artifactId>json4s-native_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-core_2.10</artifactId>
+                                            <artifactId>json4s-core_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-ast_2.10</artifactId>
+                                            <artifactId>json4s-ast_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
@@ -251,7 +251,6 @@
                                         <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/4bfa5eec/addons/sqoop-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index e71d64a..ba605c3 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_2.10</artifactId>
+                                            <artifactId>json4s-native_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-core_2.10</artifactId>
+                                            <artifactId>json4s-core_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-ast_2.10</artifactId>
+                                            <artifactId>json4s-ast_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
@@ -263,7 +263,6 @@
                                         <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/4bfa5eec/addons/storm-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index 6be55b4..e516f2b 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -95,11 +95,10 @@
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-core</artifactId>
             <version>${storm.version}</version>
-            <type>jar</type>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
+                    <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -168,17 +167,17 @@
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-native_2.10</artifactId>
+                                            <artifactId>json4s-native_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-core_2.10</artifactId>
+                                            <artifactId>json4s-core_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.json4s</groupId>
-                                            <artifactId>json4s-ast_2.10</artifactId>
+                                            <artifactId>json4s-ast_${scala.binary.version}</artifactId>
                                             <version>${json.version}</version>
                                         </artifactItem>
                                         <artifactItem>
@@ -234,22 +233,18 @@
                                         <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/4bfa5eec/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 fe81598..2a6929a 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,17 @@
  */
 package org.apache.atlas.authorize.simple;
 
-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_embedded.internal.Log;
 
-import scala.tools.jline.internal.Log;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 
 public class PolicyParser {
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4bfa5eec/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index e3b6465..9f7aac9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -70,5 +70,11 @@
             <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/4bfa5eec/graphdb/common/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/common/pom.xml b/graphdb/common/pom.xml
index 43d51f6..f110aff 100644
--- a/graphdb/common/pom.xml
+++ b/graphdb/common/pom.xml
@@ -34,12 +34,6 @@ 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/4bfa5eec/graphdb/titan0/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/titan0/pom.xml b/graphdb/titan0/pom.xml
index ca8c0fb..58a5cb8 100644
--- a/graphdb/titan0/pom.xml
+++ b/graphdb/titan0/pom.xml
@@ -83,8 +83,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-client</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-hbase-client-shaded</artifactId>
         </dependency>
 
         <dependency>
@@ -171,8 +171,15 @@
                                         <exclude>com/thinkaurelius/titan/graphdb/query/graph/GraphCentricQueryBuilder.class</exclude>
                                     </excludes>
                                 </filter>
-
                             </filters>
+                            <relocations>
+                                <!-- guava has incompatibilities across its versions. Titan requires different version of guava than the version that atlas needs.
+                                 So, shading the guava reference in titan -->
+                                <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/4bfa5eec/intg/pom.xml
----------------------------------------------------------------------
diff --git a/intg/pom.xml b/intg/pom.xml
index b29a0c2..1d3578c 100644
--- a/intg/pom.xml
+++ b/intg/pom.xml
@@ -62,6 +62,12 @@
         </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/4bfa5eec/notification/pom.xml
----------------------------------------------------------------------
diff --git a/notification/pom.xml b/notification/pom.xml
index 90d84ec..868f02d 100644
--- a/notification/pom.xml
+++ b/notification/pom.xml
@@ -92,7 +92,6 @@
         <dependency>
             <groupId>com.101tec</groupId>
             <artifactId>zkclient</artifactId>
-            <version>${zkclient.version}</version>
         </dependency>
 
         <dependency>
@@ -153,11 +152,6 @@
                                     <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/4bfa5eec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2044bfd..1b3975f 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.7</slf4j.version>
+        <slf4j.version>1.7.21</slf4j.version>
         <jetty.version>9.2.12.v20150709</jetty.version>
         <jersey.version>1.19</jersey.version>
         <tinkerpop.version>2.6.0</tinkerpop.version>
@@ -441,22 +441,26 @@
         <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.10.4</scala.version>
-        <scala.binary.version>2.10</scala.binary.version>
+        <scala.version>2.11.8</scala.version>
+        <scala.binary.version>2.11</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.0</guice.version>
+        <guice.version>4.1.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>
@@ -466,7 +470,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.3</paranamer.version>
+        <paranamer.version>2.7</paranamer.version>
         <zkclient.version>0.8</zkclient.version>
 
         <PermGen>64m</PermGen>
@@ -485,7 +489,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>
 
@@ -540,6 +544,8 @@
         <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>
@@ -712,6 +718,10 @@
                         <groupId>commons-httpclient</groupId>
                         <artifactId>*</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -732,6 +742,10 @@
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>*</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -766,6 +780,24 @@
                 <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>
@@ -802,6 +834,12 @@
                 <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>
@@ -982,7 +1020,7 @@
                 <artifactId>titan-hbase</artifactId>
                 <version>${titan.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.hbase</groupId>
                 <artifactId>hbase-client</artifactId>
@@ -1016,14 +1054,12 @@
                 <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>
@@ -1036,7 +1072,6 @@
                 </exclusions>
             </dependency>
 
-
             <dependency>
                 <groupId>com.vividsolutions</groupId>
                 <artifactId>jts</artifactId>
@@ -1168,14 +1203,25 @@
                 <type>war</type>
             </dependency>
 
-	    <!-- use titan 0.5.4 by default -->
+            <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 -->
             <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>
 
@@ -1254,12 +1300,6 @@
 
             <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>
@@ -1277,20 +1317,14 @@
             </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_2.10</artifactId>
+                <artifactId>json4s-native_${scala.binary.version}</artifactId>
                 <version>${json.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.github.nscala-time</groupId>
-                <artifactId>nscala-time_2.10</artifactId>
+                <artifactId>nscala-time_${scala.binary.version}</artifactId>
                 <version>1.6.0</version>
             </dependency>
 
@@ -1302,19 +1336,19 @@
 
             <dependency>
                 <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-actor_2.10</artifactId>
+                <artifactId>akka-actor_${scala.binary.version}</artifactId>
                 <version>${akka.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-testkit_2.10</artifactId>
+                <artifactId>akka-testkit_${scala.binary.version}</artifactId>
                 <version>${akka.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-slf4j_2.10</artifactId>
+                <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
                 <version>${akka.version}</version>
             </dependency>
 
@@ -1343,12 +1377,6 @@
             </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>
@@ -1437,6 +1465,12 @@
                 <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/4bfa5eec/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0649f09..4e9d8e9 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,7 +9,9 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
-ATLAS-1244 added support for KnoxSSO Authentication
+
+ATLAS-1246 Upgrade versions of dependencies (shwethags)
+ATLAS-1244 added support for KnoxSSO Authentication (nixonrodrigues via mneethiraj)
 ATLAS-1295 Build failure due to patch for ATLAS-1081 (apoorvnaik via sumasai)
 ATLAS-1081 Atlas jetty server configuration (shwethags)
 ATLAS-1257 Map Entity REST APIs to ATLAS v1 backend (sumasai)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4bfa5eec/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index af5d4a1..949118b 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -57,15 +57,13 @@
             <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>
@@ -103,11 +101,6 @@
 
         <dependency>
             <groupId>org.scala-lang</groupId>
-            <artifactId>jline</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
         </dependency>
 
@@ -122,11 +115,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.scalamacros</groupId>
-            <artifactId>quasiquotes_${scala.binary.version}</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>
         </dependency>
@@ -142,34 +130,35 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-client</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-typesystem</artifactId>
+            <classifier>tests</classifier>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-server</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-typesystem</artifactId>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-server</artifactId>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-intg</artifactId>
+            <type>test-jar</type>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.atlas</groupId>
-            <artifactId>atlas-typesystem</artifactId>
-            <classifier>tests</classifier>
-            <scope>test</scope>
+            <artifactId>atlas-hbase-client-shaded</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.atlas</groupId>
-            <artifactId>atlas-intg</artifactId>
-            <type>test-jar</type>
-            <version>${project.version}</version>
+            <artifactId>atlas-hbase-server-shaded</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -211,23 +200,6 @@
                         <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/4bfa5eec/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 4d3177c..fcf120a 100644
--- a/repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java
+++ b/repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java
@@ -44,10 +44,12 @@ 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;
 
 /**
@@ -59,8 +61,8 @@ public class DataSetLineageService implements LineageService {
     private static final Logger LOG = LoggerFactory.getLogger(DataSetLineageService.class);
 
     private static final Option<List<String>> SELECT_ATTRIBUTES =
-            Some.<List<String>>apply(List.<String>fromArray(new String[]{AtlasClient.NAME,
-                    AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME}));
+            Some.apply(JavaConversions.asScalaBuffer(Arrays.asList(AtlasClient.NAME,
+                    AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME)).toList());
     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/4bfa5eec/shaded/hbase-client-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/shaded/hbase-client-shaded/pom.xml b/shaded/hbase-client-shaded/pom.xml
new file mode 100644
index 0000000..f8b6bb7
--- /dev/null
+++ b/shaded/hbase-client-shaded/pom.xml
@@ -0,0 +1,79 @@
+<?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>
+    </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>
+                                <!-- guava has incompatibilities across its versions. HBase requires different version of guava than the version that atlas needs.
+                                So, shading the guava reference in HBase -->
+                                <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/4bfa5eec/shaded/hbase-server-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/shaded/hbase-server-shaded/pom.xml b/shaded/hbase-server-shaded/pom.xml
new file mode 100644
index 0000000..2c52aff
--- /dev/null
+++ b/shaded/hbase-server-shaded/pom.xml
@@ -0,0 +1,85 @@
+<?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>
+    </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>
+                                <!-- guava has incompatibilities across its versions. HBase requires different version of guava than the version that atlas needs.
+                                So, shading the guava reference in HBase -->
+                                <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/4bfa5eec/typesystem/pom.xml
----------------------------------------------------------------------
diff --git a/typesystem/pom.xml b/typesystem/pom.xml
index 28c077d..ab5f8d0 100755
--- a/typesystem/pom.xml
+++ b/typesystem/pom.xml
@@ -49,11 +49,6 @@
 
         <dependency>
             <groupId>org.scala-lang</groupId>
-            <artifactId>jline</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
         </dependency>
 
@@ -68,18 +63,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.scalamacros</groupId>
-            <artifactId>quasiquotes_${scala.binary.version}</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.json4s</groupId>
-            <artifactId>json4s-native_2.10</artifactId>
+            <artifactId>json4s-native_${scala.binary.version}</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.github.nscala-time</groupId>
-            <artifactId>nscala-time_2.10</artifactId>
+            <artifactId>nscala-time_${scala.binary.version}</artifactId>
         </dependency>
 
         <dependency>
@@ -88,11 +78,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
@@ -116,6 +101,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.atlas</groupId>
             <artifactId>atlas-intg</artifactId>
@@ -159,23 +145,6 @@
                         <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/4bfa5eec/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 594b602..2bef274 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -103,6 +103,12 @@
     <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>
 
@@ -141,6 +147,7 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-minikdc</artifactId>
@@ -156,10 +163,20 @@
             <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.atlas</groupId>
-          <artifactId>atlas-graphdb-impls</artifactId>
-          <type>pom</type>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
         </dependency>
 
         <!-- supports simple auth handler -->
@@ -392,7 +409,9 @@
                         </manifest>
                     </archive>
                     <packagingExcludes>
-                        ${packages.to.exclude}
+                        <!-- Titan and hbase jars should be excluded because an uber jar with shaded dependencies is created.
+                        But mvn 3.3.x includes them for some reason. So, excluding them explicitly here -->
+                        WEB-INF/lib/titan*.jar,WEB-INF/lib/hbase*.jar,${packages.to.exclude}
                     </packagingExcludes>
                 </configuration>
             </plugin>


Mime
View raw message