Repository: incubator-ranger Updated Branches: refs/heads/master 8762a8c79 -> 87fe3446d
RANGER-1101: jceks keystore is not created successfully after enabling ssl for atlas ranger plugin Signed-off-by: Gautam Borad <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/87fe3446 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/87fe3446 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/87fe3446 Branch: refs/heads/master Commit: 87fe3446d988b72e24467c427ba31ac9d3174de2 Parents: 8762a8c Author: Mehul Parikh <[email protected]> Authored: Fri Jul 15 11:57:46 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Fri Jul 15 17:08:31 2016 +0530 ---------------------------------------------------------------------- plugin-atlas/pom.xml | 7 ++++++- src/main/assembly/plugin-atlas.xml | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87fe3446/plugin-atlas/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml index 3f2485a..7f2c0f9 100644 --- a/plugin-atlas/pom.xml +++ b/plugin-atlas/pom.xml @@ -75,7 +75,12 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${atlas.guava.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87fe3446/src/main/assembly/plugin-atlas.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-atlas.xml b/src/main/assembly/plugin-atlas.xml index d519e24..6e78db5 100644 --- a/src/main/assembly/plugin-atlas.xml +++ b/src/main/assembly/plugin-atlas.xml @@ -52,7 +52,7 @@ <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include> <include>com.sun.jersey:jersey-bundle</include> - <include>com.google.guava:guava:jar:${guava.version}</include> + <include>com.google.guava:guava:jar:${atlas.guava.version}</include> <include>org.codehaus.jackson:jackson-jaxrs</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include> <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> @@ -72,7 +72,7 @@ <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</include> - <include>com.google.guava:guava:jar:${guava.version}</include> + <include>com.google.guava:guava:jar:${atlas.guava.version}</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include>
