Repository: ranger Updated Branches: refs/heads/ranger-1.2 17af78178 -> 2ac952ba2
RANGER-2140: Upgrade spring and guava libraries Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/2ac952ba Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/2ac952ba Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/2ac952ba Branch: refs/heads/ranger-1.2 Commit: 2ac952ba27736d9db06a94326af1db6ff64afae8 Parents: 17af781 Author: pradeep <prad...@apache.org> Authored: Fri Jun 22 12:45:06 2018 +0530 Committer: Pradeep <prad...@apache.org> Committed: Tue Oct 9 11:47:34 2018 +0530 ---------------------------------------------------------------------- kms/pom.xml | 2 +- knox-agent/src/test/resources/log4j.properties | 2 +- plugin-atlas/pom.xml | 2 +- pom.xml | 10 ++++------ src/main/assembly/kms.xml | 4 ++-- src/main/assembly/plugin-atlas.xml | 4 ++-- src/main/assembly/plugin-kms.xml | 4 ++-- src/main/assembly/plugin-solr.xml | 4 ++-- ugsync/pom.xml | 2 +- unixauthclient/pom.xml | 2 +- unixauthservice/pom.xml | 2 +- 11 files changed, 18 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/kms/pom.xml ---------------------------------------------------------------------- diff --git a/kms/pom.xml b/kms/pom.xml index e1d62d2..a7ef56d 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -115,7 +115,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> + <version>${google.guava.version}</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/knox-agent/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/knox-agent/src/test/resources/log4j.properties b/knox-agent/src/test/resources/log4j.properties index 2c9f1b2..5c86143 100644 --- a/knox-agent/src/test/resources/log4j.properties +++ b/knox-agent/src/test/resources/log4j.properties @@ -14,7 +14,7 @@ # limitations under the License. # Define some default values that can be overridden by system properties -#ranger.root.logger=WARN,console +ranger.root.logger=WARN,console # Define the root logger to the system property "hbase.root.logger". log4j.rootLogger=${ranger.root.logger} http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/plugin-atlas/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml index abfe42f..3ac5d03 100644 --- a/plugin-atlas/pom.xml +++ b/plugin-atlas/pom.xml @@ -82,7 +82,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${atlas.guava.version}</version> + <version>${google.guava.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3544196..351cd15 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,6 @@ <asm.all.version>3.2</asm.all.version> <aspectj.version>1.8.2</aspectj.version> <atlas.version>1.1.0</atlas.version> - <atlas.guava.version>14.0</atlas.guava.version> <atlas.gson.version>2.5</atlas.gson.version> <atlas.jackson.version>2.9.2</atlas.jackson.version> <atlas.jettison.version>1.3.7</atlas.jettison.version> @@ -157,10 +156,9 @@ <derby.version>10.11.1.1</derby.version> <eclipse.jpa.version>2.5.2</eclipse.jpa.version> <findbugs.plugin.version>3.0.3</findbugs.plugin.version> - <google.guava.version>17.0</google.guava.version> + <google.guava.version>25.1-jre</google.guava.version> <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.version>2.7.1</hadoop.version> <hamcrest.all.version>1.3</hamcrest.all.version> @@ -210,9 +208,9 @@ <slf4j-api.version>1.7.5</slf4j-api.version> <solr.version>5.5.4</solr.version> <spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version> - <springframework.security.version>4.2.4.RELEASE</springframework.security.version> - <springframework.test.version>4.3.14.RELEASE</springframework.test.version> - <springframework.version>4.3.14.RELEASE</springframework.version> + <springframework.security.version>4.2.7.RELEASE</springframework.security.version> + <springframework.test.version>4.3.18.RELEASE</springframework.test.version> + <springframework.version>4.3.18.RELEASE</springframework.version> <sqoop.version>1.99.7</sqoop.version> <storm.version>1.2.0</storm.version> <sun-jersey-bundle.version>1.19</sun-jersey-bundle.version> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 7fbc141..ed818b1 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -207,7 +207,7 @@ <include>org.eclipse.persistence:javax.persistence</include> <include>commons-collections:commons-collections</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> - <include>com.google.guava:guava:jar:${guava.version}</include> + <include>com.google.guava:guava:jar:${google.guava.version}</include> <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} </include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include> @@ -229,7 +229,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:jar:${commons.logging.version}</include> - <include>com.google.guava:guava:jar:${guava.version}</include> + <include>com.google.guava:guava:jar:${google.guava.version}</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/src/main/assembly/plugin-atlas.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-atlas.xml b/src/main/assembly/plugin-atlas.xml index 8f4a64c..35096d0 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:${atlas.guava.version}</include> + <include>com.google.guava:guava:jar:${google.guava.version}</include> <include>org.codehaus.jackson:jackson-jaxrs</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include> <include>org.apache.solr:solr-solrj</include> @@ -74,7 +74,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:${atlas.guava.version}</include> + <include>com.google.guava:guava:jar:${google.guava.version}</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/src/main/assembly/plugin-kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kms.xml b/src/main/assembly/plugin-kms.xml index 6d15f2a..53cf302 100755 --- a/src/main/assembly/plugin-kms.xml +++ b/src/main/assembly/plugin-kms.xml @@ -55,7 +55,7 @@ <include>org.eclipse.persistence:javax.persistence</include> <include>commons-collections:commons-collections</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> - <include>com.google.guava:guava:jar:${guava.version}</include> + <include>com.google.guava:guava:jar:${google.guava.version}</include> <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include> <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include> @@ -76,7 +76,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:jar:${commons.logging.version}</include> - <include>com.google.guava:guava:jar:${guava.version}</include> + <include>com.google.guava:guava:jar:${google.guava.version}</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/src/main/assembly/plugin-solr.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-solr.xml b/src/main/assembly/plugin-solr.xml index de30bfb..f5fb0a7 100644 --- a/src/main/assembly/plugin-solr.xml +++ b/src/main/assembly/plugin-solr.xml @@ -47,7 +47,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:${google.guava.version}</include> <include>org.codehaus.jackson:jackson-core-asl</include> <include>org.codehaus.jackson:jackson-jaxrs</include> <include>org.codehaus.jackson:jackson-mapper-asl</include> @@ -69,7 +69,7 @@ <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:${google.guava.version}</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version} </include> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/ugsync/pom.xml ---------------------------------------------------------------------- diff --git a/ugsync/pom.xml b/ugsync/pom.xml index 5c341da..303757b 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> + <version>${google.guava.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/unixauthclient/pom.xml ---------------------------------------------------------------------- diff --git a/unixauthclient/pom.xml b/unixauthclient/pom.xml index 695fbc4..b1d2973 100644 --- a/unixauthclient/pom.xml +++ b/unixauthclient/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> + <version>${google.guava.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/ranger/blob/2ac952ba/unixauthservice/pom.xml ---------------------------------------------------------------------- diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml index 974a781..bf59105 100644 --- a/unixauthservice/pom.xml +++ b/unixauthservice/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> + <version>${google.guava.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId>
