Skip to content

A
atlas
Commit bf5f53a7 by Shwetha GS
Options

ATLAS-1246 Upgrade versions of dependencies (shwethags)

parent 7fca22ff
Showing with 315 additions and 162 deletions
addons/falcon-bridge/pom.xml
...@@ -142,17 +142,17 @@ ...@@ -142,17 +142,17 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId> <artifactId>json4s-native_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-core_2.10</artifactId> <artifactId>json4s-core_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-ast_2.10</artifactId> <artifactId>json4s-ast_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
...@@ -203,7 +203,6 @@ ...@@ -203,7 +203,6 @@
<artifactItem> <artifactItem>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId> <artifactId>guice-multibindings</artifactId>
<version>${guice.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
......
addons/hive-bridge/pom.xml
...@@ -190,17 +190,17 @@ ...@@ -190,17 +190,17 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId> <artifactId>json4s-native_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-core_2.10</artifactId> <artifactId>json4s-core_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-ast_2.10</artifactId> <artifactId>json4s-ast_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
...@@ -251,7 +251,6 @@ ...@@ -251,7 +251,6 @@
<artifactItem> <artifactItem>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId> <artifactId>guice-multibindings</artifactId>
<version>${guice.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
......
addons/sqoop-bridge/pom.xml
...@@ -207,17 +207,17 @@ ...@@ -207,17 +207,17 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId> <artifactId>json4s-native_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-core_2.10</artifactId> <artifactId>json4s-core_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-ast_2.10</artifactId> <artifactId>json4s-ast_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
...@@ -263,7 +263,6 @@ ...@@ -263,7 +263,6 @@
<artifactItem> <artifactItem>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId> <artifactId>guice-multibindings</artifactId>
<version>${guice.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
......
addons/storm-bridge/pom.xml
...@@ -95,11 +95,10 @@ ...@@ -95,11 +95,10 @@
<groupId>org.apache.storm</groupId> <groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId> <artifactId>storm-core</artifactId>
<version>${storm.version}</version> <version>${storm.version}</version>
<type>jar</type>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>log4j-over-slf4j</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
...@@ -168,17 +167,17 @@ ...@@ -168,17 +167,17 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId> <artifactId>json4s-native_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-core_2.10</artifactId> <artifactId>json4s-core_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-ast_2.10</artifactId> <artifactId>json4s-ast_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
...@@ -234,22 +233,18 @@ ...@@ -234,22 +233,18 @@
<artifactItem> <artifactItem>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<version>${guice.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId> <artifactId>guice-multibindings</artifactId>
<version>${guice.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId> <artifactId>guice-servlet</artifactId>
<version>${guice.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-throwingproviders</artifactId> <artifactId>guice-throwingproviders</artifactId>
<version>${guice.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
......
authorization/src/main/java/org/apache/atlas/authorize/simple/PolicyParser.java
...@@ -17,18 +17,17 @@ ...@@ -17,18 +17,17 @@
*/ */
package org.apache.atlas.authorize.simple; 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.AtlasActionTypes;
import org.apache.atlas.authorize.AtlasResourceTypes; import org.apache.atlas.authorize.AtlasResourceTypes;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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 { public class PolicyParser {
......
common/pom.xml
...@@ -70,5 +70,11 @@ ...@@ -70,5 +70,11 @@
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
graphdb/common/pom.xml
...@@ -34,12 +34,6 @@ under the License. --> ...@@ -34,12 +34,6 @@ under the License. -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.9</version> <version>4.9</version>
......
graphdb/titan0/pom.xml
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>hbase-client</artifactId> <artifactId>atlas-hbase-client-shaded</artifactId>
</dependency> </dependency>
<dependency> <dependency>
...@@ -171,8 +171,13 @@ ...@@ -171,8 +171,13 @@
<exclude>com/thinkaurelius/titan/graphdb/query/graph/GraphCentricQueryBuilder.class</exclude> <exclude>com/thinkaurelius/titan/graphdb/query/graph/GraphCentricQueryBuilder.class</exclude>
</excludes> </excludes>
</filter> </filter>
</filters> </filters>
<relocations>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>atlas.shaded.titan.guava</shadedPattern>
</relocation>
</relocations>
<createSourcesJar>true</createSourcesJar> <createSourcesJar>true</createSourcesJar>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
......
intg/pom.xml
...@@ -62,6 +62,12 @@ ...@@ -62,6 +62,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<scope>test</scope> <scope>test</scope>
......
notification/pom.xml
...@@ -92,7 +92,6 @@ ...@@ -92,7 +92,6 @@
<dependency> <dependency>
<groupId>com.101tec</groupId> <groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId> <artifactId>zkclient</artifactId>
<version>${zkclient.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -153,11 +152,6 @@ ...@@ -153,11 +152,6 @@
<version>${commons-lang.version}</version> <version>${commons-lang.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
......
pom.xml
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<node.version>v0.10.30</node.version> <node.version>v0.10.30</node.version>
<node-for-v2.version>v4.4.2</node-for-v2.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> <jetty.version>9.2.12.v20150709</jetty.version>
<jersey.version>1.19</jersey.version> <jersey.version>1.19</jersey.version>
<tinkerpop.version>2.6.0</tinkerpop.version> <tinkerpop.version>2.6.0</tinkerpop.version>
...@@ -420,22 +420,26 @@ ...@@ -420,22 +420,26 @@
<hbase.version>1.1.2</hbase.version> <hbase.version>1.1.2</hbase.version>
<solr.version>5.5.1</solr.version> <solr.version>5.5.1</solr.version>
<kafka.version>0.10.0.0</kafka.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 versions -->
<scala.version>2.10.4</scala.version> <scala.version>2.11.8</scala.version>
<scala.binary.version>2.10</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
<scala.macros.version>2.0.1</scala.macros.version> <scala.macros.version>2.0.1</scala.macros.version>
<json.version>3.2.11</json.version> <json.version>3.2.11</json.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<akka.version>2.3.7</akka.version> <akka.version>2.3.7</akka.version>
<spray.version>1.3.1</spray.version> <spray.version>1.3.1</spray.version>
<gson.version>2.5</gson.version> <gson.version>2.5</gson.version>
<guava.version>14.0</guava.version>
<fastutil.version>6.5.16</fastutil.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.version>3.1.3.RELEASE</spring.version>
<spring.security.version>3.1.3.RELEASE</spring.security.version> <spring.security.version>3.1.3.RELEASE</spring.security.version>
<spring-ldap-core.version>1.3.1.RELEASE</spring-ldap-core.version> <spring-ldap-core.version>1.3.1.RELEASE</spring-ldap-core.version>
<javax.servlet.version>3.1.0</javax.servlet.version> <javax.servlet.version>3.1.0</javax.servlet.version>
<guava.version>18.0</guava.version>
<!-- Needed for hooks --> <!-- Needed for hooks -->
<aopalliance.version>1.0</aopalliance.version> <aopalliance.version>1.0</aopalliance.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
...@@ -445,7 +449,7 @@ ...@@ -445,7 +449,7 @@
<commons-lang.version>2.6</commons-lang.version> <commons-lang.version>2.6</commons-lang.version>
<javax-inject.version>1</javax-inject.version> <javax-inject.version>1</javax-inject.version>
<jettison.version>1.3.7</jettison.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> <zkclient.version>0.8</zkclient.version>
<PermGen>64m</PermGen> <PermGen>64m</PermGen>
...@@ -464,7 +468,7 @@ ...@@ -464,7 +468,7 @@
<titan.storage.backend>berkeleyje</titan.storage.backend> <titan.storage.backend>berkeleyje</titan.storage.backend>
<titan.index.backend>elasticsearch</titan.index.backend> <titan.index.backend>elasticsearch</titan.index.backend>
<entity.repository.impl>org.apache.atlas.repository.audit.InMemoryEntityAuditRepository</entity.repository.impl> <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> <atlas.surefire.options></atlas.surefire.options>
</properties> </properties>
...@@ -519,6 +523,8 @@ ...@@ -519,6 +523,8 @@
<module>notification</module> <module>notification</module>
<module>client</module> <module>client</module>
<module>graphdb</module> <module>graphdb</module>
<module>shaded/hbase-client-shaded</module>
<module>shaded/hbase-server-shaded</module>
<module>repository</module> <module>repository</module>
<module>authorization</module> <module>authorization</module>
<module>catalog</module> <module>catalog</module>
...@@ -691,6 +697,10 @@ ...@@ -691,6 +697,10 @@
<groupId>commons-httpclient</groupId> <groupId>commons-httpclient</groupId>
<artifactId>*</artifactId> <artifactId>*</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
...@@ -711,6 +721,10 @@ ...@@ -711,6 +721,10 @@
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>*</artifactId> <artifactId>*</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
...@@ -745,6 +759,24 @@ ...@@ -745,6 +759,24 @@
<scope>test</scope> <scope>test</scope>
</dependency> </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 --> <!-- commons -->
<dependency> <dependency>
<groupId>commons-configuration</groupId> <groupId>commons-configuration</groupId>
...@@ -781,6 +813,12 @@ ...@@ -781,6 +813,12 @@
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<version>${guice.version}</version> <version>${guice.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -961,7 +999,7 @@ ...@@ -961,7 +999,7 @@
<artifactId>titan-hbase</artifactId> <artifactId>titan-hbase</artifactId>
<version>${titan.version}</version> <version>${titan.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId> <artifactId>hbase-client</artifactId>
...@@ -995,14 +1033,12 @@ ...@@ -995,14 +1033,12 @@
<artifactId>hbase-server</artifactId> <artifactId>hbase-server</artifactId>
<version>${hbase.version}</version> <version>${hbase.version}</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId> <artifactId>hbase-server</artifactId>
<version>${hbase.version}</version> <version>${hbase.version}</version>
<scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
...@@ -1015,7 +1051,6 @@ ...@@ -1015,7 +1051,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vividsolutions</groupId> <groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId> <artifactId>jts</artifactId>
...@@ -1147,14 +1182,25 @@ ...@@ -1147,14 +1182,25 @@
<type>war</type> <type>war</type>
</dependency> </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> <dependency>
<groupId>org.apache.atlas</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>atlas-graphdb-impls</artifactId> <artifactId>atlas-graphdb-impls</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>pom</type> <type>pom</type>
<!-- exclusions should be added here for all of the non-titan0 <!-- exclusions should be added here for all of the non-titan0 implementations -->
implementations -->
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
...@@ -1233,12 +1279,6 @@ ...@@ -1233,12 +1279,6 @@
<dependency> <dependency>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
<version>${scala.version}</version> <version>${scala.version}</version>
</dependency> </dependency>
...@@ -1256,20 +1296,14 @@ ...@@ -1256,20 +1296,14 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalamacros</groupId>
<artifactId>quasiquotes_${scala.binary.version}</artifactId>
<version>${scala.macros.version}</version>
</dependency>
<dependency>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId> <artifactId>json4s-native_${scala.binary.version}</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.nscala-time</groupId> <groupId>com.github.nscala-time</groupId>
<artifactId>nscala-time_2.10</artifactId> <artifactId>nscala-time_${scala.binary.version}</artifactId>
<version>1.6.0</version> <version>1.6.0</version>
</dependency> </dependency>
...@@ -1281,19 +1315,19 @@ ...@@ -1281,19 +1315,19 @@
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.10</artifactId> <artifactId>akka-actor_${scala.binary.version}</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.10</artifactId> <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.10</artifactId> <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
<version>${akka.version}</version> <version>${akka.version}</version>
</dependency> </dependency>
...@@ -1322,12 +1356,6 @@ ...@@ -1322,12 +1356,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${gson.version}</version> <version>${gson.version}</version>
...@@ -1416,6 +1444,12 @@ ...@@ -1416,6 +1444,12 @@
<artifactId>atlas-plugin-classloader</artifactId> <artifactId>atlas-plugin-classloader</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.101tec</groupId>
<artifactId>zkclient</artifactId>
<version>${zkclient.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
release-log.txt
...@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ...@@ -9,6 +9,7 @@ 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) ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES: ALL CHANGES:
ATLAS-1246 Upgrade versions of dependencies (shwethags)
ATLAS-1192 Atlas IE support (kevalbhatt) ATLAS-1192 Atlas IE support (kevalbhatt)
ATLAS-1273 Test testOnChangeRefresh in DefaultMetadataServiceTest is failing (ayubkhan via shwethags) 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) ATLAS-1272 updated types bootstrap to load from new format typedef JSON files (mneethiraj)
......
repository/pom.xml
...@@ -57,15 +57,13 @@ ...@@ -57,15 +57,13 @@
<artifactId>atlas-graphdb-api</artifactId> <artifactId>atlas-graphdb-api</artifactId>
</dependency> </dependency>
<dependency>
<dependency>
<groupId>org.apache.atlas</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>atlas-graphdb-impls</artifactId> <artifactId>atlas-graphdb-impls</artifactId>
<type>pom</type> <type>pom</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
...@@ -103,11 +101,6 @@ ...@@ -103,11 +101,6 @@
<dependency> <dependency>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
</dependency> </dependency>
...@@ -122,11 +115,6 @@ ...@@ -122,11 +115,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalamacros</groupId>
<artifactId>quasiquotes_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId> <groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId> <artifactId>jsonassert</artifactId>
</dependency> </dependency>
...@@ -142,34 +130,35 @@ ...@@ -142,34 +130,35 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>hbase-client</artifactId> <artifactId>atlas-typesystem</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>hbase-server</artifactId> <artifactId>atlas-typesystem</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>hbase-server</artifactId> <artifactId>atlas-intg</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.atlas</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>atlas-typesystem</artifactId> <artifactId>atlas-hbase-client-shaded</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.atlas</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>atlas-intg</artifactId> <artifactId>atlas-hbase-server-shaded</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -211,23 +200,6 @@ ...@@ -211,23 +200,6 @@
<jvmArg>-Xmx512m</jvmArg> <jvmArg>-Xmx512m</jvmArg>
<jvmArg>-XX:MaxPermSize=128m</jvmArg> <jvmArg>-XX:MaxPermSize=128m</jvmArg>
</jvmArgs> </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> </configuration>
</plugin> </plugin>
......
repository/src/main/java/org/apache/atlas/discovery/DataSetLineageService.java
...@@ -44,10 +44,12 @@ import org.slf4j.Logger; ...@@ -44,10 +44,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import scala.Option; import scala.Option;
import scala.Some; import scala.Some;
import scala.collection.JavaConversions;
import scala.collection.immutable.List; import scala.collection.immutable.List;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
/** /**
...@@ -59,8 +61,8 @@ public class DataSetLineageService implements LineageService { ...@@ -59,8 +61,8 @@ public class DataSetLineageService implements LineageService {
private static final Logger LOG = LoggerFactory.getLogger(DataSetLineageService.class); private static final Logger LOG = LoggerFactory.getLogger(DataSetLineageService.class);
private static final Option<List<String>> SELECT_ATTRIBUTES = private static final Option<List<String>> SELECT_ATTRIBUTES =
Some.<List<String>>apply(List.<String>fromArray(new String[]{AtlasClient.NAME, Some.apply(JavaConversions.asScalaBuffer(Arrays.asList(AtlasClient.NAME,
AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME})); AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME)).toList());
public static final String SELECT_INSTANCE_GUID = "__guid"; public static final String SELECT_INSTANCE_GUID = "__guid";
public static final String DATASET_SCHEMA_QUERY_PREFIX = "atlas.lineage.schema.query."; public static final String DATASET_SCHEMA_QUERY_PREFIX = "atlas.lineage.schema.query.";
......
shaded/hbase-client-shaded/pom.xml 0 → 100644
<?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>
shaded/hbase-server-shaded/pom.xml 0 → 100644
<?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>
typesystem/pom.xml
...@@ -49,11 +49,6 @@ ...@@ -49,11 +49,6 @@
<dependency> <dependency>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
</dependency> </dependency>
...@@ -68,18 +63,13 @@ ...@@ -68,18 +63,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalamacros</groupId>
<artifactId>quasiquotes_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId> <artifactId>json4s-native_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.nscala-time</groupId> <groupId>com.github.nscala-time</groupId>
<artifactId>nscala-time_2.10</artifactId> <artifactId>nscala-time_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
...@@ -88,11 +78,6 @@ ...@@ -88,11 +78,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
</dependency> </dependency>
...@@ -116,6 +101,7 @@ ...@@ -116,6 +101,7 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.atlas</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>atlas-intg</artifactId> <artifactId>atlas-intg</artifactId>
...@@ -159,23 +145,6 @@ ...@@ -159,23 +145,6 @@
<jvmArg>-Xmx512m</jvmArg> <jvmArg>-Xmx512m</jvmArg>
<jvmArg>-XX:MaxPermSize=128m</jvmArg> <jvmArg>-XX:MaxPermSize=128m</jvmArg>
</jvmArgs> </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> </configuration>
</plugin> </plugin>
......
webapp/pom.xml
...@@ -103,6 +103,12 @@ ...@@ -103,6 +103,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.atlas</groupId> <groupId>org.apache.atlas</groupId>
<artifactId>atlas-graphdb-impls</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-common</artifactId> <artifactId>atlas-common</artifactId>
</dependency> </dependency>
...@@ -141,6 +147,7 @@ ...@@ -141,6 +147,7 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId> <artifactId>hadoop-minikdc</artifactId>
...@@ -156,10 +163,20 @@ ...@@ -156,10 +163,20 @@
<artifactId>atlas-catalog</artifactId> <artifactId>atlas-catalog</artifactId>
</dependency> </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> <dependency>
<groupId>org.apache.atlas</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>atlas-graphdb-impls</artifactId> <artifactId>zookeeper</artifactId>
<type>pom</type>
</dependency> </dependency>
<!-- supports simple auth handler --> <!-- supports simple auth handler -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment