You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2016/05/08 19:02:11 UTC
incubator-ranger git commit: RANGER-976: tagsync - update dependent
library versions
Repository: incubator-ranger
Updated Branches:
refs/heads/master af3361858 -> 96dc7f4b0
RANGER-976: tagsync - update dependent library versions
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/96dc7f4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/96dc7f4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/96dc7f4b
Branch: refs/heads/master
Commit: 96dc7f4b01740ca8d55995174b22fede099ebf8e
Parents: af33618
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Sat May 7 13:38:15 2016 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Sun May 8 11:38:07 2016 -0700
----------------------------------------------------------------------
pom.xml | 8 ++
src/main/assembly/tagsync.xml | 98 +++++++-------------
tagsync/pom.xml | 38 ++++----
.../tagsync/source/atlas/AtlasTagSource.java | 2 +-
4 files changed, 64 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/96dc7f4b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 063a86b..eda7d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,10 @@
<asm.version>3.1</asm.version>
<aspectj.version>1.8.2</aspectj.version>
<atlas.version>0.7-incubating-SNAPSHOT</atlas.version>
+ <atlas.guava.version>14.0</atlas.guava.version>
+ <atlas.gson.version>2.5</atlas.gson.version>
+ <atlas.jettison.version>1.3.7</atlas.jettison.version>
+ <atlas.commons.logging.version>1.1.3</atlas.commons.logging.version>
<avatica.version>1.7.1</avatica.version>
<c3p0.version>0.9.1.2</c3p0.version>
<calcite.version>0.9.2-incubating</calcite.version>
@@ -149,6 +153,7 @@
<googlecode.log4jdbc.version>1.2</googlecode.log4jdbc.version>
<gson.version>2.2.4</gson.version>
<guava.version>11.0.2</guava.version>
+ <guice.version>4.0</guice.version>
<hadoop-auth.version>2.7.0</hadoop-auth.version>
<hadoop-common-kms.version>2.7.0</hadoop-common-kms.version>
<hadoop-common.version>2.7.0</hadoop-common.version>
@@ -165,6 +170,7 @@
<javassist.version>3.12.1.GA</javassist.version>
<javax.persistence.version>2.1.0</javax.persistence.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
+ <javax-inject.version>1</javax-inject.version>
<jaxb-api.version>2.2.2</jaxb-api.version>
<jaxb-impl.version>2.2.3-1</jaxb-impl.version>
<jericho.html.version>3.3</jericho.html.version>
@@ -174,6 +180,7 @@
<jettison.version>1.1</jettison.version>
<jline.version>0.9.94</jline.version>
<jsch.version>0.1.42</jsch.version>
+ <json.version>3.2.11</json.version>
<jsr305.version>1.3.9</jsr305.version>
<junit.version>4.12</junit.version>
<kafka.version>0.9.0.0</kafka.version>
@@ -192,6 +199,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<protobuf-java.version>2.5.0</protobuf-java.version>
<ranger.solrj.version>${project.version}</ranger.solrj.version>
+ <scala.version>2.10.4</scala.version>
<security-agent-install-dir>hadoop-security/plugins</security-agent-install-dir>
<servlet.api.version>2.5</servlet.api.version>
<slf4j-api.version>1.7.5</slf4j-api.version>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/96dc7f4b/src/main/assembly/tagsync.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/tagsync.xml b/src/main/assembly/tagsync.xml
index e2787c5..e8b7276 100644
--- a/src/main/assembly/tagsync.xml
+++ b/src/main/assembly/tagsync.xml
@@ -34,82 +34,52 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>com.google.code.gson:gson</include>
- <include>com.sun.jersey:jersey-bundle</include>
- <include>log4j:log4j</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-configuration:commons-configuration</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-logging:commons-logging</include>
- <include>com.google.guava:guava</include>
+ <include>com.google.code.gson:gson:jar:${gson.version}</include>
+ <include>com.google.guava:guava:jar:${google.guava.version}</include>
+ <include>com.google.inject:guice:jar:${guice.version}</include>
+ <include>com.google.inject.extensions:guice-multibindings:jar:${guice.version}</include>
+ <include>com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version}</include>
+ <include>com.thoughtworks.paranamer:paranamer:jar:${paranamer.version}</include>
+ <include>org.apache.atlas:atlas-notification:jar:${atlas.version}</include>
+ <include>org.apache.atlas:atlas-typesystem:jar:${atlas.version}</include>
+ <include>org.apache.atlas:atlas-client:jar:${atlas.version}</include>
+ <include>org.apache.atlas:atlas-common:jar:${atlas.version}</include>
<include>org.apache.hadoop:hadoop-auth</include>
- <include>org.slf4j:slf4j-api</include>
<include>org.apache.hadoop:hadoop-common</include>
- <include>org.apache.commons:commons-csv</include>
- <include>commons-io:commons-io:jar:${commons.io.version}</include>
- <include>org.apache.htrace:htrace-core</include>
- <include>org.codehaus.jackson:jackson-core-asl</include>
- <include>org.codehaus.jackson:jackson-jaxrs</include>
- <include>org.codehaus.jackson:jackson-mapper-asl</include>
- <include>org.codehaus.jackson:jackson-xc</include>
- <include>org.apache.atlas:atlas-notification</include>
- <include>org.apache.atlas:atlas-typesystem</include>
- <include>org.apache.atlas:atlas-client</include>
- <include>org.apache.atlas:atlas-common</include>
- <include>com.google.inject:guice</include>
- <include>com.google.inject.extensions:guice-multibindings</include>
- <include>org.codehaus.jettison:jettison</include>
- <include>aopalliance:aopalliance</include>
- <include>javax.inject:javax.inject</include>
- <include>org.apache.kafka:kafka_2.10</include>
- <include>org.apache.kafka:kafka-clients</include>
- <include>com.yammer.metrics:metrics-core</include>
- <include>org.json4s:json4s-native_2.10</include>
- <include>org.json4s:json4s-core_2.10</include>
- <include>org.json4s:json4s-ast_2.10</include>
- <include>com.thoughtworks.paranamer:paranamer</include>
- <include>org.scala-lang:scala-library</include>
- <include>org.scala-lang:scalap</include>
- <include>org.scala-lang:scala-compiler</include>
- <include>org.scala-lang:scala-reflect</include>
- <include>com.101tec:zkclient</include>
- <include>org.apache.zookeeper:zookeeper</include>
- <include>org.apache.ranger:ranger-plugins-common</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
- <outputDirectory>/dist</outputDirectory>
- </binaries>
- <includes>
- <include>org.apache.ranger:ranger-tagsync</include>
- </includes>
- </moduleSet>
- <moduleSet>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <directoryMode>755</directoryMode>
- <fileMode>644</fileMode>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
+ <include>org.apache.kafka:kafka_2.10:jar:${kafka.version}</include>
+ <include>org.apache.kafka:kafka-clients:jar:${kafka.version}</include>
<include>org.apache.ranger:credentialbuilder</include>
+ <include>org.apache.ranger:ranger-plugins-common</include>
<include>org.apache.ranger:ranger-util</include>
+ <include>org.codehaus.jettison:jettison:jar:${jettison.version}</include>
+ <include>org.json4s:json4s-native_2.10:jar:${json.version}</include>
+ <include>org.json4s:json4s-core_2.10:jar:${json.version}</include>
+ <include>org.json4s:json4s-ast_2.10:jar:${json.version}</include>
+ <include>org.scala-lang:scala-library:jar:${scala.version}</include>
+ <include>org.scala-lang:scalap:jar:${scala.version}</include>
+ <include>org.scala-lang:scala-compiler:jar:${scala.version}</include>
+ <include>org.scala-lang:scala-reflect:jar:${scala.version}</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>aopalliance:aopalliance:jar:${aopalliance.version}</include>
+ <include>commons-cli:commons-cli:jar:${commons.cli.version}</include>
+ <include>commons-collections:commons-collections:jar:${commons.collections.version}</include>
+ <include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include>
+ <include>commons-io:commons-io:jar:${commons.io.version}</include>
+ <include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
+ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
+ <include>javax.inject:javax.inject:jar:${javax-inject.version}</include>
+ <include>log4j:log4j:jar:${log4j.version}</include>
</includes>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>/dist</outputDirectory>
</binaries>
<includes>
- <include>org.apache.ranger:credentialbuilder</include>
- <include>org.apache.ranger:ranger-util</include>
+ <include>org.apache.ranger:ranger-tagsync</include>
</includes>
</moduleSet>
- </moduleSets>
+ </moduleSets>
<fileSets>
<fileSet>
<directoryMode>755</directoryMode>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/96dc7f4b/tagsync/pom.xml
----------------------------------------------------------------------
diff --git a/tagsync/pom.xml b/tagsync/pom.xml
index 87580fc..33b8513 100644
--- a/tagsync/pom.xml
+++ b/tagsync/pom.xml
@@ -26,19 +26,6 @@
<groupId>org.apache.ranger</groupId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <!--
- <repositories>
-
-
- <repository>
- <id>repo</id>
- <url>file://${basedir}/../local-repo</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -46,6 +33,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -55,6 +43,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
+ <version>${gson.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -88,28 +77,33 @@
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
+ <artifactId>credentialbuilder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
- <artifactId>credentialbuilder</artifactId>
+ <artifactId>ranger-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>4.0</version>
+ <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
- <version>4.0</version>
+ <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.1</version>
+ <version>${jettison.version}</version>
</dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
@@ -131,5 +125,15 @@
<artifactId>atlas-common</artifactId>
<version>${atlas.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka_2.10</artifactId>
+ <version>${kafka.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>${kafka.version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/96dc7f4b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
----------------------------------------------------------------------
diff --git a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
index af19823..fe54cd4 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
@@ -188,7 +188,7 @@ public class AtlasTagSource extends AbstractTagSource {
ServiceTags serviceTags = AtlasNotificationMapper.processEntityNotification(notification);
if (serviceTags == null) {
- LOG.error("Failed to create ServiceTags for notification :" + getPrintableEntityNotification(notification));
+ LOG.error("No ServiceTags built for notification :" + getPrintableEntityNotification(notification));
} else {
updateSink(serviceTags);
}