KYLIN-2879 Upgrade Spring to 4.3 and Spring-Security to 4.2 to fix vulnerability
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/13293bad Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/13293bad Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/13293bad Branch: refs/heads/master Commit: 13293bad2ce503a35339a5c4ec5bc532684efb48 Parents: 8f3f459 Author: Billy Liu <billy...@apache.org> Authored: Tue Sep 19 09:45:40 2017 +0800 Committer: liyang-gmt8 <liy...@apache.org> Committed: Tue Sep 19 22:03:56 2017 +0800 ---------------------------------------------------------------------- pom.xml | 8 ++++---- server/src/main/resources/applicationContext.xml | 10 +++++----- server/src/main/resources/kylinSecurity.xml | 6 +++--- tool/pom.xml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/13293bad/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dca75bb..fc81e7a 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ <commons-cli.version>1.2</commons-cli.version> <commons-lang.version>2.6</commons-lang.version> <commons-io.version>2.4</commons-io.version> - <commons-upload.version>1.3.1</commons-upload.version> + <commons-upload.version>1.3.3</commons-upload.version> <commons-math3.version>3.1.1</commons-math3.version> <commons-collections.version>3.2.2</commons-collections.version> @@ -99,7 +99,7 @@ <!-- Commons --> <commons-lang3.version>3.4</commons-lang3.version> - <commons-email.version>1.4</commons-email.version> + <commons-email.version>1.5</commons-email.version> <!-- Utility --> <log4j.version>1.2.17</log4j.version> @@ -118,8 +118,8 @@ <dropwizard.version>3.1.2</dropwizard.version> <!-- REST Service, ref https://github.com/spring-projects/spring-boot/blob/v1.3.8.RELEASE/spring-boot-dependencies/pom.xml --> <spring.boot.version>1.3.8.RELEASE</spring.boot.version> - <spring.framework.version>4.2.8.RELEASE</spring.framework.version> - <spring.framework.security.version>4.0.4.RELEASE</spring.framework.security.version> + <spring.framework.version>4.3.10.RELEASE</spring.framework.version> + <spring.framework.security.version>4.2.3.RELEASE</spring.framework.security.version> <spring.framework.security.extensions.version>1.0.2.RELEASE</spring.framework.security.extensions.version> <opensaml.version>2.6.4</opensaml.version> <aspectj.version>1.8.9</aspectj.version> http://git-wip-us.apache.org/repos/asf/kylin/blob/13293bad/server/src/main/resources/applicationContext.xml ---------------------------------------------------------------------- diff --git a/server/src/main/resources/applicationContext.xml b/server/src/main/resources/applicationContext.xml index 88286b5..c39ec5b 100644 --- a/server/src/main/resources/applicationContext.xml +++ b/server/src/main/resources/applicationContext.xml @@ -21,15 +21,15 @@ xmlns:cache="http://www.springframework.org/schema/cache" xmlns:p="http://www.springframework.org/schema/p" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/context/spring-context-4.3.xsd http://www.springframework.org/schema/task - http://www.springframework.org/schema/task/spring-task-4.2.xsd + http://www.springframework.org/schema/task/spring-task-4.3.xsd http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd + http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-4.2.xsd + http://www.springframework.org/schema/aop/spring-aop-4.3.xsd http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"> http://git-wip-us.apache.org/repos/asf/kylin/blob/13293bad/server/src/main/resources/kylinSecurity.xml ---------------------------------------------------------------------- diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml index 856fb5e..ca49255 100644 --- a/server/src/main/resources/kylinSecurity.xml +++ b/server/src/main/resources/kylinSecurity.xml @@ -17,11 +17,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-4.0.xsd + http://www.springframework.org/schema/security/spring-security-4.2.xsd http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util-4.2.xsd + http://www.springframework.org/schema/util/spring-util-4.3.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> http://git-wip-us.apache.org/repos/asf/kylin/blob/13293bad/tool/pom.xml ---------------------------------------------------------------------- diff --git a/tool/pom.xml b/tool/pom.xml index d87d0fd..62eaf16 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -33,7 +33,7 @@ </parent> <properties> - <spring.framework.version>4.2.8.RELEASE</spring.framework.version> + <spring.framework.version>4.3.10.RELEASE</spring.framework.version> </properties> <dependencies>