From 79f187ddd6f00e31360171938d166e95b6a04ee4 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Wed, 24 May 2017 23:18:30 +0200 Subject: [PATCH] Upgrade samples to Boot 2.0.0.M1 Fixes gh-782 --- gradle.properties | 2 +- gradle/dependency-management.gradle | 143 +--------------- ...-session-sample-boot-findbyusername.gradle | 1 + .../main/java/sample/config/WebMvcConfig.java | 4 +- .../src/main/resources/templates/index.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../src/main/resources/templates/login.html | 4 +- .../boot/gradle/dependency-management.gradle | 152 ------------------ .../spring-session-sample-boot-jdbc.gradle | 1 + .../main/java/sample/config/WebMvcConfig.java | 4 +- .../src/main/resources/templates/index.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- ...ring-session-sample-boot-redis-json.gradle | 3 +- .../main/java/sample/config/WebMvcConfig.java | 4 +- .../src/main/resources/templates/home.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../src/main/resources/templates/login.html | 2 +- .../spring-session-sample-boot-redis.gradle | 1 + .../main/java/sample/config/WebMvcConfig.java | 4 +- .../src/main/resources/templates/index.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- ...pring-session-sample-boot-websocket.gradle | 3 +- .../main/java/sample/config/WebMvcConfig.java | 4 +- .../websocket/WebSocketDisconnectHandler.java | 15 +- .../src/main/resources/templates/index.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- 26 files changed, 37 insertions(+), 330 deletions(-) delete mode 100644 samples/boot/gradle/dependency-management.gradle diff --git a/gradle.properties b/gradle.properties index 63d341c8..b441dab3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -springBootVersion=1.5.3.RELEASE +springBootVersion=2.0.0.M1 version=2.0.0.BUILD-SNAPSHOT diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 38d71777..d3e05f14 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,177 +1,36 @@ -dependencyManagement { - dependencies { - dependency 'biz.paluch.redis:lettuce:4.3.1.Final' - dependency 'com.maxmind.geoip2:geoip2:2.3.1' - dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' - dependency 'org.springframework.shell:spring-shell:1.1.0.RELEASE' - dependency 'org.webjars:bootstrap:2.3.2' - dependency 'org.webjars:html5shiv:3.7.3' - dependency 'org.webjars:knockout:2.3.0' - dependency 'org.webjars:sockjs-client:0.3.4' - dependency 'org.webjars:stomp-websocket:2.3.0' - dependency 'org.webjars:webjars-taglib:0.3' - } -} - dependencyManagement { imports { + mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC1' mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-M3' mavenBom 'org.springframework.security:spring-security-bom:5.0.0.M1' - mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC1' } dependencies { - dependency 'antlr:antlr:2.7.7' - dependency 'aopalliance:aopalliance:1.0' - dependency 'biz.paluch.redis:lettuce:4.3.1.Final' - dependency 'cglib:cglib-nodep:2.1_3' - dependency 'cglib:cglib-nodep:3.2.4' - dependency 'ch.qos.logback:logback-classic:1.1.11' - dependency 'ch.qos.logback:logback-classic:1.2.3' - dependency 'ch.qos.logback:logback-core:1.1.11' - dependency 'ch.qos.logback:logback-core:1.2.3' - dependency 'com.fasterxml.jackson.core:jackson-annotations:2.8.0' - dependency 'com.fasterxml.jackson.core:jackson-annotations:2.9.0.pr3' - dependency 'com.fasterxml.jackson.core:jackson-core:2.8.8' - dependency 'com.fasterxml.jackson.core:jackson-core:2.9.0.pr3' - dependency 'com.fasterxml.jackson.core:jackson-databind:2.8.8' dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr3' - dependency 'com.fasterxml:classmate:1.3.3' - dependency 'com.google.code.findbugs:jsr305:3.0.2' - dependency 'com.google.code.gson:gson:2.8.0' - dependency 'com.google.guava:guava:20.0' - dependency 'com.google.http-client:google-http-client:1.20.0' dependency 'com.h2database:h2:1.4.195' dependency 'com.hazelcast:hazelcast-client:3.8' dependency 'com.hazelcast:hazelcast:3.8' - dependency 'com.jayway.jsonpath:json-path:2.2.0' - dependency 'com.maxmind.db:maxmind-db:1.0.0' dependency 'com.maxmind.geoip2:geoip2:2.3.1' - dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1' - dependency 'commons-cli:commons-cli:1.3.1' dependency 'commons-codec:commons-codec:1.10' - dependency 'commons-collections:commons-collections:3.2.2' - dependency 'commons-io:commons-io:2.5' - dependency 'dom4j:dom4j:1.6.1' dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' dependency 'io.lettuce:lettuce-core:5.0.0.M2' - dependency 'io.netty:netty-buffer:4.1.10.Final' - dependency 'io.netty:netty-codec:4.1.10.Final' - dependency 'io.netty:netty-common:4.1.10.Final' - dependency 'io.netty:netty-handler:4.1.10.Final' - dependency 'io.netty:netty-resolver:4.1.10.Final' - dependency 'io.netty:netty-transport:4.1.10.Final' - dependency 'io.projectreactor:reactor-core:3.1.0.M1' - dependency 'io.reactivex:rxjava:1.3.0' dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1' dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02' dependency 'javax.servlet:javax.servlet-api:3.1.0' - dependency 'javax.transaction:javax.transaction-api:1.2' - dependency 'javax.validation:validation-api:1.1.0.Final' dependency 'junit:junit:4.12' - dependency 'net.bytebuddy:byte-buddy-agent:1.6.11' - dependency 'net.bytebuddy:byte-buddy:1.6.12' - dependency 'net.java.dev.jna:jna-platform:4.1.0' - dependency 'net.java.dev.jna:jna:4.2.2' - dependency 'net.minidev:accessors-smart:1.1' - dependency 'net.minidev:json-smart:2.2.1' - dependency 'net.sourceforge.cssparser:cssparser:0.9.18' - dependency 'net.sourceforge.cssparser:cssparser:0.9.22' - dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.17' - dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.26' - dependency 'net.sourceforge.htmlunit:htmlunit:2.21' - dependency 'net.sourceforge.htmlunit:htmlunit:2.26' - dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.21' - dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.25' - dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0' - dependency 'ognl:ognl:3.0.8' - dependency 'org.akhikhl.gretty:gretty-runner-tomcat8:1.4.2' - dependency 'org.akhikhl.gretty:gretty-runner-tomcat:1.4.2' - dependency 'org.akhikhl.gretty:gretty-runner:1.4.2' - dependency 'org.apache.commons:commons-compress:1.9' - dependency 'org.apache.commons:commons-exec:1.3' - dependency 'org.apache.commons:commons-lang3:3.5' - dependency 'org.apache.commons:commons-pool2:2.4.2' dependency 'org.apache.derby:derby:10.13.1.1' dependency 'org.apache.httpcomponents:httpclient:4.5.3' - dependency 'org.apache.httpcomponents:httpcore:4.4.6' - dependency 'org.apache.httpcomponents:httpmime:4.5.3' - dependency 'org.apache.taglibs:taglibs-standard-impl:1.2.5' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' - dependency 'org.apache.taglibs:taglibs-standard-spec:1.2.5' - dependency 'org.apache.tomcat.embed:tomcat-embed-core:8.5.14' - dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.14' - dependency 'org.apache.tomcat.embed:tomcat-embed-jasper:8.5.14' - dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.0.33' - dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14' - dependency 'org.apache.tomcat:tomcat-jdbc:8.5.14' - dependency 'org.apache.tomcat:tomcat-juli:8.5.14' - dependency 'org.aspectj:aspectjweaver:1.8.10' dependency 'org.assertj:assertj-core:3.6.2' - dependency 'org.codehaus.groovy:groovy-json:2.4.11' - dependency 'org.codehaus.groovy:groovy:2.4.10' - dependency 'org.codehaus.groovy:groovy:2.4.11' - dependency 'org.eclipse.jdt.core.compiler:ecj:4.6.1' - dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414' - dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.5.v20170502' - dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414' - dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.5.v20170502' - dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414' - dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.5.v20170502' - dependency 'org.eclipse.jetty:jetty-client:9.4.4.v20170414' - dependency 'org.eclipse.jetty:jetty-client:9.4.5.v20170502' - dependency 'org.eclipse.jetty:jetty-http:9.4.4.v20170414' - dependency 'org.eclipse.jetty:jetty-http:9.4.5.v20170502' - dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414' - dependency 'org.eclipse.jetty:jetty-io:9.4.5.v20170502' - dependency 'org.eclipse.jetty:jetty-util:9.4.4.v20170414' - dependency 'org.eclipse.jetty:jetty-util:9.4.5.v20170502' - dependency 'org.hamcrest:hamcrest-core:1.3' - dependency 'org.hamcrest:hamcrest-library:1.3' - dependency 'org.hibernate.common:hibernate-commons-annotations:5.0.1.Final' - dependency 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final' - dependency 'org.hibernate:hibernate-core:5.0.12.Final' - dependency 'org.hibernate:hibernate-entitymanager:5.0.12.Final' - dependency 'org.hibernate:hibernate-validator:5.3.5.Final' dependency 'org.hsqldb:hsqldb:2.4.0' - dependency 'org.javassist:javassist:3.21.0-GA' - dependency 'org.jboss.logging:jboss-logging:3.3.1.Final' - dependency 'org.jboss:jandex:2.0.0.Final' dependency 'org.mockito:mockito-core:2.7.22' - dependency 'org.objenesis:objenesis:2.5.1' - dependency 'org.ow2.asm:asm:5.0.3' - dependency 'org.reactivestreams:reactive-streams:1.0.0' - dependency 'org.seleniumhq.selenium:htmlunit-driver:2.21' dependency 'org.seleniumhq.selenium:htmlunit-driver:2.26' - dependency 'org.seleniumhq.selenium:selenium-api:2.53.1' - dependency 'org.seleniumhq.selenium:selenium-api:3.3.1' - dependency 'org.seleniumhq.selenium:selenium-remote-driver:2.53.1' - dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.3.1' - dependency 'org.seleniumhq.selenium:selenium-support:2.53.1' - dependency 'org.seleniumhq.selenium:selenium-support:3.3.1' - dependency 'org.skyscreamer:jsonassert:1.4.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.25' - dependency 'org.slf4j:jul-to-slf4j:1.7.25' - dependency 'org.slf4j:log4j-over-slf4j:1.7.25' - dependency 'org.slf4j:slf4j-api:1.7.25' - dependency 'org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE' - dependency 'org.thymeleaf:thymeleaf:2.1.5.RELEASE' - dependency 'org.unbescape:unbescape:1.1.0.RELEASE' - dependency 'org.w3c.css:sac:1.3' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3' dependency 'org.webjars:jquery:1.9.0' dependency 'org.webjars:knockout:2.3.0' dependency 'org.webjars:sockjs-client:0.3.4' dependency 'org.webjars:stomp-websocket:2.3.0' - dependency 'org.webjars:webjars-locator-core:0.30' - dependency 'org.webjars:webjars-locator-core:0.32' - dependency 'org.webjars:webjars-locator:0.32-1' dependency 'org.webjars:webjars-taglib:0.3' - dependency 'org.yaml:snakeyaml:1.17' dependency 'redis.clients:jedis:2.9.0' - dependency 'xalan:serializer:2.7.2' - dependency 'xalan:xalan:2.7.2' - dependency 'xerces:xercesImpl:2.11.0' - dependency 'xml-apis:xml-apis:1.4.01' } } diff --git a/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle b/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle index 417b4b8d..59fdd4a3 100644 --- a/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle +++ b/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle @@ -2,6 +2,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot' dependencies { compile project(':spring-session-data-redis') + compile "org.springframework.boot:spring-boot-starter-web" compile "org.springframework.boot:spring-boot-starter-thymeleaf" compile "org.springframework.boot:spring-boot-starter-security" compile "org.springframework.boot:spring-boot-devtools" diff --git a/samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java b/samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java index adfeb66f..69f12fdd 100644 --- a/samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java +++ b/samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java @@ -18,10 +18,10 @@ package sample.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class WebMvcConfig extends WebMvcConfigurerAdapter { +public class WebMvcConfig implements WebMvcConfigurer { @Override public void addViewControllers(ViewControllerRegistry registry) { diff --git a/samples/boot/findbyusername/src/main/resources/templates/index.html b/samples/boot/findbyusername/src/main/resources/templates/index.html index 8681b4af..447b8a16 100644 --- a/samples/boot/findbyusername/src/main/resources/templates/index.html +++ b/samples/boot/findbyusername/src/main/resources/templates/index.html @@ -1,4 +1,4 @@ - + Secured Content diff --git a/samples/boot/findbyusername/src/main/resources/templates/layout.html b/samples/boot/findbyusername/src/main/resources/templates/layout.html index 5c5a3a3f..00814e90 100644 --- a/samples/boot/findbyusername/src/main/resources/templates/layout.html +++ b/samples/boot/findbyusername/src/main/resources/templates/layout.html @@ -3,7 +3,7 @@ xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> - Spring Session Sample + Spring Session Sample