You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sp...@apache.org on 2017/05/09 19:11:41 UTC

ranger git commit: RANGER-1554: Upgrade springframework version in Ranger to 3.2.10.Release - ranger-0.7 branch

Repository: ranger
Updated Branches:
  refs/heads/ranger-0.7 ada188bb6 -> db075f111


RANGER-1554: Upgrade springframework version in Ranger to 3.2.10.Release - ranger-0.7 branch


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/db075f11
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/db075f11
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/db075f11

Branch: refs/heads/ranger-0.7
Commit: db075f111c89ce19e9dbb68886eb6c487ab6bd36
Parents: ada188b
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Tue May 9 12:11:34 2017 -0700
Committer: Sailaja Polavarapu <sp...@hortonworks.com>
Committed: Tue May 9 12:11:34 2017 -0700

----------------------------------------------------------------------
 kms/pom.xml                                           |  5 -----
 plugin-atlas/pom.xml                                  | 14 ++++++++++++++
 pom.xml                                               |  6 +++---
 ranger-atlas-plugin-shim/pom.xml                      | 14 ++++++++++++++
 security-admin/pom.xml                                |  5 -----
 .../handler/RangerAuthenticationProvider.java         |  3 +++
 .../conf.dist/security-applicationContext.xml         |  6 +++---
 .../src/main/webapp/META-INF/applicationContext.xml   | 12 ++++++------
 .../webapp/META-INF/asynctask-applicationContext.xml  | 12 ++++++------
 .../webapp/META-INF/scheduler-applicationContext.xml  | 12 ++++++------
 tagsync/pom.xml                                       | 14 ++++++++++++++
 11 files changed, 69 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/kms/pom.xml
----------------------------------------------------------------------
diff --git a/kms/pom.xml b/kms/pom.xml
index ad248d7..fa9ed0d 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -55,11 +55,6 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-asm</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>${springframework.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/plugin-atlas/pom.xml
----------------------------------------------------------------------
diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml
index 3fa42ec..9aee008 100644
--- a/plugin-atlas/pom.xml
+++ b/plugin-atlas/pom.xml
@@ -59,6 +59,20 @@
       		<groupId>org.apache.atlas</groupId>
       		<artifactId>atlas-common</artifactId>
       		<version>${atlas.version}</version>
+		<exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-asm</artifactId>
+                </exclusion>
+            </exclusions>
     	</dependency>
     	<dependency>
            <groupId>org.apache.solr</groupId>

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7358f9f..314332f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,9 +210,9 @@
         <snappy-java.version>1.0.4.1</snappy-java.version>
         <solr.version>5.5.1</solr.version>
         <spring-ldap-core.version>1.3.1.RELEASE</spring-ldap-core.version>
-        <springframework.security.version>3.1.3.RELEASE</springframework.security.version>
-        <springframework.test.version>3.1.3.RELEASE</springframework.test.version>
-        <springframework.version>3.1.3.RELEASE</springframework.version>
+        <springframework.security.version>3.2.10.RELEASE</springframework.security.version>
+        <springframework.test.version>3.2.10.RELEASE</springframework.test.version>
+        <springframework.version>3.2.10.RELEASE</springframework.version>
         <storm.version>1.0.2</storm.version>
         <sun-jersey-bundle.version>1.19</sun-jersey-bundle.version>
         <sun.jersey.bundle.version>1.4</sun.jersey.bundle.version>

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/ranger-atlas-plugin-shim/pom.xml
----------------------------------------------------------------------
diff --git a/ranger-atlas-plugin-shim/pom.xml b/ranger-atlas-plugin-shim/pom.xml
index d79a598..93051e0 100644
--- a/ranger-atlas-plugin-shim/pom.xml
+++ b/ranger-atlas-plugin-shim/pom.xml
@@ -79,6 +79,20 @@
       		<groupId>org.apache.atlas</groupId>
       		<artifactId>atlas-common</artifactId>
       		<version>${atlas.version}</version>
+		<exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-asm</artifactId>
+                </exclusion>
+            </exclusions>
     	</dependency>
       <dependency>
           <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/security-admin/pom.xml
----------------------------------------------------------------------
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index fd387a8..5a75924 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -169,11 +169,6 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-asm</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>${springframework.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
index 3fdd5c2..eccf0bc 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java
@@ -265,11 +265,14 @@ public class RangerAuthenticationProvider implements AuthenticationProvider {
 					"ranger.ldap.ad.domain", "");
 			String rangerLdapDefaultRole = PropertiesUtil.getProperty(
 					"ranger.ldap.default.role", "ROLE_USER");
+			String rangerLdapUserSearchFilter = PropertiesUtil.getProperty(
+                                       "ranger.ldap.ad.user.searchfilter", "(sAMAccountName={0})");
 
 			ActiveDirectoryLdapAuthenticationProvider adAuthenticationProvider = new ActiveDirectoryLdapAuthenticationProvider(
 					rangerADDomain, rangerADURL);
 			adAuthenticationProvider.setConvertSubErrorCodesToExceptions(true);
 			adAuthenticationProvider.setUseAuthenticationRequestCredentials(true);
+			adAuthenticationProvider.setSearchFilter(rangerLdapUserSearchFilter);
 
 			// Grab the user-name and password out of the authentication object.
 			String userName = authentication.getName();

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
index 43a0cf5..0dda56b 100644
--- a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
+++ b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
@@ -22,11 +22,11 @@ xmlns:security="http://www.springframework.org/schema/security"
 xmlns:util="http://www.springframework.org/schema/util"
 xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
 xsi:schemaLocation="http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
 http://www.springframework.org/schema/security
-http://www.springframework.org/schema/security/spring-security-3.1.xsd
+http://www.springframework.org/schema/security/spring-security-3.2.xsd
 http://www.springframework.org/schema/util
-http://www.springframework.org/schema/util/spring-util-3.1.xsd
+http://www.springframework.org/schema/util/spring-util-3.2.xsd
 http://www.springframework.org/schema/security/oauth2
 http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd">
 

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/security-admin/src/main/webapp/META-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/META-INF/applicationContext.xml b/security-admin/src/main/webapp/META-INF/applicationContext.xml
index 95d462b..79d20d3 100644
--- a/security-admin/src/main/webapp/META-INF/applicationContext.xml
+++ b/security-admin/src/main/webapp/META-INF/applicationContext.xml
@@ -21,17 +21,17 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.sp
 xmlns:task="http://www.springframework.org/schema/task" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:util="http://www.springframework.org/schema/util"
 xsi:schemaLocation="http://www.springframework.org/schema/aop
-http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
 http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
 http://www.springframework.org/schema/context
-http://www.springframework.org/schema/context/spring-context-3.1.xsd
+http://www.springframework.org/schema/context/spring-context-3.2.xsd
 http://www.springframework.org/schema/jee
-http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
+http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
 http://www.springframework.org/schema/tx
-http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
 http://www.springframework.org/schema/task
-http://www.springframework.org/schema/task/spring-task-3.1.xsd
+http://www.springframework.org/schema/task/spring-task-3.2.xsd
 http://www.springframework.org/schema/util
 http://www.springframework.org/schema/util/spring-util.xsd">
 

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/security-admin/src/main/webapp/META-INF/asynctask-applicationContext.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/META-INF/asynctask-applicationContext.xml b/security-admin/src/main/webapp/META-INF/asynctask-applicationContext.xml
index 12b7d29..10f1a84 100644
--- a/security-admin/src/main/webapp/META-INF/asynctask-applicationContext.xml
+++ b/security-admin/src/main/webapp/META-INF/asynctask-applicationContext.xml
@@ -21,17 +21,17 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.sp
 xmlns:task="http://www.springframework.org/schema/task"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
 xsi:schemaLocation="http://www.springframework.org/schema/aop
-http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
 http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
 http://www.springframework.org/schema/context
-http://www.springframework.org/schema/context/spring-context-3.1.xsd
+http://www.springframework.org/schema/context/spring-context-3.2.xsd
 http://www.springframework.org/schema/jee
-http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
+http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
 http://www.springframework.org/schema/tx
-http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
 http://www.springframework.org/schema/task
-http://www.springframework.org/schema/task/spring-task-3.1.xsd
+http://www.springframework.org/schema/task/spring-task-3.2.xsd
 http://www.springframework.org/schema/util
 http://www.springframework.org/schema/util/spring-util.xsd">
 

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/security-admin/src/main/webapp/META-INF/scheduler-applicationContext.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/META-INF/scheduler-applicationContext.xml b/security-admin/src/main/webapp/META-INF/scheduler-applicationContext.xml
index 5247259..a9fb632 100644
--- a/security-admin/src/main/webapp/META-INF/scheduler-applicationContext.xml
+++ b/security-admin/src/main/webapp/META-INF/scheduler-applicationContext.xml
@@ -21,17 +21,17 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.sp
 xmlns:task="http://www.springframework.org/schema/task"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
 xsi:schemaLocation="http://www.springframework.org/schema/aop
-http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
 http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
 http://www.springframework.org/schema/context
-http://www.springframework.org/schema/context/spring-context-3.1.xsd
+http://www.springframework.org/schema/context/spring-context-3.2.xsd
 http://www.springframework.org/schema/jee
-http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
+http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
 http://www.springframework.org/schema/tx
-http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
 http://www.springframework.org/schema/task
-http://www.springframework.org/schema/task/spring-task-3.1.xsd
+http://www.springframework.org/schema/task/spring-task-3.2.xsd
 http://www.springframework.org/schema/util
 http://www.springframework.org/schema/util/spring-util.xsd">
 

http://git-wip-us.apache.org/repos/asf/ranger/blob/db075f11/tagsync/pom.xml
----------------------------------------------------------------------
diff --git a/tagsync/pom.xml b/tagsync/pom.xml
index 76ff61f..10bf45b 100644
--- a/tagsync/pom.xml
+++ b/tagsync/pom.xml
@@ -128,6 +128,20 @@
             <groupId>org.apache.atlas</groupId>
             <artifactId>atlas-common</artifactId>
             <version>${atlas.version}</version>
+	    <exclusions>
+    		<exclusion>
+        	    <groupId>org.springframework</groupId>
+        	    <artifactId>spring-beans</artifactId>
+    		</exclusion>
+    		<exclusion>
+        	    <groupId>org.springframework</groupId>
+        	    <artifactId>spring-core</artifactId>
+    		</exclusion>
+    		<exclusion>
+        	    <groupId>org.springframework</groupId>
+        	    <artifactId>spring-asm</artifactId>
+    		</exclusion>
+	    </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>