root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

This commit is contained in:
Juergen Hoeller 2019-04-25 14:55:04 +02:00
parent 29d021ae3c 42fda0ba15
commit ad497c259a
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -34,18 +34,18 @@ ext {
groovyVersion = "2.5.6" groovyVersion = "2.5.6"
hsqldbVersion = "2.4.1" hsqldbVersion = "2.4.1"
jackson2Version = "2.9.8" jackson2Version = "2.9.8"
jettyVersion = "9.4.15.v20190215" jettyVersion = "9.4.17.v20190418"
junit5Version = "5.4.2" junit5Version = "5.4.2"
kotlinVersion = "1.3.30" kotlinVersion = "1.3.30"
log4jVersion = "2.11.2" log4jVersion = "2.11.2"
nettyVersion = "4.1.34.Final" nettyVersion = "4.1.35.Final"
reactorVersion = "Dysprosium-BUILD-SNAPSHOT" reactorVersion = "Dysprosium-BUILD-SNAPSHOT"
rxjavaVersion = "1.3.8" rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1" rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.2.8" rxjava2Version = "2.2.8"
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8" tiles3Version = "3.0.8"
tomcatVersion = "9.0.17" tomcatVersion = "9.0.19"
undertowVersion = "2.0.20.Final" undertowVersion = "2.0.20.Final"
gradleScriptDir = "${rootProject.projectDir}/gradle" gradleScriptDir = "${rootProject.projectDir}/gradle"

4
spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
View File

@ -177,8 +177,8 @@ public class SimpleApplicationEventMulticaster extends AbstractApplicationEventM
// Possibly a lambda-defined listener which we could not resolve the generic event type for // Possibly a lambda-defined listener which we could not resolve the generic event type for
// -> let's suppress the exception and just log a debug message. // -> let's suppress the exception and just log a debug message.
Log logger = LogFactory.getLog(getClass()); Log logger = LogFactory.getLog(getClass());
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Non-matching event type for listener: " + listener, ex); logger.trace("Non-matching event type for listener: " + listener, ex);
} }
} }
else { else {

4
spring-web/spring-web.gradle
View File

@ -38,7 +38,7 @@ dependencies {
exclude group: "javax.servlet", module: "javax.servlet-api" exclude group: "javax.servlet", module: "javax.servlet-api"
} }
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
optional("com.squareup.okhttp3:okhttp:3.14.0") optional("com.squareup.okhttp3:okhttp:3.14.1")
optional("org.apache.httpcomponents:httpclient:4.5.8") { optional("org.apache.httpcomponents:httpclient:4.5.8") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
@ -75,7 +75,7 @@ dependencies {
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") testCompile("com.squareup.okhttp3:mockwebserver:3.14.1")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2") testCompile("org.xmlunit:xmlunit-matchers:2.6.2")

2
spring-webflux/spring-webflux.gradle
View File

@ -54,7 +54,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") testCompile("com.squareup.okhttp3:mockwebserver:3.14.1")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testCompile(project(":spring-core-coroutines")) testCompile(project(":spring-core-coroutines"))
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")

8
spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -554,8 +554,9 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
/** /**
* Determine whether the given model element value is eligible for exposure. * Determine whether the given model element value is eligible for exposure.
* <p>The default implementation considers primitives, Strings, Numbers, Dates, * <p>The default implementation considers primitives, strings, numbers, dates,
* URIs, URLs and Locale objects as eligible. This can be overridden in subclasses. * URIs, URLs etc as eligible, according to {@link BeanUtils#isSimpleValueType}.
* This can be overridden in subclasses.
* @param value the model element value * @param value the model element value
* @return whether the element value is eligible * @return whether the element value is eligible
* @see BeanUtils#isSimpleValueType * @see BeanUtils#isSimpleValueType
@ -572,7 +573,6 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
* @return the encoded output String * @return the encoded output String
* @throws UnsupportedEncodingException if thrown by the JDK URLEncoder * @throws UnsupportedEncodingException if thrown by the JDK URLEncoder
* @see java.net.URLEncoder#encode(String, String) * @see java.net.URLEncoder#encode(String, String)
* @see java.net.URLEncoder#encode(String)
*/ */
protected String urlEncode(String input, String encodingScheme) throws UnsupportedEncodingException { protected String urlEncode(String input, String encodingScheme) throws UnsupportedEncodingException {
return URLEncoder.encode(input, encodingScheme); return URLEncoder.encode(input, encodingScheme);