mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-05-29 16:22:12 +00:00
Version bumps for Spring 5
Issue gh-4080
This commit is contained in:
parent
a18707c870
commit
08c1f500a7
@ -27,8 +27,8 @@ allprojects {
|
|||||||
|
|
||||||
ext.releaseBuild = version.endsWith('RELEASE')
|
ext.releaseBuild = version.endsWith('RELEASE')
|
||||||
ext.snapshotBuild = version.endsWith('SNAPSHOT')
|
ext.snapshotBuild = version.endsWith('SNAPSHOT')
|
||||||
ext.springVersion = '4.3.2.RELEASE'
|
ext.springVersion = '4.3.3.RELEASE'
|
||||||
ext.springLdapVersion = '2.0.2.RELEASE'
|
ext.springLdapVersion = '2.2.0.RC1'
|
||||||
|
|
||||||
group = 'org.springframework.security'
|
group = 'org.springframework.security'
|
||||||
|
|
||||||
|
@ -39,8 +39,8 @@ dependencies {
|
|||||||
"org.springframework:spring-orm:$springVersion",
|
"org.springframework:spring-orm:$springVersion",
|
||||||
"org.springframework:spring-tx:$springVersion",
|
"org.springframework:spring-tx:$springVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"org.eclipse.persistence:javax.persistence:2.0.5",
|
"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
|
||||||
"org.hibernate:hibernate-entitymanager:4.1.0.Final",
|
"org.hibernate:hibernate-entitymanager:$hibernateVersion",
|
||||||
"org.codehaus.groovy:groovy-all:$groovyVersion",
|
"org.codehaus.groovy:groovy-all:$groovyVersion",
|
||||||
"org.apache.directory.server:apacheds-core:$apacheDsVersion",
|
"org.apache.directory.server:apacheds-core:$apacheDsVersion",
|
||||||
"org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
|
"org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
|
||||||
@ -50,7 +50,6 @@ dependencies {
|
|||||||
'org.apache.directory.shared:shared-ldap:0.9.15',
|
'org.apache.directory.shared:shared-ldap:0.9.15',
|
||||||
'ldapsdk:ldapsdk:4.1',
|
'ldapsdk:ldapsdk:4.1',
|
||||||
powerMockDependencies,
|
powerMockDependencies,
|
||||||
"org.hibernate:hibernate-entitymanager:3.6.10.Final",
|
|
||||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||||
spockDependencies
|
spockDependencies
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class SpringSecurityCoreVersion {
|
|||||||
*/
|
*/
|
||||||
public static final long SERIAL_VERSION_UID = 420L;
|
public static final long SERIAL_VERSION_UID = 420L;
|
||||||
|
|
||||||
static final String MIN_SPRING_VERSION = "4.3.2.RELEASE";
|
static final String MIN_SPRING_VERSION = "4.3.3.RELEASE";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
performVersionChecks();
|
performVersionChecks();
|
||||||
|
@ -19,14 +19,17 @@ ext.ehcacheVersion = '2.9.0'
|
|||||||
ext.gebVersion = '0.10.0'
|
ext.gebVersion = '0.10.0'
|
||||||
ext.groovyVersion = '2.4.4'
|
ext.groovyVersion = '2.4.4'
|
||||||
ext.hsqlVersion = '2.3.2'
|
ext.hsqlVersion = '2.3.2'
|
||||||
ext.jacksonDatavindVersion = '2.4.4'
|
ext.hibernateVersion = '5.0.11.Final'
|
||||||
|
ext.hibernateValidatorVersion = '5.2.4.Final'
|
||||||
|
ext.jacksonDatavindVersion = '2.8.3'
|
||||||
|
ext.javaPersistenceVersion = '2.1.1'
|
||||||
ext.jettyVersion = '6.1.26'
|
ext.jettyVersion = '6.1.26'
|
||||||
ext.jstlVersion = '1.2.1'
|
ext.jstlVersion = '1.2.1'
|
||||||
ext.junitVersion = '4.12'
|
ext.junitVersion = '4.12'
|
||||||
ext.logbackVersion = '1.1.2'
|
ext.logbackVersion = '1.1.2'
|
||||||
ext.powerMockVersion = '1.6.2'
|
ext.powerMockVersion = '1.6.2'
|
||||||
ext.seleniumVersion = '2.44.0'
|
ext.seleniumVersion = '2.44.0'
|
||||||
ext.servletApiVersion = '3.0.1'
|
ext.servletApiVersion = '3.1.0'
|
||||||
ext.slf4jVersion = '1.7.7'
|
ext.slf4jVersion = '1.7.7'
|
||||||
ext.spockVersion = '0.7-groovy-2.0'
|
ext.spockVersion = '0.7-groovy-2.0'
|
||||||
ext.springDataCommonsVersion = '1.12.2.RELEASE'
|
ext.springDataCommonsVersion = '1.12.2.RELEASE'
|
||||||
@ -36,6 +39,7 @@ ext.springSessionVersion = '1.2.1.RELEASE'
|
|||||||
ext.springBootVersion = '1.4.0.RELEASE'
|
ext.springBootVersion = '1.4.0.RELEASE'
|
||||||
ext.thymeleafVersion = '2.1.5.RELEASE'
|
ext.thymeleafVersion = '2.1.5.RELEASE'
|
||||||
ext.jsonassertVersion = '1.3.0'
|
ext.jsonassertVersion = '1.3.0'
|
||||||
|
ext.validationApiVersion = '1.1.0.Final'
|
||||||
|
|
||||||
ext.spockDependencies = [
|
ext.spockDependencies = [
|
||||||
dependencies.create("org.spockframework:spock-spring:$spockVersion") {
|
dependencies.create("org.spockframework:spock-spring:$spockVersion") {
|
||||||
|
@ -13,7 +13,6 @@ dependencies {
|
|||||||
"org.mortbay.jetty:jetty-util:$jettyVersion",
|
"org.mortbay.jetty:jetty-util:$jettyVersion",
|
||||||
"org.testng:testng:6.8.21"
|
"org.testng:testng:6.8.21"
|
||||||
testCompile ("org.mortbay.jetty:jetty:$jettyVersion") {
|
testCompile ("org.mortbay.jetty:jetty:$jettyVersion") {
|
||||||
exclude group: 'org.mortbay.jetty', module: 'servlet-api'
|
|
||||||
}
|
}
|
||||||
testCompile ('net.sourceforge.jwebunit:jwebunit-core:2.2') {
|
testCompile ('net.sourceforge.jwebunit:jwebunit-core:2.2') {
|
||||||
exclude group: 'javax.servlet', module: 'servlet-api'
|
exclude group: 'javax.servlet', module: 'servlet-api'
|
||||||
|
@ -14,8 +14,8 @@ dependencies {
|
|||||||
"org.springframework.data:spring-data-redis:${springDataRedisVersion}",
|
"org.springframework.data:spring-data-redis:${springDataRedisVersion}",
|
||||||
"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
|
"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
|
||||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final",
|
"org.hibernate:hibernate-validator:$hibernateVersion",
|
||||||
"redis.clients:jedis:2.4.2",
|
"redis.clients:jedis:2.4.2",
|
||||||
"com.github.kstyrc:embedded-redis:0.6",
|
"com.github.kstyrc:embedded-redis:0.6",
|
||||||
"org.apache.commons:commons-pool2:2.2",
|
"org.apache.commons:commons-pool2:2.2",
|
||||||
@ -24,7 +24,7 @@ dependencies {
|
|||||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"com.fasterxml.jackson.core:jackson-databind:$jacksonDatavindVersion"
|
"com.fasterxml.jackson.core:jackson-databind:$jacksonDatavindVersion"
|
||||||
compile('org.hibernate:hibernate-entitymanager:3.6.10.Final') {
|
compile("org.hibernate:hibernate-entitymanager:$hibernateVersion") {
|
||||||
exclude group:'javassist', module: 'javassist'
|
exclude group:'javassist', module: 'javassist'
|
||||||
}
|
}
|
||||||
compile("org.springframework.data:spring-data-jpa:$springDataJpaVersion") {
|
compile("org.springframework.data:spring-data-jpa:$springDataJpaVersion") {
|
||||||
|
@ -16,8 +16,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -2,9 +2,9 @@ dependencies {
|
|||||||
compile project(':spring-security-data'),
|
compile project(':spring-security-data'),
|
||||||
project(':spring-security-config'),
|
project(':spring-security-config'),
|
||||||
"org.springframework.data:spring-data-jpa:$springDataJpaVersion",
|
"org.springframework.data:spring-data-jpa:$springDataJpaVersion",
|
||||||
"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
|
"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
|
||||||
'org.hibernate:hibernate-entitymanager:3.6.10.Final',
|
"org.hibernate:hibernate-entitymanager:$hibernateVersion",
|
||||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
}
|
}
|
@ -16,8 +16,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -16,9 +16,9 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final",
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
|
||||||
"com.fasterxml.jackson.core:jackson-databind:2.2.1"
|
"com.fasterxml.jackson.core:jackson-databind:$jacksonDatavindVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -16,8 +16,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -16,8 +16,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -16,8 +16,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -18,8 +18,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -8,8 +8,8 @@ dependencies {
|
|||||||
project(":spring-security-config"),
|
project(":spring-security-config"),
|
||||||
"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
|
"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
|
||||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final",
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
|
||||||
"org.springframework:spring-webmvc:$springVersion",
|
"org.springframework:spring-webmvc:$springVersion",
|
||||||
"org.springframework:spring-orm:$springVersion",
|
"org.springframework:spring-orm:$springVersion",
|
||||||
"org.springframework:spring-context:$springVersion",
|
"org.springframework:spring-context:$springVersion",
|
||||||
|
@ -27,7 +27,7 @@ import org.hibernate.validator.constraints.NotEmpty;
|
|||||||
@Entity
|
@Entity
|
||||||
public class Message {
|
public class Message {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@NotEmpty(message = "Message is required.")
|
@NotEmpty(message = "Message is required.")
|
||||||
|
@ -17,8 +17,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -16,8 +16,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -16,8 +16,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -17,8 +17,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -13,8 +13,8 @@ dependencies {
|
|||||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||||
"javax.validation:validation-api:1.0.0.GA",
|
"javax.validation:validation-api:$validationApiVersion",
|
||||||
"org.hibernate:hibernate-validator:4.2.0.Final"
|
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||||
|
|
||||||
runtime "opensymphony:sitemesh:2.4.2",
|
runtime "opensymphony:sitemesh:2.4.2",
|
||||||
"cglib:cglib-nodep:$cglibVersion",
|
"cglib:cglib-nodep:$cglibVersion",
|
||||||
|
@ -23,7 +23,7 @@ dependencies {
|
|||||||
"org.springframework:spring-webmvc:$springVersion",
|
"org.springframework:spring-webmvc:$springVersion",
|
||||||
'org.aspectj:aspectjrt:1.6.8',
|
'org.aspectj:aspectjrt:1.6.8',
|
||||||
'org.hibernate:ejb3-persistence:1.0.2.GA',
|
'org.hibernate:ejb3-persistence:1.0.2.GA',
|
||||||
'javax.persistence:persistence-api:1.0',
|
"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
|
||||||
'org.slf4j:jcl-over-slf4j:1.5.11'
|
'org.slf4j:jcl-over-slf4j:1.5.11'
|
||||||
|
|
||||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||||
|
@ -20,6 +20,7 @@ import java.io.PrintWriter;
|
|||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
import javax.servlet.ServletOutputStream;
|
import javax.servlet.ServletOutputStream;
|
||||||
|
import javax.servlet.WriteListener;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import javax.servlet.http.HttpServletResponseWrapper;
|
import javax.servlet.http.HttpServletResponseWrapper;
|
||||||
|
|
||||||
@ -638,6 +639,14 @@ public abstract class OnCommittedResponseWrapper extends HttpServletResponseWrap
|
|||||||
this.delegate.write(b, off, len);
|
this.delegate.write(b, off, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isReady() {
|
||||||
|
return this.delegate.isReady();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWriteListener(WriteListener writeListener) {
|
||||||
|
this.delegate.setWriteListener(writeListener);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return getClass().getName() + "[delegate=" + this.delegate.toString() + "]";
|
return getClass().getName() + "[delegate=" + this.delegate.toString() + "]";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user