Merge branch 'master' into stack
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/9a81396a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/9a81396a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/9a81396a Branch: refs/heads/stack Commit: 9a81396ab5c67ee5a12c4902f91c709dd04470df Parents: 8a0dab3 765266e Author: Madhan Neethiraj <[email protected]> Authored: Mon Jan 19 23:08:57 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Jan 19 23:08:57 2015 -0800 ---------------------------------------------------------------------- agents-impl/pom.xml | 36 +++++++++++ hive-agent/pom.xml | 36 +++++++++++ lookup-client/pom.xml | 38 +++++++++++ pom.xml | 149 ++++++++++++++++++++++++++++++++++++++++---- security-admin/pom.xml | 2 + 5 files changed, 250 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a81396a/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 6dc5247,9e4e151..4e3a17d --- a/pom.xml +++ b/pom.xml @@@ -49,9 -91,10 +91,11 @@@ <module>ugsync</module> <module>unixauthclient</module> <module>unixauthservice</module> + <module>plugin-common</module> </modules> <properties> + <javac.source.version>1.7</javac.source.version> + <javac.target.version>1.7</javac.target.version> <antlr.version>3.5.2</antlr.version> <aopalliance.version>1.0</aopalliance.version> <asm.version>3.1</asm.version> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a81396a/security-admin/pom.xml ---------------------------------------------------------------------- diff --cc security-admin/pom.xml index d602b47,32d15d3..58bf71f --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@@ -412,11 -412,13 +412,13 @@@ <version>${hive.version}</version> <scope>runtime</scope> </dependency> + <!-- <dependency> - <groupId>cn.guoyukun.jdbc</groupId> - <artifactId>oracle-ojdbc6</artifactId> - <version>11.2.0.3.0</version> + <groupId>org.apache.ranger</groupId> + <artifactId>plugin-common</artifactId> + <version>0.4.0</version> </dependency> + --> </dependencies> <build> <pluginManagement>
