From af8e155c6d8027e048fa7fed429076172ce8995e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 30 Jan 2018 12:31:49 -0800 Subject: [PATCH 01/10] Polish --- .../ManagementWebSecurityAutoConfiguration.java | 2 +- .../OAuth2RestOperationsConfiguration.java | 4 ++-- .../OAuth2RestOperationsConfigurationTests.java | 17 ++++++++--------- .../launchscript/SysVinitLaunchScriptIT.java | 2 +- .../boot/configurationprocessor/TypeUtils.java | 14 ++++++-------- .../boot/jdbc/DatabaseDriver.java | 5 ++--- .../boot/web/client/RestTemplateBuilder.java | 7 ++++--- ...ttyEmbeddedServletContainerFactoryTests.java | 2 +- 8 files changed, 25 insertions(+), 28 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java index 1b5ad03f558..f9a644cfaa7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java index b48577acd5b..f7c15f9c51f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,7 +87,7 @@ public class OAuth2RestOperationsConfiguration { @Configuration @ConditionalOnBean(OAuth2ClientConfiguration.class) - @Conditional({OAuth2ClientIdCondition.class, NoClientCredentialsCondition.class}) + @Conditional({ OAuth2ClientIdCondition.class, NoClientCredentialsCondition.class }) @Import(OAuth2ProtectedResourceDetailsConfiguration.class) protected static class SessionScopedConfiguration { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java index dd14ce3cd63..d00d521fb6b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,8 +78,7 @@ public class OAuth2RestOperationsConfigurationTests { EnvironmentTestUtils.addEnvironment(this.environment, "security.oauth2.client.client-id=acme"); initializeContext(ConfigForRequestScopedConfiguration.class, false); - assertThat(this.context.containsBean("oauth2ClientContext")) - .isTrue(); + assertThat(this.context.containsBean("oauth2ClientContext")).isTrue(); } @Test @@ -95,8 +94,7 @@ public class OAuth2RestOperationsConfigurationTests { EnvironmentTestUtils.addEnvironment(this.environment, "security.oauth2.client.client-id=acme"); initializeContext(ConfigForSessionScopedConfiguration.class, false); - assertThat(this.context.containsBean("oauth2ClientContext")) - .isTrue(); + assertThat(this.context.containsBean("oauth2ClientContext")).isTrue(); } @Test @@ -109,8 +107,7 @@ public class OAuth2RestOperationsConfigurationTests { private void initializeContext(Class configuration, boolean isClientCredentials) { this.context = new SpringApplicationBuilder(configuration) - .environment(this.environment) - .web(!isClientCredentials).run(); + .environment(this.environment).web(!isClientCredentials).run(); } @Configuration @@ -126,7 +123,8 @@ public class OAuth2RestOperationsConfigurationTests { @Configuration @Import({ OAuth2ClientConfiguration.class, OAuth2RestOperationsConfiguration.class }) - protected static class ConfigForSessionScopedConfiguration extends WebApplicationConfiguration { + protected static class ConfigForSessionScopedConfiguration + extends WebApplicationConfiguration { @Bean public SecurityProperties securityProperties() { @@ -136,7 +134,8 @@ public class OAuth2RestOperationsConfigurationTests { } @Configuration - protected static class ConfigForRequestScopedConfiguration extends WebApplicationConfiguration { + protected static class ConfigForRequestScopedConfiguration + extends WebApplicationConfiguration { } diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java index 42860f75e4d..ad134c23c47 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java index 68ff2041d39..54222725e5e 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java @@ -188,17 +188,15 @@ class TypeUtils { + type.asElement().getSimpleName().toString(); } String qualifiedName = getQualifiedName(type.asElement()); - if (type.getTypeArguments().isEmpty()) { + if (type.getTypeArguments().isEmpty()) { return qualifiedName; } - else { - StringBuilder name = new StringBuilder(); - name.append(qualifiedName); - if (!type.getTypeArguments().isEmpty()) { - appendTypeArguments(type, name); - } - return name.toString(); + StringBuilder name = new StringBuilder(); + name.append(qualifiedName); + if (!type.getTypeArguments().isEmpty()) { + appendTypeArguments(type, name); } + return name.toString(); } private void appendTypeArguments(DeclaredType type, StringBuilder name) { diff --git a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index 18d78e9c3e8..c2eab5f49ba 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,8 +123,7 @@ public enum DatabaseDriver { * Firebird. */ FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver", - "org.firebirdsql.ds.FBXADataSource", - "SELECT 1 FROM RDB$DATABASE") { + "org.firebirdsql.ds.FBXADataSource", "SELECT 1 FROM RDB$DATABASE") { @Override protected Collection getUrlPrefixes() { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java index 7b73e90b850..f27c972a1da 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -337,8 +337,9 @@ public class RestTemplateBuilder { /** * Set the {@link ClientHttpRequestFactory} that should be used with the * {@link RestTemplate}. - *

Note that this request factory will be shared with all builder instances - * derived from that point. + *

+ * Note that this request factory will be shared with all builder instances derived + * from that point. * @param requestFactory the request factory to use * @return a new builder instance */ diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 1d8eabaeb44..cce0048cd66 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 2b9f1101e86e1a8d02d2de666fc5c77ce7b3aa30 Mon Sep 17 00:00:00 2001 From: Jacques Stadler Date: Tue, 30 Jan 2018 16:22:56 +0100 Subject: [PATCH 02/10] All CLI support for Windows MINGW environments Closes gh-11848 --- spring-boot-cli/src/main/executablecontent/bin/spring | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-boot-cli/src/main/executablecontent/bin/spring b/spring-boot-cli/src/main/executablecontent/bin/spring index 0ba9c5d66ff..21ba6a064b2 100755 --- a/spring-boot-cli/src/main/executablecontent/bin/spring +++ b/spring-boot-cli/src/main/executablecontent/bin/spring @@ -8,6 +8,10 @@ case "`uname`" in cygwin=true ;; + MINGW*) + cygwin=true + ;; + Darwin*) darwin=true ;; From 6ae960d295ada3ca4d4ef36f874126858af10808 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 10 Jan 2018 14:24:40 -0800 Subject: [PATCH 03/10] Protect against symlink attacks Update embedded launch script to no longer change ownership of files or folders that already exist. Fixes gh-11397 --- .../launchscript/SysVinitLaunchScriptIT.java | 19 ++++++++++++++++++ .../resources/scripts/log-file-ownership.sh | 20 +++++++++++++++++++ .../resources/scripts/pid-file-ownership.sh | 18 +++++++++++++++++ .../resources/scripts/pid-folder-ownership.sh | 17 ++++++++++++++++ .../boot/loader/tools/launch.script | 8 ++++---- 5 files changed, 78 insertions(+), 4 deletions(-) create mode 100755 spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership.sh create mode 100755 spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-file-ownership.sh create mode 100755 spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-folder-ownership.sh diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java index ad134c23c47..d8309130868 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java @@ -220,6 +220,25 @@ public class SysVinitLaunchScriptIT { coloredString(AnsiColor.GREEN, "Stopped [" + extractPid(output) + "]")); } + @Test + public void pidFolderOwnership() throws Exception { + String output = doTest("pid-folder-ownership.sh"); + System.err.println(output); + assertThat(output).contains("phil root"); + } + + @Test + public void pidFileOwnership() throws Exception { + String output = doTest("pid-file-ownership.sh"); + assertThat(output).contains("phil root"); + } + + @Test + public void logFileOwnership() throws Exception { + String output = doTest("log-file-ownership.sh"); + assertThat(output).contains("phil root"); + } + @Test public void launchWithRelativeLogFolder() throws Exception { String output = doTest("launch-with-relative-log-folder.sh"); diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership.sh b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership.sh new file mode 100755 index 00000000000..919c33e3809 --- /dev/null +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership.sh @@ -0,0 +1,20 @@ +source ./test-functions.sh +install_service + +chmod o+w /var/log + +useradd phil +mkdir /phil-files +chown phil /phil-files + +useradd andy +chown andy /test-service/spring-boot-app.jar + +start_service +stop_service + +su - andy -c "ln -s -f /phil-files /var/log/spring-boot-app.log" + +start_service + +ls -ld /phil-files diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-file-ownership.sh b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-file-ownership.sh new file mode 100755 index 00000000000..891bb935fa4 --- /dev/null +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-file-ownership.sh @@ -0,0 +1,18 @@ +source ./test-functions.sh +install_service + +useradd phil +mkdir /phil-files +chown phil /phil-files + +useradd andy +chown andy /test-service/spring-boot-app.jar + +start_service +stop_service + +su - andy -c "ln -s /phil-files /var/run/spring-boot-app/spring-boot-app.pid" + +start_service + +ls -ld /phil-files diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-folder-ownership.sh b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-folder-ownership.sh new file mode 100755 index 00000000000..c6b7d19c093 --- /dev/null +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/pid-folder-ownership.sh @@ -0,0 +1,17 @@ +source ./test-functions.sh +install_service + +chmod o+w /var/run + +useradd phil +mkdir /phil-files +chown phil /phil-files + +useradd andy +chown andy /test-service/spring-boot-app.jar + +su - andy -c "ln -s -f /phil-files /var/run/spring-boot-app" + +start_service + +ls -ld /phil-files diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script index 25facc1ede1..aac9114eb3a 100755 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script @@ -146,12 +146,12 @@ start() { do_start() { working_dir=$(dirname "$jarfile") pushd "$working_dir" > /dev/null - mkdir -p "$PID_FOLDER" &> /dev/null + if [[ ! -e "$PID_FOLDER" ]]; then + mkdir -p "$PID_FOLDER" &> /dev/null + chown "$run_user" "$PID_FOLDER" + fi if [[ -n "$run_user" ]]; then checkPermissions || return $? - chown "$run_user" "$PID_FOLDER" - chown "$run_user" "$pid_file" - chown "$run_user" "$log_file" if [ $USE_START_STOP_DAEMON = true ] && type start-stop-daemon > /dev/null 2>&1; then start-stop-daemon --start --quiet \ --chuid "$run_user" \ From aa6cb9744b39506f1315ffac6f3725cc9577abdb Mon Sep 17 00:00:00 2001 From: Spring Buildmaster Date: Tue, 30 Jan 2018 23:29:33 +0000 Subject: [PATCH 04/10] Next Development Version --- pom.xml | 2 +- spring-boot-actuator-docs/pom.xml | 2 +- spring-boot-actuator/pom.xml | 2 +- spring-boot-autoconfigure/pom.xml | 2 +- spring-boot-cli/pom.xml | 2 +- spring-boot-dependencies/pom.xml | 131 +++++++++--------- spring-boot-deployment-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-deployment-test-tomee/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-deployment-test-wlp/pom.xml | 2 +- spring-boot-devtools/pom.xml | 2 +- spring-boot-docs/pom.xml | 2 +- spring-boot-full-build/pom.xml | 2 +- spring-boot-integration-tests/pom.xml | 2 +- .../pom.xml | 5 +- .../spring-boot-devtools-tests/pom.xml | 2 +- .../spring-boot-gradle-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-launch-script-tests/pom.xml | 2 +- .../spring-boot-security-tests/pom.xml | 2 +- .../pom.xml | 2 +- spring-boot-parent/pom.xml | 4 +- spring-boot-samples/pom.xml | 2 +- .../spring-boot-sample-activemq/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-actuator-noweb/pom.xml | 2 +- .../spring-boot-sample-actuator-ui/pom.xml | 2 +- .../spring-boot-sample-actuator/pom.xml | 2 +- .../spring-boot-sample-amqp/pom.xml | 2 +- .../spring-boot-sample-ant/pom.xml | 13 +- .../spring-boot-sample-aop/pom.xml | 2 +- .../spring-boot-sample-atmosphere/pom.xml | 2 +- .../spring-boot-sample-batch/pom.xml | 2 +- .../spring-boot-sample-cache/pom.xml | 2 +- .../spring-boot-sample-custom-layout/pom.xml | 2 +- .../spring-boot-sample-data-cassandra/pom.xml | 2 +- .../spring-boot-sample-data-couchbase/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-data-gemfire/pom.xml | 2 +- .../spring-boot-sample-data-jpa/pom.xml | 2 +- .../spring-boot-sample-data-ldap/pom.xml | 2 +- .../spring-boot-sample-data-mongodb/pom.xml | 2 +- .../spring-boot-sample-data-neo4j/pom.xml | 2 +- .../spring-boot-sample-data-redis/pom.xml | 2 +- .../spring-boot-sample-data-rest/pom.xml | 2 +- .../spring-boot-sample-data-solr/pom.xml | 2 +- .../spring-boot-sample-devtools/pom.xml | 2 +- .../spring-boot-sample-flyway/pom.xml | 2 +- .../spring-boot-sample-hateoas/pom.xml | 2 +- .../spring-boot-sample-hibernate4/pom.xml | 2 +- .../spring-boot-sample-hibernate52/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-hypermedia-jpa/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-hypermedia-ui/pom.xml | 2 +- .../spring-boot-sample-hypermedia/pom.xml | 2 +- .../spring-boot-sample-integration/pom.xml | 2 +- .../spring-boot-sample-jersey/pom.xml | 2 +- .../spring-boot-sample-jersey1/pom.xml | 2 +- .../spring-boot-sample-jetty-jsp/pom.xml | 2 +- .../spring-boot-sample-jetty-ssl/pom.xml | 2 +- .../spring-boot-sample-jetty/pom.xml | 2 +- .../spring-boot-sample-jetty8-ssl/pom.xml | 2 +- .../spring-boot-sample-jetty8/pom.xml | 2 +- .../spring-boot-sample-jetty92/pom.xml | 2 +- .../spring-boot-sample-jetty93/pom.xml | 2 +- .../spring-boot-sample-jooq/pom.xml | 2 +- .../spring-boot-sample-jpa/pom.xml | 2 +- .../spring-boot-sample-jta-atomikos/pom.xml | 2 +- .../spring-boot-sample-jta-bitronix/pom.xml | 2 +- .../spring-boot-sample-jta-jndi/pom.xml | 2 +- .../spring-boot-sample-jta-narayana/pom.xml | 2 +- .../spring-boot-sample-liquibase/pom.xml | 2 +- .../spring-boot-sample-logback/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-metrics-redis/pom.xml | 2 +- .../spring-boot-sample-parent-context/pom.xml | 2 +- .../spring-boot-sample-profile/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-secure-oauth2/pom.xml | 2 +- .../spring-boot-sample-secure/pom.xml | 2 +- .../spring-boot-sample-servlet/pom.xml | 2 +- .../spring-boot-sample-session-redis/pom.xml | 2 +- .../spring-boot-sample-simple/pom.xml | 2 +- .../spring-boot-sample-test-nomockito/pom.xml | 2 +- .../spring-boot-sample-test/pom.xml | 2 +- .../spring-boot-sample-testng/pom.xml | 2 +- .../spring-boot-sample-tomcat-jsp/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-tomcat-ssl/pom.xml | 2 +- .../spring-boot-sample-tomcat/pom.xml | 2 +- .../spring-boot-sample-tomcat7-jsp/pom.xml | 2 +- .../spring-boot-sample-tomcat7-ssl/pom.xml | 2 +- .../spring-boot-sample-tomcat80-ssl/pom.xml | 2 +- .../spring-boot-sample-traditional/pom.xml | 2 +- .../spring-boot-sample-undertow-ssl/pom.xml | 2 +- .../spring-boot-sample-undertow/pom.xml | 2 +- .../spring-boot-sample-war/pom.xml | 2 +- .../spring-boot-sample-web-freemarker/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-web-jsp/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-web-mustache/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-web-secure/pom.xml | 2 +- .../spring-boot-sample-web-static/pom.xml | 2 +- .../spring-boot-sample-web-thymeleaf3/pom.xml | 2 +- .../spring-boot-sample-web-ui/pom.xml | 2 +- .../spring-boot-sample-webservices/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-sample-xml/pom.xml | 2 +- spring-boot-starters/pom.xml | 2 +- .../spring-boot-starter-activemq/pom.xml | 2 +- .../spring-boot-starter-actuator/pom.xml | 2 +- .../spring-boot-starter-amqp/pom.xml | 2 +- .../spring-boot-starter-aop/pom.xml | 2 +- .../spring-boot-starter-artemis/pom.xml | 2 +- .../spring-boot-starter-batch/pom.xml | 2 +- .../spring-boot-starter-cache/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-starter-data-gemfire/pom.xml | 2 +- .../spring-boot-starter-data-jpa/pom.xml | 2 +- .../spring-boot-starter-data-ldap/pom.xml | 2 +- .../spring-boot-starter-data-mongodb/pom.xml | 2 +- .../spring-boot-starter-data-neo4j/pom.xml | 2 +- .../spring-boot-starter-data-redis/pom.xml | 2 +- .../spring-boot-starter-data-rest/pom.xml | 2 +- .../spring-boot-starter-data-solr/pom.xml | 2 +- .../spring-boot-starter-freemarker/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-starter-hateoas/pom.xml | 2 +- .../spring-boot-starter-integration/pom.xml | 2 +- .../spring-boot-starter-jdbc/pom.xml | 2 +- .../spring-boot-starter-jersey/pom.xml | 2 +- .../spring-boot-starter-jetty/pom.xml | 2 +- .../spring-boot-starter-jooq/pom.xml | 2 +- .../spring-boot-starter-jta-atomikos/pom.xml | 2 +- .../spring-boot-starter-jta-bitronix/pom.xml | 2 +- .../spring-boot-starter-jta-narayana/pom.xml | 2 +- .../spring-boot-starter-log4j2/pom.xml | 2 +- .../spring-boot-starter-logging/pom.xml | 2 +- .../spring-boot-starter-mail/pom.xml | 2 +- .../spring-boot-starter-mobile/pom.xml | 2 +- .../spring-boot-starter-mustache/pom.xml | 2 +- .../spring-boot-starter-parent/pom.xml | 9 +- .../spring-boot-starter-remote-shell/pom.xml | 2 +- .../spring-boot-starter-security/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-starter-test/pom.xml | 2 +- .../spring-boot-starter-thymeleaf/pom.xml | 2 +- .../spring-boot-starter-tomcat/pom.xml | 2 +- .../spring-boot-starter-undertow/pom.xml | 2 +- .../spring-boot-starter-validation/pom.xml | 2 +- .../spring-boot-starter-web-services/pom.xml | 2 +- .../spring-boot-starter-web/pom.xml | 2 +- .../spring-boot-starter-websocket/pom.xml | 2 +- .../spring-boot-starter/pom.xml | 2 +- spring-boot-test-autoconfigure/pom.xml | 2 +- spring-boot-test/pom.xml | 2 +- spring-boot-tools/pom.xml | 2 +- spring-boot-tools/spring-boot-antlib/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-boot-gradle-plugin/pom.xml | 2 +- .../spring-boot-loader-tools/pom.xml | 2 +- spring-boot-tools/spring-boot-loader/pom.xml | 2 +- .../spring-boot-maven-plugin/pom.xml | 2 +- .../spring-boot-test-support/pom.xml | 2 +- spring-boot/pom.xml | 2 +- 185 files changed, 262 insertions(+), 260 deletions(-) diff --git a/pom.xml b/pom.xml index 2341abaeea2..057d70a3945 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.boot spring-boot-build - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT pom Spring Boot Build Spring Boot Build diff --git a/spring-boot-actuator-docs/pom.xml b/spring-boot-actuator-docs/pom.xml index 4a3dd32c198..9e1ac99fc2e 100644 --- a/spring-boot-actuator-docs/pom.xml +++ b/spring-boot-actuator-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-actuator-docs diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml index a468c32f22c..cff9f1d233d 100644 --- a/spring-boot-actuator/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-actuator diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml index 9e2f448524d..0211cfeebf9 100755 --- a/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-autoconfigure/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-autoconfigure diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml index 32351724af4..eb9ff42853a 100644 --- a/spring-boot-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-cli diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index eb14769b44a..15b614086b5 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -1,8 +1,9 @@ - + + 4.0.0 org.springframework.boot spring-boot-dependencies - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT pom Spring Boot Dependencies Spring Boot Dependencies @@ -223,79 +224,79 @@ org.springframework.boot spring-boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot test-jar - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-test - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-test test-jar - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-test-autoconfigure - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-actuator - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-actuator-docs - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-autoconfigure - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-autoconfigure-processor - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-configuration-metadata - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-configuration-processor - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-devtools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-loader - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-loader-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT commons-logging @@ -306,212 +307,212 @@ org.springframework.boot spring-boot-starter-activemq - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-actuator - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-amqp - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-aop - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-artemis - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-batch - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-cache - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-cloud-connectors - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-cassandra - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-couchbase - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-elasticsearch - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-gemfire - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-jpa - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-ldap - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-mongodb - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-redis - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-neo4j - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-rest - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-data-solr - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-freemarker - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-groovy-templates - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-hateoas - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-integration - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-jdbc - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-jersey - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-jetty - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-jooq - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-jta-atomikos - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-jta-bitronix - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-undertow - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-log4j2 - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-logging - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-mail - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-mobile - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-mustache - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-jta-narayana - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-remote-shell - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-security - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-social-facebook - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-social-linkedin - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-social-twitter - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-test - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT commons-logging @@ -522,32 +523,32 @@ org.springframework.boot spring-boot-starter-thymeleaf - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-tomcat - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-validation - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-web - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-websocket - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.springframework.boot spring-boot-starter-web-services - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT diff --git a/spring-boot-deployment-tests/pom.xml b/spring-boot-deployment-tests/pom.xml index 75b41362cf5..bdd28263004 100644 --- a/spring-boot-deployment-tests/pom.xml +++ b/spring-boot-deployment-tests/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-deployment-tests diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml index bd9a7cace8d..f25d0deb627 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-deployment-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-deployment-test-glassfish war diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml index e2c34eff08f..7f14677b02e 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-deployment-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-deployment-test-tomcat war diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml index 7cd3fb24df3..2f6d40008b6 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-deployment-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-deployment-test-tomee war diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml index 432721a1431..70dbeb2d4c6 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-deployment-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-deployment-test-wildfly war diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml index 69a7abf8578..a5d3736727a 100644 --- a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml +++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-deployment-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-deployment-test-wlp war diff --git a/spring-boot-devtools/pom.xml b/spring-boot-devtools/pom.xml index 54ff0c675fd..5354b557239 100644 --- a/spring-boot-devtools/pom.xml +++ b/spring-boot-devtools/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-devtools diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml index 2fae753c781..b9b73a200b5 100644 --- a/spring-boot-docs/pom.xml +++ b/spring-boot-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-docs diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml index ba8f060151c..36e5e7fd887 100644 --- a/spring-boot-full-build/pom.xml +++ b/spring-boot-full-build/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.boot spring-boot-full-build - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT pom Spring Boot Full Build Spring Boot Full Build diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml index 83035f030ae..0d6e22826c4 100644 --- a/spring-boot-integration-tests/pom.xml +++ b/spring-boot-integration-tests/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-integration-tests diff --git a/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml b/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml index e2d2a104662..acc1c7d9371 100644 --- a/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml +++ b/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 org.springframework.boot spring-boot-integration-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-configuration-processor-tests Spring Boot Configuration Processor Tests diff --git a/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml b/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml index a5683b5164a..c8dd8a6e560 100644 --- a/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml +++ b/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-integration-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-devtools-tests Spring Boot DevTools Tests diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml b/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml index d1e7f747cfd..2e05eeaad42 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-integration-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-gradle-tests jar diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml index b84e2da6391..0be7e83f718 100644 --- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml +++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-integration-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-integration-tests-embedded-servlet-container jar diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml b/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml index c6a4c986a82..347662cb90e 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-integration-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-launch-script-tests jar diff --git a/spring-boot-integration-tests/spring-boot-security-tests/pom.xml b/spring-boot-integration-tests/spring-boot-security-tests/pom.xml index f5d9afbb5cd..db0b5eb1863 100644 --- a/spring-boot-integration-tests/spring-boot-security-tests/pom.xml +++ b/spring-boot-integration-tests/spring-boot-security-tests/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-integration-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-security-tests pom diff --git a/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml index 62e728c0810..ddb386a1e53 100644 --- a/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml +++ b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-test-web-helloworld/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-security-tests - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../ spring-boot-security-test-web-helloworld diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index dfceb4ee31a..d657eafb922 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-dependencies - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-dependencies spring-boot-parent @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-test-support - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-samples org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-activemq Spring Boot ActiveMQ Sample diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml b/spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml index 0cff7e4d629..509a593dbce 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-actuator-log4j2 Spring Boot Actuator Log4j 2 Sample diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml b/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml index a172597218a..265e4a31002 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-actuator-noweb Spring Boot Actuator Non-Web Sample diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml index a8795423088..43b9ad0eb5e 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-actuator-ui Spring Boot Actuator UI Sample diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml index a22eb1d0114..cb18a807534 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-actuator Spring Boot Actuator Sample diff --git a/spring-boot-samples/spring-boot-sample-amqp/pom.xml b/spring-boot-samples/spring-boot-sample-amqp/pom.xml index 618fedee95f..ee288539286 100644 --- a/spring-boot-samples/spring-boot-sample-amqp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-amqp Spring Boot AMQP Sample diff --git a/spring-boot-samples/spring-boot-sample-ant/pom.xml b/spring-boot-samples/spring-boot-sample-ant/pom.xml index 6d8cd49101f..c6db8203add 100644 --- a/spring-boot-samples/spring-boot-sample-ant/pom.xml +++ b/spring-boot-samples/spring-boot-sample-ant/pom.xml @@ -1,10 +1,11 @@ - + + 4.0.0 org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-ant Spring Boot Ant Sample @@ -31,7 +32,7 @@ org.springframework.boot spring-boot-antlib - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT @@ -61,8 +62,8 @@ package - - + + @@ -102,4 +103,4 @@ - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-aop/pom.xml b/spring-boot-samples/spring-boot-sample-aop/pom.xml index 8edf8f4b58b..a8b902a4ce3 100644 --- a/spring-boot-samples/spring-boot-sample-aop/pom.xml +++ b/spring-boot-samples/spring-boot-sample-aop/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-aop Spring Boot AOP Sample diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/pom.xml b/spring-boot-samples/spring-boot-sample-atmosphere/pom.xml index 09c22afcd8b..28e880c9be6 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/pom.xml +++ b/spring-boot-samples/spring-boot-sample-atmosphere/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-atmosphere Spring Boot Atmosphere Sample diff --git a/spring-boot-samples/spring-boot-sample-batch/pom.xml b/spring-boot-samples/spring-boot-sample-batch/pom.xml index 544283a85a8..312076bce8f 100644 --- a/spring-boot-samples/spring-boot-sample-batch/pom.xml +++ b/spring-boot-samples/spring-boot-sample-batch/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-batch Spring Boot Batch Sample diff --git a/spring-boot-samples/spring-boot-sample-cache/pom.xml b/spring-boot-samples/spring-boot-sample-cache/pom.xml index 7689809a9a0..0a39e61d5d2 100644 --- a/spring-boot-samples/spring-boot-sample-cache/pom.xml +++ b/spring-boot-samples/spring-boot-sample-cache/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-cache Spring Boot Cache Sample diff --git a/spring-boot-samples/spring-boot-sample-custom-layout/pom.xml b/spring-boot-samples/spring-boot-sample-custom-layout/pom.xml index 6c0b6ecfb1b..a4c43172126 100644 --- a/spring-boot-samples/spring-boot-sample-custom-layout/pom.xml +++ b/spring-boot-samples/spring-boot-sample-custom-layout/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-custom-layout Spring Boot Custom Layout Sample diff --git a/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml b/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml index 038ec9e9496..2d037b212d8 100644 --- a/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-cassandra Spring Boot Data Cassandra Sample diff --git a/spring-boot-samples/spring-boot-sample-data-couchbase/pom.xml b/spring-boot-samples/spring-boot-sample-data-couchbase/pom.xml index fc46dd95dbb..fbec78d0eb2 100644 --- a/spring-boot-samples/spring-boot-sample-data-couchbase/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-couchbase/pom.xml @@ -4,7 +4,7 @@ spring-boot-samples org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-couchbase Spring Boot Data Couchbase Sample diff --git a/spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml b/spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml index fc03b162498..839910f5480 100644 --- a/spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-elasticsearch Spring Boot Data Elasticsearch Sample diff --git a/spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml b/spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml index 547b66a6f3c..712c4c1fd21 100644 --- a/spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-gemfire Spring Boot Data GemFire Sample diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml index 871bee0bdb7..4feb3f0ccd3 100755 --- a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-jpa Spring Boot Data JPA Sample diff --git a/spring-boot-samples/spring-boot-sample-data-ldap/pom.xml b/spring-boot-samples/spring-boot-sample-data-ldap/pom.xml index ba52a191c9c..4702e778f30 100644 --- a/spring-boot-samples/spring-boot-sample-data-ldap/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-ldap/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-ldap Spring Boot Data LDAP Sample diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml b/spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml index 73db92c93c2..c85e387c1e4 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-mongodb Spring Boot Data MongoDB Sample diff --git a/spring-boot-samples/spring-boot-sample-data-neo4j/pom.xml b/spring-boot-samples/spring-boot-sample-data-neo4j/pom.xml index a1be44ac956..3aee4d05a71 100644 --- a/spring-boot-samples/spring-boot-sample-data-neo4j/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-neo4j Spring Boot Data Neo4j Sample diff --git a/spring-boot-samples/spring-boot-sample-data-redis/pom.xml b/spring-boot-samples/spring-boot-sample-data-redis/pom.xml index e438e1160f5..3d73fca6f96 100644 --- a/spring-boot-samples/spring-boot-sample-data-redis/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-redis/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-redis Spring Boot Data Redis Sample diff --git a/spring-boot-samples/spring-boot-sample-data-rest/pom.xml b/spring-boot-samples/spring-boot-sample-data-rest/pom.xml index 4484efc9fb8..98e26681592 100644 --- a/spring-boot-samples/spring-boot-sample-data-rest/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-rest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-rest Spring Boot Data REST Sample diff --git a/spring-boot-samples/spring-boot-sample-data-solr/pom.xml b/spring-boot-samples/spring-boot-sample-data-solr/pom.xml index 5c7331636b7..b184bb93d86 100644 --- a/spring-boot-samples/spring-boot-sample-data-solr/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-solr/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-data-solr Spring Boot Data Solr Sample diff --git a/spring-boot-samples/spring-boot-sample-devtools/pom.xml b/spring-boot-samples/spring-boot-sample-devtools/pom.xml index e56b2ac4ae7..c2e0ef2b1f1 100644 --- a/spring-boot-samples/spring-boot-sample-devtools/pom.xml +++ b/spring-boot-samples/spring-boot-sample-devtools/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-devtools Spring Boot Developer Tools Sample diff --git a/spring-boot-samples/spring-boot-sample-flyway/pom.xml b/spring-boot-samples/spring-boot-sample-flyway/pom.xml index 1150d19b9b5..d3dd9c639ee 100644 --- a/spring-boot-samples/spring-boot-sample-flyway/pom.xml +++ b/spring-boot-samples/spring-boot-sample-flyway/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-flyway Spring Boot Flyway Sample diff --git a/spring-boot-samples/spring-boot-sample-hateoas/pom.xml b/spring-boot-samples/spring-boot-sample-hateoas/pom.xml index 064ff844659..02511588d6e 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hateoas/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-hateoas Spring Boot Hateoas Sample diff --git a/spring-boot-samples/spring-boot-sample-hibernate4/pom.xml b/spring-boot-samples/spring-boot-sample-hibernate4/pom.xml index 7f2391851a3..ab398179fee 100755 --- a/spring-boot-samples/spring-boot-sample-hibernate4/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hibernate4/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-hibernate4 Spring Boot Hibernate 4 Sample diff --git a/spring-boot-samples/spring-boot-sample-hibernate52/pom.xml b/spring-boot-samples/spring-boot-sample-hibernate52/pom.xml index 559895f3e15..64279d40d9e 100755 --- a/spring-boot-samples/spring-boot-sample-hibernate52/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hibernate52/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-hibernate52 Spring Boot Hibernate 5.2 Sample diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-gson/pom.xml b/spring-boot-samples/spring-boot-sample-hypermedia-gson/pom.xml index 5ab2d40ef5a..74a554be46f 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-gson/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hypermedia-gson/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-hypermedia-gson Spring Boot Hypermedia GSON Sample diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-hypermedia-jpa/pom.xml index b0881611e97..b4d1509985c 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-jpa/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hypermedia-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-hypermedia-jpa Spring Boot Hypermedia JPA Sample diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/pom.xml b/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/pom.xml index 969149309d3..98e5cc08b1d 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hypermedia-ui-secure/pom.xml @@ -3,7 +3,7 @@ spring-boot-samples org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT 4.0.0 spring-boot-sample-hypermedia-ui-secure diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-ui/pom.xml b/spring-boot-samples/spring-boot-sample-hypermedia-ui/pom.xml index 518c6e134de..e2c5e7dfdcb 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hypermedia-ui/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-hypermedia-ui Spring Boot Hypermedia UI Sample diff --git a/spring-boot-samples/spring-boot-sample-hypermedia/pom.xml b/spring-boot-samples/spring-boot-sample-hypermedia/pom.xml index e0027cde9fe..fbd6f60b0a3 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia/pom.xml +++ b/spring-boot-samples/spring-boot-sample-hypermedia/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-hypermedia Spring Boot Hypermedia Sample diff --git a/spring-boot-samples/spring-boot-sample-integration/pom.xml b/spring-boot-samples/spring-boot-sample-integration/pom.xml index c21735415c7..fbd8f76dc89 100644 --- a/spring-boot-samples/spring-boot-sample-integration/pom.xml +++ b/spring-boot-samples/spring-boot-sample-integration/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-integration Spring Boot Integration Sample diff --git a/spring-boot-samples/spring-boot-sample-jersey/pom.xml b/spring-boot-samples/spring-boot-sample-jersey/pom.xml index 1d72f1e01b1..dc5e0a7a62b 100644 --- a/spring-boot-samples/spring-boot-sample-jersey/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jersey/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jersey war diff --git a/spring-boot-samples/spring-boot-sample-jersey1/pom.xml b/spring-boot-samples/spring-boot-sample-jersey1/pom.xml index 5e32d9bdacb..a700895f5be 100644 --- a/spring-boot-samples/spring-boot-sample-jersey1/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jersey1/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jersey1 Spring Boot Jersey 1 Sample diff --git a/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml index 764d4197113..2aeb922bcf6 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jetty-jsp war diff --git a/spring-boot-samples/spring-boot-sample-jetty-ssl/pom.xml b/spring-boot-samples/spring-boot-sample-jetty-ssl/pom.xml index b3533f686a7..26751d78e54 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-ssl/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jetty-ssl Spring Boot Jetty SSL Sample diff --git a/spring-boot-samples/spring-boot-sample-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-jetty/pom.xml index 7e28c6e1bcd..9be7d1c76db 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jetty Spring Boot Jetty Sample diff --git a/spring-boot-samples/spring-boot-sample-jetty8-ssl/pom.xml b/spring-boot-samples/spring-boot-sample-jetty8-ssl/pom.xml index 5cc1ac0a038..709a4143dd0 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8-ssl/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty8-ssl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jetty8-ssl Spring Boot Jetty 8 SSL Sample diff --git a/spring-boot-samples/spring-boot-sample-jetty8/pom.xml b/spring-boot-samples/spring-boot-sample-jetty8/pom.xml index fce4bac2214..cab951e2169 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty8/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jetty8 Spring Boot Jetty 8 Sample diff --git a/spring-boot-samples/spring-boot-sample-jetty92/pom.xml b/spring-boot-samples/spring-boot-sample-jetty92/pom.xml index fe16f454030..5e497ee076f 100644 --- a/spring-boot-samples/spring-boot-sample-jetty92/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty92/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jetty92 Spring Boot Jetty 9.2 Sample diff --git a/spring-boot-samples/spring-boot-sample-jetty93/pom.xml b/spring-boot-samples/spring-boot-sample-jetty93/pom.xml index 04ebfa131bf..7b4f6fad07c 100644 --- a/spring-boot-samples/spring-boot-sample-jetty93/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty93/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jetty93 Spring Boot Jetty 9.3 Sample diff --git a/spring-boot-samples/spring-boot-sample-jooq/pom.xml b/spring-boot-samples/spring-boot-sample-jooq/pom.xml index 96d448fc59b..bea06dafe49 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jooq/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jooq Spring Boot jOOQ Sample diff --git a/spring-boot-samples/spring-boot-sample-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-jpa/pom.xml index 755312b898b..3a82f990525 100644 --- a/spring-boot-samples/spring-boot-sample-jpa/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jpa Spring Boot JPA Sample diff --git a/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml b/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml index ceb12fb36b5..7746a8c0a5e 100644 --- a/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jta-atomikos Spring Boot Atomikos JTA Sample diff --git a/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml b/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml index 9142ad8ce19..ddc99600a5d 100644 --- a/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jta-bitronix Spring Boot Bitronix JTA Sample diff --git a/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml b/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml index 83cad744e7c..6cce38212ef 100644 --- a/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jta-jndi Spring Boot JNDI JTA Sample diff --git a/spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml b/spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml index 463f9c1facb..205824cde42 100644 --- a/spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml @@ -4,7 +4,7 @@ spring-boot-samples org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-jta-narayana Spring Boot Narayana JTA Sample diff --git a/spring-boot-samples/spring-boot-sample-liquibase/pom.xml b/spring-boot-samples/spring-boot-sample-liquibase/pom.xml index 5b61ff48766..c93b4d982d3 100644 --- a/spring-boot-samples/spring-boot-sample-liquibase/pom.xml +++ b/spring-boot-samples/spring-boot-sample-liquibase/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-liquibase Spring Boot Liquibase Sample diff --git a/spring-boot-samples/spring-boot-sample-logback/pom.xml b/spring-boot-samples/spring-boot-sample-logback/pom.xml index 79acc385299..dde57d9205c 100644 --- a/spring-boot-samples/spring-boot-sample-logback/pom.xml +++ b/spring-boot-samples/spring-boot-sample-logback/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-logback Spring Boot Logback Sample diff --git a/spring-boot-samples/spring-boot-sample-metrics-dropwizard/pom.xml b/spring-boot-samples/spring-boot-sample-metrics-dropwizard/pom.xml index 2355a2a75e6..0c75caca306 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-dropwizard/pom.xml +++ b/spring-boot-samples/spring-boot-sample-metrics-dropwizard/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-metrics-dropwizard Spring Boot Metrics Dropwizard Sample diff --git a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/pom.xml b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/pom.xml index 6dce3939e24..8a215be182f 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/pom.xml +++ b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-metrics-opentsdb Spring Boot Metrics OpenTSDB Sample diff --git a/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml b/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml index 87c3ac5732d..fb6810ef4a6 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml +++ b/spring-boot-samples/spring-boot-sample-metrics-redis/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-metrics-redis Spring Boot Metrics Redis Sample diff --git a/spring-boot-samples/spring-boot-sample-parent-context/pom.xml b/spring-boot-samples/spring-boot-sample-parent-context/pom.xml index 1e78a98d89f..b674c7f050a 100644 --- a/spring-boot-samples/spring-boot-sample-parent-context/pom.xml +++ b/spring-boot-samples/spring-boot-sample-parent-context/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-parent-context Spring Boot Parent Context Sample diff --git a/spring-boot-samples/spring-boot-sample-profile/pom.xml b/spring-boot-samples/spring-boot-sample-profile/pom.xml index 3829ad399f7..024279d21e5 100644 --- a/spring-boot-samples/spring-boot-sample-profile/pom.xml +++ b/spring-boot-samples/spring-boot-sample-profile/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-profile Spring Boot Profile Sample diff --git a/spring-boot-samples/spring-boot-sample-property-validation/pom.xml b/spring-boot-samples/spring-boot-sample-property-validation/pom.xml index 548e5dcd46e..de08faed225 100644 --- a/spring-boot-samples/spring-boot-sample-property-validation/pom.xml +++ b/spring-boot-samples/spring-boot-sample-property-validation/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-property-validation Spring Boot Property Validation Sample diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/pom.xml index 30ad803342b..cda5afa6e17 100644 --- a/spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/pom.xml +++ b/spring-boot-samples/spring-boot-sample-secure-oauth2-actuator/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-secure-oauth2-actuator spring-boot-sample-secure-oauth2-actuator diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/pom.xml b/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/pom.xml index cecd9d4124e..a399c3a8bc9 100644 --- a/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/pom.xml +++ b/spring-boot-samples/spring-boot-sample-secure-oauth2-resource/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-secure-oauth2-resource spring-boot-sample-secure-oauth2-resource diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2/pom.xml b/spring-boot-samples/spring-boot-sample-secure-oauth2/pom.xml index 5c22a460b4d..a0d1be36940 100644 --- a/spring-boot-samples/spring-boot-sample-secure-oauth2/pom.xml +++ b/spring-boot-samples/spring-boot-sample-secure-oauth2/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-secure-oauth2 Spring Boot Security OAuth2 Sample diff --git a/spring-boot-samples/spring-boot-sample-secure/pom.xml b/spring-boot-samples/spring-boot-sample-secure/pom.xml index 69963fb86f7..25b6384760c 100644 --- a/spring-boot-samples/spring-boot-sample-secure/pom.xml +++ b/spring-boot-samples/spring-boot-sample-secure/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-secure Spring Boot Security Sample diff --git a/spring-boot-samples/spring-boot-sample-servlet/pom.xml b/spring-boot-samples/spring-boot-sample-servlet/pom.xml index ef5eb88efe0..2a810981d66 100644 --- a/spring-boot-samples/spring-boot-sample-servlet/pom.xml +++ b/spring-boot-samples/spring-boot-sample-servlet/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-servlet war diff --git a/spring-boot-samples/spring-boot-sample-session-redis/pom.xml b/spring-boot-samples/spring-boot-sample-session-redis/pom.xml index 3a347bd758d..ba180854c38 100644 --- a/spring-boot-samples/spring-boot-sample-session-redis/pom.xml +++ b/spring-boot-samples/spring-boot-sample-session-redis/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-session-redis Spring Boot Session Redis Sample diff --git a/spring-boot-samples/spring-boot-sample-simple/pom.xml b/spring-boot-samples/spring-boot-sample-simple/pom.xml index f734a63d5eb..70cb362cb1b 100644 --- a/spring-boot-samples/spring-boot-sample-simple/pom.xml +++ b/spring-boot-samples/spring-boot-sample-simple/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-simple Spring Boot Simple Sample diff --git a/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml b/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml index b6da1cf126e..63dedd4c6ed 100644 --- a/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml +++ b/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-test-nomockito Spring Boot Test Sample No Mockito diff --git a/spring-boot-samples/spring-boot-sample-test/pom.xml b/spring-boot-samples/spring-boot-sample-test/pom.xml index b480582db20..782e025a376 100644 --- a/spring-boot-samples/spring-boot-sample-test/pom.xml +++ b/spring-boot-samples/spring-boot-sample-test/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-test Spring Boot Test Sample diff --git a/spring-boot-samples/spring-boot-sample-testng/pom.xml b/spring-boot-samples/spring-boot-sample-testng/pom.xml index 3bd296b5c35..c00304ddb2d 100644 --- a/spring-boot-samples/spring-boot-sample-testng/pom.xml +++ b/spring-boot-samples/spring-boot-sample-testng/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-testng Spring Boot TestNG Sample diff --git a/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml index 83a2a464710..49e0c73ea07 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-tomcat-jsp war diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml index 42dcf6332d6..3e89d98d453 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-tomcat-multi-connectors Spring Boot Multi-Connector Tomcat Sample diff --git a/spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml index b9be0ae3e38..5c1d26d2807 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-tomcat-ssl Spring Boot Tomcat SSL Sample diff --git a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml index 9dd000f85d0..e3b0693a673 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-tomcat Spring Boot Tomcat Sample diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml index 6fae106ef72..3b24cf406d4 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-tomcat7-jsp war diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-ssl/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat7-ssl/pom.xml index cf07595f9ee..4bb3c65d7c1 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat7-ssl/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat7-ssl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-tomcat7-ssl Spring Boot Tomcat 7 SSL Sample diff --git a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml index c929a152b50..96c689b3515 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat80-ssl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-tomcat80-ssl Spring Boot Tomcat 8.0 SSL Sample diff --git a/spring-boot-samples/spring-boot-sample-traditional/pom.xml b/spring-boot-samples/spring-boot-sample-traditional/pom.xml index ee6b61d2cf8..df574c71227 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/pom.xml +++ b/spring-boot-samples/spring-boot-sample-traditional/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-traditional war diff --git a/spring-boot-samples/spring-boot-sample-undertow-ssl/pom.xml b/spring-boot-samples/spring-boot-sample-undertow-ssl/pom.xml index 4de4bbd0cfc..497c8d73f70 100644 --- a/spring-boot-samples/spring-boot-sample-undertow-ssl/pom.xml +++ b/spring-boot-samples/spring-boot-sample-undertow-ssl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-undertow-ssl Spring Boot Undertow SSL Sample diff --git a/spring-boot-samples/spring-boot-sample-undertow/pom.xml b/spring-boot-samples/spring-boot-sample-undertow/pom.xml index dfe13fbfd7f..25cf3d27a9f 100644 --- a/spring-boot-samples/spring-boot-sample-undertow/pom.xml +++ b/spring-boot-samples/spring-boot-sample-undertow/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-undertow Spring Boot Undertow Sample diff --git a/spring-boot-samples/spring-boot-sample-war/pom.xml b/spring-boot-samples/spring-boot-sample-war/pom.xml index e6a3e84bff6..e1ba5e1a3c4 100644 --- a/spring-boot-samples/spring-boot-sample-war/pom.xml +++ b/spring-boot-samples/spring-boot-sample-war/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-war war diff --git a/spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml b/spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml index 9db30e3b453..e6370b5fdfc 100644 --- a/spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-freemarker Spring Boot Web FreeMarker Sample diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml index 66c0757a660..578112ae3e3 100755 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-groovy-templates Spring Boot Web Groovy Templates Sample diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml index 720e440709b..eebfe3ec0b4 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-jsp/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-jsp war diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/pom.xml b/spring-boot-samples/spring-boot-sample-web-method-security/pom.xml index 6faa0387ea5..069397b6b6e 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-method-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-method-security Spring Boot Web Method Security Sample diff --git a/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml b/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml index 90356bac6b3..dbf5268130c 100644 --- a/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-mustache Spring Boot Web Mustache Sample diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml b/spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml index 401ff81b5ae..c942d37bcfe 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-secure-custom Spring Boot Web Secure Custom Sample diff --git a/spring-boot-samples/spring-boot-sample-web-secure-github/pom.xml b/spring-boot-samples/spring-boot-sample-web-secure-github/pom.xml index 78e6e50c54f..615e2c6b26a 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-github/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-secure-github/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-secure-github Spring Boot Web Secure GitHub Sample diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml index 58273b0ee13..e7a73c96c14 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-secure-jdbc Spring Boot Web Secure JDBC Sample diff --git a/spring-boot-samples/spring-boot-sample-web-secure/pom.xml b/spring-boot-samples/spring-boot-sample-web-secure/pom.xml index 010eb3d952c..12fa025e67e 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-secure/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-secure Spring Boot Web Secure Sample diff --git a/spring-boot-samples/spring-boot-sample-web-static/pom.xml b/spring-boot-samples/spring-boot-sample-web-static/pom.xml index cafe94f4711..dc7c04b7b57 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-static/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-static war diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml index 58e402754f4..ea96469f8f5 100755 --- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-thymeleaf3 Spring Boot Web Thymeleaf 3 Sample diff --git a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml index 2d18b78a076..c87d97070b9 100755 --- a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-web-ui Spring Boot Web UI Sample diff --git a/spring-boot-samples/spring-boot-sample-webservices/pom.xml b/spring-boot-samples/spring-boot-sample-webservices/pom.xml index cf7edb0886d..41f93d452c0 100644 --- a/spring-boot-samples/spring-boot-sample-webservices/pom.xml +++ b/spring-boot-samples/spring-boot-sample-webservices/pom.xml @@ -5,7 +5,7 @@ spring-boot-samples org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-webservices Spring Boot Web Services Sample diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml index 0233b21ce91..cff453a3d6e 100755 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-websocket-jetty Spring Boot WebSocket Jetty Sample diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty93/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-jetty93/pom.xml index 6de382103f2..c5c58d9da1a 100755 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty93/pom.xml +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty93/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-websocket-jetty93 Spring Boot WebSocket Jetty 9.3 Sample diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml index 7d1153eb108..dc95081ff45 100755 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-websocket-tomcat Spring Boot WebSocket Tomcat Sample diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml index 3e54ac443ac..1f9d86ccb5f 100755 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-websocket-undertow Spring Boot WebSocket Undertow Sample diff --git a/spring-boot-samples/spring-boot-sample-xml/pom.xml b/spring-boot-samples/spring-boot-sample-xml/pom.xml index 9199f390ebb..41f13dae7ce 100644 --- a/spring-boot-samples/spring-boot-sample-xml/pom.xml +++ b/spring-boot-samples/spring-boot-sample-xml/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-sample-xml Spring Boot XML Sample diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 1850814f6e8..747ed3fb2d0 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-starters diff --git a/spring-boot-starters/spring-boot-starter-activemq/pom.xml b/spring-boot-starters/spring-boot-starter-activemq/pom.xml index a86a098d23a..9f15e5941dc 100644 --- a/spring-boot-starters/spring-boot-starter-activemq/pom.xml +++ b/spring-boot-starters/spring-boot-starter-activemq/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-activemq Spring Boot ActiveMQ Starter diff --git a/spring-boot-starters/spring-boot-starter-actuator/pom.xml b/spring-boot-starters/spring-boot-starter-actuator/pom.xml index 700641c40eb..e7c5248f583 100644 --- a/spring-boot-starters/spring-boot-starter-actuator/pom.xml +++ b/spring-boot-starters/spring-boot-starter-actuator/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-actuator Spring Boot Actuator Starter diff --git a/spring-boot-starters/spring-boot-starter-amqp/pom.xml b/spring-boot-starters/spring-boot-starter-amqp/pom.xml index 6d97e4fd24f..8b7d40e83ae 100644 --- a/spring-boot-starters/spring-boot-starter-amqp/pom.xml +++ b/spring-boot-starters/spring-boot-starter-amqp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-amqp Spring Boot AMQP Starter diff --git a/spring-boot-starters/spring-boot-starter-aop/pom.xml b/spring-boot-starters/spring-boot-starter-aop/pom.xml index 34b067d383b..2d639192a88 100644 --- a/spring-boot-starters/spring-boot-starter-aop/pom.xml +++ b/spring-boot-starters/spring-boot-starter-aop/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-aop Spring Boot AOP Starter diff --git a/spring-boot-starters/spring-boot-starter-artemis/pom.xml b/spring-boot-starters/spring-boot-starter-artemis/pom.xml index 3f2085b41fc..ed2e5b2aed6 100644 --- a/spring-boot-starters/spring-boot-starter-artemis/pom.xml +++ b/spring-boot-starters/spring-boot-starter-artemis/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-artemis Spring Boot Artemis Starter diff --git a/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml index 832e414e934..a45d47200ab 100644 --- a/spring-boot-starters/spring-boot-starter-batch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-batch/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-batch Spring Boot Batch Starter diff --git a/spring-boot-starters/spring-boot-starter-cache/pom.xml b/spring-boot-starters/spring-boot-starter-cache/pom.xml index 731fe4635a9..c5f401aaf11 100644 --- a/spring-boot-starters/spring-boot-starter-cache/pom.xml +++ b/spring-boot-starters/spring-boot-starter-cache/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-cache Spring Boot Cache Starter diff --git a/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml b/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml index 895d8ccf500..0e36996e6e2 100644 --- a/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml +++ b/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-cloud-connectors Spring Boot Spring Cloud Connectors Starter diff --git a/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml b/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml index 2195ad9a032..1cc3e544a6d 100644 --- a/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-cassandra Spring Boot Data Cassandra Starter diff --git a/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml b/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml index a0e95e37f94..58b6ca555da 100644 --- a/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml @@ -4,7 +4,7 @@ spring-boot-starters org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-couchbase Spring Boot Data Couchbase Starter diff --git a/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml b/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml index ff40132064a..0bfbe4432d9 100644 --- a/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-elasticsearch Spring Boot Data Elasticsearch Starter diff --git a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml index b205c4ff2c4..925b37c708b 100644 --- a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-gemfire Spring Boot Data GemFire Starter diff --git a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml index 7882bfb24a1..d75f7c68922 100644 --- a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-jpa Spring Boot Data JPA Starter diff --git a/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml b/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml index 21ab115a777..8ae81a50121 100644 --- a/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml @@ -4,7 +4,7 @@ spring-boot-starters org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-ldap Spring Boot Data LDAP Starter diff --git a/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml b/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml index 2983a330cf2..3f556d068a9 100644 --- a/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-mongodb Spring Boot Data MongoDB Starter diff --git a/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml b/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml index 155b4a9b5ce..e49889c9b44 100644 --- a/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-neo4j Spring Boot Data Neo4j Starter diff --git a/spring-boot-starters/spring-boot-starter-data-redis/pom.xml b/spring-boot-starters/spring-boot-starter-data-redis/pom.xml index 8ea4065135e..918f189a722 100644 --- a/spring-boot-starters/spring-boot-starter-data-redis/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-redis/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-redis Spring Boot Data Redis Starter diff --git a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml index ad93195bd17..8b07d78b3b4 100644 --- a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-rest Spring Boot Data REST Starter diff --git a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml index a848af45ef9..940b5419947 100644 --- a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-data-solr Spring Boot Data Solr Starter diff --git a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml index 5794be5ab20..a05c7688315 100644 --- a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml +++ b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-freemarker Spring Boot FreeMarker Starter diff --git a/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml b/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml index 073e0eb72a2..2732031506f 100644 --- a/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml +++ b/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-groovy-templates Spring Boot Groovy Templates Starter diff --git a/spring-boot-starters/spring-boot-starter-hateoas/pom.xml b/spring-boot-starters/spring-boot-starter-hateoas/pom.xml index ede6ab7f2b1..fa5314aa05a 100644 --- a/spring-boot-starters/spring-boot-starter-hateoas/pom.xml +++ b/spring-boot-starters/spring-boot-starter-hateoas/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-hateoas Spring Boot HATEOAS Starter diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml index 118b99c1e58..425e5b9d202 100644 --- a/spring-boot-starters/spring-boot-starter-integration/pom.xml +++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-integration Spring Boot Integration Starter diff --git a/spring-boot-starters/spring-boot-starter-jdbc/pom.xml b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml index 3fd9131bd35..6cd4d299fb1 100644 --- a/spring-boot-starters/spring-boot-starter-jdbc/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-jdbc Spring Boot JDBC Starter diff --git a/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-starters/spring-boot-starter-jersey/pom.xml index b96ece68f36..93e92eeffb4 100644 --- a/spring-boot-starters/spring-boot-starter-jersey/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jersey/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-jersey Spring Boot Jersey Starter diff --git a/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-starters/spring-boot-starter-jetty/pom.xml index 8550433b2f0..370ed66f7ab 100644 --- a/spring-boot-starters/spring-boot-starter-jetty/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jetty/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-jetty Spring Boot Jetty Starter diff --git a/spring-boot-starters/spring-boot-starter-jooq/pom.xml b/spring-boot-starters/spring-boot-starter-jooq/pom.xml index 769ce50003c..157c5ba4361 100644 --- a/spring-boot-starters/spring-boot-starter-jooq/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jooq/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-jooq Spring Boot JOOQ Starter diff --git a/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml b/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml index b6b95611369..fac70abba39 100644 --- a/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-jta-atomikos Spring Boot Atomikos JTA Starter diff --git a/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml b/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml index aae69055c4b..98cc39afe0b 100644 --- a/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-jta-bitronix Spring Boot Bitronix JTA Starter diff --git a/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml b/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml index 9ac452d3dc9..7eed6068958 100644 --- a/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml @@ -4,7 +4,7 @@ spring-boot-starters org.springframework.boot - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-jta-narayana Spring Boot Narayana JTA Starter diff --git a/spring-boot-starters/spring-boot-starter-log4j2/pom.xml b/spring-boot-starters/spring-boot-starter-log4j2/pom.xml index 5da95e575a7..8de945adb5c 100644 --- a/spring-boot-starters/spring-boot-starter-log4j2/pom.xml +++ b/spring-boot-starters/spring-boot-starter-log4j2/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-log4j2 Spring Boot Log4j 2 Starter diff --git a/spring-boot-starters/spring-boot-starter-logging/pom.xml b/spring-boot-starters/spring-boot-starter-logging/pom.xml index 2d7a4e57856..4e581bc1e10 100644 --- a/spring-boot-starters/spring-boot-starter-logging/pom.xml +++ b/spring-boot-starters/spring-boot-starter-logging/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-logging Spring Boot Logging Starter diff --git a/spring-boot-starters/spring-boot-starter-mail/pom.xml b/spring-boot-starters/spring-boot-starter-mail/pom.xml index 0d11af9ea57..235ab3f38ff 100644 --- a/spring-boot-starters/spring-boot-starter-mail/pom.xml +++ b/spring-boot-starters/spring-boot-starter-mail/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-mail Spring Boot Mail Starter diff --git a/spring-boot-starters/spring-boot-starter-mobile/pom.xml b/spring-boot-starters/spring-boot-starter-mobile/pom.xml index ca7fcef65f8..cd26fff2743 100644 --- a/spring-boot-starters/spring-boot-starter-mobile/pom.xml +++ b/spring-boot-starters/spring-boot-starter-mobile/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-mobile Spring Boot Mobile Starter diff --git a/spring-boot-starters/spring-boot-starter-mustache/pom.xml b/spring-boot-starters/spring-boot-starter-mustache/pom.xml index b3079f4fdf9..fa3f5a5b0ad 100644 --- a/spring-boot-starters/spring-boot-starter-mustache/pom.xml +++ b/spring-boot-starters/spring-boot-starter-mustache/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-mustache Spring Boot Mustache Starter diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index d1879c10a04..3fc8588f1b4 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -1,9 +1,10 @@ - + + 4.0.0 org.springframework.boot spring-boot-dependencies - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../../spring-boot-dependencies spring-boot-starter-parent @@ -205,7 +206,7 @@ META-INF/spring.schemas - + ${start-class} @@ -217,4 +218,4 @@ - \ No newline at end of file + diff --git a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml index 8d2549f2cc5..9930231082b 100644 --- a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml +++ b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-remote-shell spring-boot-starter-remote-shell (DEPRECATED) diff --git a/spring-boot-starters/spring-boot-starter-security/pom.xml b/spring-boot-starters/spring-boot-starter-security/pom.xml index 4e207740240..144d0615215 100644 --- a/spring-boot-starters/spring-boot-starter-security/pom.xml +++ b/spring-boot-starters/spring-boot-starter-security/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-security Spring Boot Security Starter diff --git a/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml index a77fa9713f1..d677f548f24 100644 --- a/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml +++ b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-social-facebook Spring Boot Social Facebook Starter diff --git a/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml index dc95d0689fd..893f7815d2c 100644 --- a/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml +++ b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-social-linkedin Spring Boot Social LinkedIn Starter diff --git a/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml index d5f925f1be9..65bb0a641de 100644 --- a/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml +++ b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-social-twitter Spring Boot Social Twitter Starter diff --git a/spring-boot-starters/spring-boot-starter-test/pom.xml b/spring-boot-starters/spring-boot-starter-test/pom.xml index 4b4b6fb28b9..9be11439448 100644 --- a/spring-boot-starters/spring-boot-starter-test/pom.xml +++ b/spring-boot-starters/spring-boot-starter-test/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-test Spring Boot Test Starter diff --git a/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml b/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml index 10a542eb649..d446f7518dd 100644 --- a/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml +++ b/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-thymeleaf Spring Boot Thymeleaf Starter diff --git a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml index 4518b0c5cf3..004895166f9 100644 --- a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml +++ b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-tomcat Spring Boot Tomcat Starter diff --git a/spring-boot-starters/spring-boot-starter-undertow/pom.xml b/spring-boot-starters/spring-boot-starter-undertow/pom.xml index 10fc97aedb5..4ff552d02e8 100644 --- a/spring-boot-starters/spring-boot-starter-undertow/pom.xml +++ b/spring-boot-starters/spring-boot-starter-undertow/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-undertow Spring Boot Undertow Starter diff --git a/spring-boot-starters/spring-boot-starter-validation/pom.xml b/spring-boot-starters/spring-boot-starter-validation/pom.xml index bb97411687d..720f8d608e0 100644 --- a/spring-boot-starters/spring-boot-starter-validation/pom.xml +++ b/spring-boot-starters/spring-boot-starter-validation/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-validation Spring Boot Validation Starter diff --git a/spring-boot-starters/spring-boot-starter-web-services/pom.xml b/spring-boot-starters/spring-boot-starter-web-services/pom.xml index df1d7d4c291..7d1423ac05c 100644 --- a/spring-boot-starters/spring-boot-starter-web-services/pom.xml +++ b/spring-boot-starters/spring-boot-starter-web-services/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-web-services Spring Boot Web Services Starter diff --git a/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml index efeb34742b6..5c034c119f1 100644 --- a/spring-boot-starters/spring-boot-starter-web/pom.xml +++ b/spring-boot-starters/spring-boot-starter-web/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-web Spring Boot Web Starter diff --git a/spring-boot-starters/spring-boot-starter-websocket/pom.xml b/spring-boot-starters/spring-boot-starter-websocket/pom.xml index 132fbed076f..18d4524bb6b 100644 --- a/spring-boot-starters/spring-boot-starter-websocket/pom.xml +++ b/spring-boot-starters/spring-boot-starter-websocket/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter-websocket Spring Boot WebSocket Starter diff --git a/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-starters/spring-boot-starter/pom.xml index 94584a68145..c79ca216452 100644 --- a/spring-boot-starters/spring-boot-starter/pom.xml +++ b/spring-boot-starters/spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starters - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-starter Spring Boot Starter diff --git a/spring-boot-test-autoconfigure/pom.xml b/spring-boot-test-autoconfigure/pom.xml index a1fdcc1803b..21222632e19 100644 --- a/spring-boot-test-autoconfigure/pom.xml +++ b/spring-boot-test-autoconfigure/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-test-autoconfigure diff --git a/spring-boot-test/pom.xml b/spring-boot-test/pom.xml index ed54a53768f..9c54ec42bec 100644 --- a/spring-boot-test/pom.xml +++ b/spring-boot-test/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-test diff --git a/spring-boot-tools/pom.xml b/spring-boot-tools/pom.xml index 8b53f29a6a4..74eccc1f5dd 100644 --- a/spring-boot-tools/pom.xml +++ b/spring-boot-tools/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot-tools diff --git a/spring-boot-tools/spring-boot-antlib/pom.xml b/spring-boot-tools/spring-boot-antlib/pom.xml index ae68e62f5ff..009e508d05d 100644 --- a/spring-boot-tools/spring-boot-antlib/pom.xml +++ b/spring-boot-tools/spring-boot-antlib/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-antlib Spring Boot Antlib diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml b/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml index d66b81b7847..dcc5c92462e 100644 --- a/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml +++ b/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-autoconfigure-processor Spring Boot Auto-Configure Annotation Processor diff --git a/spring-boot-tools/spring-boot-configuration-metadata/pom.xml b/spring-boot-tools/spring-boot-configuration-metadata/pom.xml index 76caff79e2c..782ec6ed6cf 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/pom.xml +++ b/spring-boot-tools/spring-boot-configuration-metadata/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-configuration-metadata Spring Boot Configuration Metadata diff --git a/spring-boot-tools/spring-boot-configuration-processor/pom.xml b/spring-boot-tools/spring-boot-configuration-processor/pom.xml index 965468403ea..a846cbb7c68 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/pom.xml +++ b/spring-boot-tools/spring-boot-configuration-processor/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-configuration-processor Spring Boot Configuration Processor diff --git a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml index a321e58b843..78b9d77ac46 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-gradle-plugin Spring Boot Gradle Plugin diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml index c07caba7007..55590d773b2 100644 --- a/spring-boot-tools/spring-boot-loader-tools/pom.xml +++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-loader-tools Spring Boot Loader Tools diff --git a/spring-boot-tools/spring-boot-loader/pom.xml b/spring-boot-tools/spring-boot-loader/pom.xml index b5b7485998b..9cfc15e6fe8 100644 --- a/spring-boot-tools/spring-boot-loader/pom.xml +++ b/spring-boot-tools/spring-boot-loader/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-loader Spring Boot Loader diff --git a/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml index 79afc1e4032..93a99ea06d4 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-maven-plugin maven-plugin diff --git a/spring-boot-tools/spring-boot-test-support/pom.xml b/spring-boot-tools/spring-boot-test-support/pom.xml index 6cdc5ec863e..ddd7190abe6 100644 --- a/spring-boot-tools/spring-boot-test-support/pom.xml +++ b/spring-boot-tools/spring-boot-test-support/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-tools - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT spring-boot-test-support Spring Boot Testing Support diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 12dff38ca3d..8e80c17e00d 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-parent - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT ../spring-boot-parent spring-boot From 21eb8d89bb52fb1d5beeb36b02b6a391687ec5c4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 30 Jan 2018 17:16:04 -0800 Subject: [PATCH 05/10] Fixup version numbers following release --- spring-boot-dependencies/pom.xml | 7 +++---- .../spring-boot-sample-actuator/build.gradle | 2 +- spring-boot-samples/spring-boot-sample-ant/build.xml | 2 +- spring-boot-samples/spring-boot-sample-ant/pom.xml | 11 +++++------ .../spring-boot-sample-logback/build.gradle | 2 +- .../spring-boot-sample-profile/build.gradle | 2 +- .../spring-boot-sample-simple/build.gradle | 2 +- .../spring-boot-sample-web-static/build.gradle | 2 +- .../spring-boot-sample-web-ui/build.gradle | 2 +- .../spring-boot-starter-parent/pom.xml | 9 ++++----- 10 files changed, 19 insertions(+), 22 deletions(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 15b614086b5..fa0337d48b9 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 org.springframework.boot spring-boot-dependencies @@ -2812,7 +2811,7 @@ org.springframework.boot spring-boot-maven-plugin - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT org.apache.maven.plugins @@ -3033,4 +3032,4 @@ integration-test - + \ No newline at end of file diff --git a/spring-boot-samples/spring-boot-sample-actuator/build.gradle b/spring-boot-samples/spring-boot-sample-actuator/build.gradle index cd7dff8b10d..37a46e87575 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/build.gradle +++ b/spring-boot-samples/spring-boot-sample-actuator/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = '1.5.10.BUILD-SNAPSHOT' + springBootVersion = '1.5.11.BUILD-SNAPSHOT' } repositories { // NOTE: You should declare only repositories that you need here diff --git a/spring-boot-samples/spring-boot-sample-ant/build.xml b/spring-boot-samples/spring-boot-sample-ant/build.xml index d68c8b6f251..b5fefaeebfd 100644 --- a/spring-boot-samples/spring-boot-sample-ant/build.xml +++ b/spring-boot-samples/spring-boot-sample-ant/build.xml @@ -11,7 +11,7 @@ actual jars). Run with '$ java -jar target/*.jar'. - + diff --git a/spring-boot-samples/spring-boot-sample-ant/pom.xml b/spring-boot-samples/spring-boot-sample-ant/pom.xml index c6db8203add..2dd307958c0 100644 --- a/spring-boot-samples/spring-boot-sample-ant/pom.xml +++ b/spring-boot-samples/spring-boot-sample-ant/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 @@ -62,8 +61,8 @@ package - - + + @@ -85,7 +84,7 @@ org.springframework.boot spring-boot-antlib - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT @@ -103,4 +102,4 @@ - + \ No newline at end of file diff --git a/spring-boot-samples/spring-boot-sample-logback/build.gradle b/spring-boot-samples/spring-boot-sample-logback/build.gradle index cef94c86b5c..fd202efdcba 100644 --- a/spring-boot-samples/spring-boot-sample-logback/build.gradle +++ b/spring-boot-samples/spring-boot-sample-logback/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = '1.5.10.BUILD-SNAPSHOT' + springBootVersion = '1.5.11.BUILD-SNAPSHOT' } repositories { // NOTE: You should declare only repositories that you need here diff --git a/spring-boot-samples/spring-boot-sample-profile/build.gradle b/spring-boot-samples/spring-boot-sample-profile/build.gradle index c841ede557f..d7272a214fc 100644 --- a/spring-boot-samples/spring-boot-sample-profile/build.gradle +++ b/spring-boot-samples/spring-boot-sample-profile/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = '1.5.10.BUILD-SNAPSHOT' + springBootVersion = '1.5.11.BUILD-SNAPSHOT' } repositories { // NOTE: You should declare only repositories that you need here diff --git a/spring-boot-samples/spring-boot-sample-simple/build.gradle b/spring-boot-samples/spring-boot-sample-simple/build.gradle index cef94c86b5c..fd202efdcba 100644 --- a/spring-boot-samples/spring-boot-sample-simple/build.gradle +++ b/spring-boot-samples/spring-boot-sample-simple/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = '1.5.10.BUILD-SNAPSHOT' + springBootVersion = '1.5.11.BUILD-SNAPSHOT' } repositories { // NOTE: You should declare only repositories that you need here diff --git a/spring-boot-samples/spring-boot-sample-web-static/build.gradle b/spring-boot-samples/spring-boot-sample-web-static/build.gradle index d6e249e0cca..3ea96124ec0 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/build.gradle +++ b/spring-boot-samples/spring-boot-sample-web-static/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = '1.5.10.BUILD-SNAPSHOT' + springBootVersion = '1.5.11.BUILD-SNAPSHOT' } repositories { // NOTE: You should declare only repositories that you need here diff --git a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle index 3e85c26ce55..f92232a322a 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle +++ b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = '1.5.10.BUILD-SNAPSHOT' + springBootVersion = '1.5.11.BUILD-SNAPSHOT' springLoadedVersion = '1.2.4.RELEASE' } repositories { diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index 3fc8588f1b4..9682f258aea 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -1,5 +1,4 @@ - - + 4.0.0 org.springframework.boot @@ -172,7 +171,7 @@ org.springframework.boot spring-boot-maven-plugin - 1.5.10.BUILD-SNAPSHOT + 1.5.11.BUILD-SNAPSHOT @@ -206,7 +205,7 @@ META-INF/spring.schemas - + ${start-class} @@ -218,4 +217,4 @@ - + \ No newline at end of file From dc48a90184dc12b16f71842e1313a5da6f72d472 Mon Sep 17 00:00:00 2001 From: Henrich Kraemer Date: Fri, 2 Feb 2018 14:21:00 +0100 Subject: [PATCH 06/10] Prevent reverse name lookup when configuring Jetty's address Previously, the host on Jetty's connector was configured using the host address of the InetSocketAddress. This could result in reverse name resolution that could cause Jetty to bind to a different IP address than was configured. This commit updates the configuration code to use the host string when specifically does not perform reverse name resolution. See gh-11889 --- .../JettyEmbeddedServletContainerFactory.java | 6 ++-- ...yEmbeddedServletContainerFactoryTests.java | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index bc31108a729..2be9c21a264 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -101,6 +101,8 @@ import org.springframework.util.StringUtils; * @author Eddú Meléndez * @author Venil Noronha * @author Henri Kerola + * @author Henrich Krämer + * * @see #setPort(int) * @see #setConfigurations(Collection) * @see JettyEmbeddedServletContainer @@ -895,7 +897,7 @@ public class JettyEmbeddedServletContainerFactory ReflectionUtils.findMethod(connectorClass, "setPort", int.class) .invoke(connector, address.getPort()); ReflectionUtils.findMethod(connectorClass, "setHost", String.class) - .invoke(connector, address.getHostName()); + .invoke(connector, address.getHostString()); if (acceptors > 0) { ReflectionUtils.findMethod(connectorClass, "setAcceptors", int.class) .invoke(connector, acceptors); @@ -924,7 +926,7 @@ public class JettyEmbeddedServletContainerFactory public AbstractConnector createConnector(Server server, InetSocketAddress address, int acceptors, int selectors) { ServerConnector connector = new ServerConnector(server, acceptors, selectors); - connector.setHost(address.getHostName()); + connector.setHost(address.getHostString()); connector.setPort(address.getPort()); for (ConnectionFactory connectionFactory : connector .getConnectionFactories()) { diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index cce0048cd66..7faf6652e51 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.context.embedded.jetty; import java.io.IOException; +import java.net.InetAddress; import java.nio.charset.Charset; import java.util.Arrays; import java.util.Locale; @@ -35,6 +36,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.jasper.servlet.JspServlet; +import org.eclipse.jetty.server.AbstractNetworkConnector; +import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -114,6 +117,32 @@ public class JettyEmbeddedServletContainerFactoryTests } } + @Test + public void specificIPAddressNotReverseResolved() throws Exception { + JettyEmbeddedServletContainerFactory factory = getFactory(); + final String[] refAncHost = new String[1]; + refAncHost[0] = "HostNotSetInAbstractNetworkConnector"; + InetAddress lhAddress = InetAddress.getLocalHost(); + InetAddress address = InetAddress.getByAddress(lhAddress.getAddress()); + // the address should have no host name associated with ith + String expectedHost = address.getHostAddress(); + factory.setAddress(address); + factory.addServerCustomizers(server -> { + for (Connector connector : server.getConnectors()) { + if (connector instanceof AbstractNetworkConnector) { + @SuppressWarnings("resource") + AbstractNetworkConnector anc = (AbstractNetworkConnector) connector; + String ancHost = anc.getHost(); + refAncHost[0] = ancHost; + break; + } + } + }); + this.container = factory + .getEmbeddedServletContainer(exampleServletRegistration()); + assertThat(refAncHost[0]).isEqualTo(expectedHost); + } + @Test public void sessionTimeout() throws Exception { JettyEmbeddedServletContainerFactory factory = getFactory(); From dc1e1e82804cf76792ba3c9a3846e3615a55beb1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 2 Feb 2018 14:48:06 +0000 Subject: [PATCH 07/10] =?UTF-8?q?Polish=20=E2=80=9CPrevent=20reverse=20nam?= =?UTF-8?q?e=20lookup=20when=20configuring=20Jetty's=20address=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-11889 --- .../JettyEmbeddedServletContainerFactory.java | 2 +- ...yEmbeddedServletContainerFactoryTests.java | 30 +++++-------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 2be9c21a264..a797232f79e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 7faf6652e51..5403f2b28df 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.jasper.servlet.JspServlet; -import org.eclipse.jetty.server.AbstractNetworkConnector; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; @@ -120,27 +119,14 @@ public class JettyEmbeddedServletContainerFactoryTests @Test public void specificIPAddressNotReverseResolved() throws Exception { JettyEmbeddedServletContainerFactory factory = getFactory(); - final String[] refAncHost = new String[1]; - refAncHost[0] = "HostNotSetInAbstractNetworkConnector"; - InetAddress lhAddress = InetAddress.getLocalHost(); - InetAddress address = InetAddress.getByAddress(lhAddress.getAddress()); - // the address should have no host name associated with ith - String expectedHost = address.getHostAddress(); - factory.setAddress(address); - factory.addServerCustomizers(server -> { - for (Connector connector : server.getConnectors()) { - if (connector instanceof AbstractNetworkConnector) { - @SuppressWarnings("resource") - AbstractNetworkConnector anc = (AbstractNetworkConnector) connector; - String ancHost = anc.getHost(); - refAncHost[0] = ancHost; - break; - } - } - }); - this.container = factory - .getEmbeddedServletContainer(exampleServletRegistration()); - assertThat(refAncHost[0]).isEqualTo(expectedHost); + InetAddress localhost = InetAddress.getLocalHost(); + factory.setAddress(InetAddress.getByAddress(localhost.getAddress())); + this.container = factory.getEmbeddedServletContainer(); + this.container.start(); + Connector connector = ((JettyEmbeddedServletContainer) this.container).getServer() + .getConnectors()[0]; + assertThat(((ServerConnector) connector).getHost()) + .isEqualTo(localhost.getHostAddress()); } @Test From 6c305e09c38d2791ce2c98edfaea176530fa1604 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Feb 2018 10:50:55 +0000 Subject: [PATCH 08/10] Reinject mocks when context is dirtied before each method Closes gh-11903 --- .../mockito/MockitoTestExecutionListener.java | 96 ++++++++++++++++--- ...ClassModeBeforeMethodIntegrationTests.java | 63 ++++++++++++ .../MockitoTestExecutionListenerTests.java | 26 ++++- ...ClassModeBeforeMethodIntegrationTests.java | 62 ++++++++++++ 4 files changed, 231 insertions(+), 16 deletions(-) create mode 100644 spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java create mode 100644 spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java index 0521c27f4b9..50d8e23a02f 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import java.util.Set; import org.mockito.Captor; import org.mockito.MockitoAnnotations; -import org.springframework.context.ApplicationContext; import org.springframework.test.context.TestContext; import org.springframework.test.context.TestExecutionListener; import org.springframework.test.context.support.AbstractTestExecutionListener; +import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils.FieldCallback; @@ -37,16 +37,35 @@ import org.springframework.util.ReflectionUtils.FieldCallback; * annotations. * * @author Phillip Webb + * @author Andy Wilkinson * @since 1.4.2 */ public class MockitoTestExecutionListener extends AbstractTestExecutionListener { @Override public void prepareTestInstance(TestContext testContext) throws Exception { + initMocks(testContext); + injectFields(testContext); + } + + @Override + public void beforeTestMethod(TestContext testContext) throws Exception { + if (Boolean.TRUE.equals(testContext.getAttribute( + DependencyInjectionTestExecutionListener.REINJECT_DEPENDENCIES_ATTRIBUTE))) { + initMocks(testContext); + reinjectFields(testContext); + } + } + + @Override + public int getOrder() { + return 1950; + } + + private void initMocks(TestContext testContext) { if (hasMockitoAnnotations(testContext)) { MockitoAnnotations.initMocks(testContext.getTestInstance()); } - injectFields(testContext); } private boolean hasMockitoAnnotations(TestContext testContext) { @@ -56,21 +75,46 @@ public class MockitoTestExecutionListener extends AbstractTestExecutionListener } private void injectFields(TestContext testContext) { + postProcessFields(testContext, new MockitoFieldHandler() { + + @Override + public void handle(MockitoField mockitoField, + MockitoPostProcessor postProcessor) { + postProcessor.inject(mockitoField.field, mockitoField.target, + mockitoField.definition); + } + + }); + } + + private void reinjectFields(final TestContext testContext) { + postProcessFields(testContext, new MockitoFieldHandler() { + + @Override + public void handle(MockitoField mockitoField, + MockitoPostProcessor postProcessor) { + ReflectionUtils.makeAccessible(mockitoField.field); + ReflectionUtils.setField(mockitoField.field, + testContext.getTestInstance(), null); + postProcessor.inject(mockitoField.field, mockitoField.target, + mockitoField.definition); + } + + }); + } + + private void postProcessFields(TestContext testContext, MockitoFieldHandler handler) { DefinitionsParser parser = new DefinitionsParser(); parser.parse(testContext.getTestClass()); if (!parser.getDefinitions().isEmpty()) { - injectFields(testContext, parser); - } - } - - private void injectFields(TestContext testContext, DefinitionsParser parser) { - ApplicationContext applicationContext = testContext.getApplicationContext(); - MockitoPostProcessor postProcessor = applicationContext - .getBean(MockitoPostProcessor.class); - for (Definition definition : parser.getDefinitions()) { - Field field = parser.getField(definition); - if (field != null) { - postProcessor.inject(field, testContext.getTestInstance(), definition); + MockitoPostProcessor postProcessor = testContext.getApplicationContext() + .getBean(MockitoPostProcessor.class); + for (Definition definition : parser.getDefinitions()) { + Field field = parser.getField(definition); + if (field != null) { + handler.handle(new MockitoField(field, testContext.getTestInstance(), + definition), postProcessor); + } } } } @@ -98,4 +142,26 @@ public class MockitoTestExecutionListener extends AbstractTestExecutionListener } + private static final class MockitoField { + + private final Field field; + + private final Object target; + + private final Definition definition; + + private MockitoField(Field field, Object instance, Definition definition) { + this.field = field; + this.target = instance; + this.definition = definition; + } + + } + + private interface MockitoFieldHandler { + + void handle(MockitoField mockitoField, MockitoPostProcessor postProcessor); + + } + } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java new file mode 100644 index 00000000000..e766d0f514a --- /dev/null +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java @@ -0,0 +1,63 @@ +/* + * Copyright 2012-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.test.mock.mockito; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.mock.mockito.example.ExampleService; +import org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.DirtiesContext.ClassMode; +import org.springframework.test.annotation.DirtiesContext.MethodMode; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; + +/** + * Integration tests for using {@link MockBean} with {@link DirtiesContext} and + * {@link MethodMode#BEFORE_METHOD}. + * + * @author Andy Wilkinson + */ +@RunWith(SpringRunner.class) +@DirtiesContext(classMode = ClassMode.BEFORE_EACH_TEST_METHOD) +public class MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests { + + @MockBean + private ExampleService exampleService; + + @Autowired + private ExampleServiceCaller caller; + + @Test + public void testMocking() throws Exception { + given(this.exampleService.greeting()).willReturn("Boot"); + assertThat(this.caller.sayGreeting()).isEqualTo("I say Boot"); + } + + @Configuration + @Import(ExampleServiceCaller.class) + static class Config { + + } + +} diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java index d3c5ce1a66d..3ce40000f67 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import org.mockito.MockitoAnnotations; import org.springframework.context.ApplicationContext; import org.springframework.test.context.TestContext; +import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; @@ -35,6 +36,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; /** * Tests for {@link MockitoTestExecutionListener}. @@ -78,6 +80,28 @@ public class MockitoTestExecutionListenerTests { assertThat(this.fieldCaptor.getValue().getName()).isEqualTo("mockBean"); } + @Test + public void beforeTestMethodShouldDoNothingWhenDirtiesContextAttributeIsNotSet() + throws Exception { + WithMockBean instance = new WithMockBean(); + this.listener.beforeTestMethod(mockTestContext(instance)); + verifyNoMoreInteractions(this.postProcessor); + } + + @Test + public void beforeTestMethodShouldInjectMockBeanWhenDirtiesContextAttributeIsSet() + throws Exception { + WithMockBean instance = new WithMockBean(); + TestContext mockTestContext = mockTestContext(instance); + given(mockTestContext.getAttribute( + DependencyInjectionTestExecutionListener.REINJECT_DEPENDENCIES_ATTRIBUTE)) + .willReturn(Boolean.TRUE); + this.listener.beforeTestMethod(mockTestContext); + verify(this.postProcessor).inject(this.fieldCaptor.capture(), eq(instance), + (MockDefinition) any()); + assertThat(this.fieldCaptor.getValue().getName()).isEqualTo("mockBean"); + } + @SuppressWarnings({ "unchecked", "rawtypes" }) private TestContext mockTestContext(Object instance) { TestContext testContext = mock(TestContext.class); diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java new file mode 100644 index 00000000000..21d67c8da87 --- /dev/null +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java @@ -0,0 +1,62 @@ +/* + * Copyright 2012-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.test.mock.mockito; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.mock.mockito.example.ExampleServiceCaller; +import org.springframework.boot.test.mock.mockito.example.SimpleExampleService; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.DirtiesContext.ClassMode; +import org.springframework.test.annotation.DirtiesContext.MethodMode; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.mockito.Mockito.verify; + +/** + * Integration tests for using {@link SpyBean} with {@link DirtiesContext} and + * {@link MethodMode#BEFORE_METHOD}. + * + * @author Andy Wilkinson + */ +@RunWith(SpringRunner.class) +@DirtiesContext(classMode = ClassMode.BEFORE_EACH_TEST_METHOD) +public class SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests { + + @SpyBean + private SimpleExampleService exampleService; + + @Autowired + private ExampleServiceCaller caller; + + @Test + public void testSpying() throws Exception { + this.caller.sayGreeting(); + verify(this.exampleService).greeting(); + } + + @Configuration + @Import(ExampleServiceCaller.class) + static class Config { + + } + +} From c4395afa79aedd673fd0ddc3c63663dc169b7e03 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 5 Feb 2018 19:16:45 +0000 Subject: [PATCH 09/10] Polish --- ...ithDirtiesContextClassModeBeforeMethodIntegrationTests.java | 3 +-- ...ithDirtiesContextClassModeBeforeMethodIntegrationTests.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java index e766d0f514a..e80b8341780 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java @@ -26,7 +26,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.springframework.test.annotation.DirtiesContext.MethodMode; import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; @@ -34,7 +33,7 @@ import static org.mockito.BDDMockito.given; /** * Integration tests for using {@link MockBean} with {@link DirtiesContext} and - * {@link MethodMode#BEFORE_METHOD}. + * {@link ClassMode#BEFORE_EACH_TEST_METHOD}. * * @author Andy Wilkinson */ diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java index 21d67c8da87..adc5b5d2a01 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithDirtiesContextClassModeBeforeMethodIntegrationTests.java @@ -26,14 +26,13 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.springframework.test.annotation.DirtiesContext.MethodMode; import org.springframework.test.context.junit4.SpringRunner; import static org.mockito.Mockito.verify; /** * Integration tests for using {@link SpyBean} with {@link DirtiesContext} and - * {@link MethodMode#BEFORE_METHOD}. + * {@link ClassMode#BEFORE_EACH_TEST_METHOD}. * * @author Andy Wilkinson */ From 37ce1784ab61163b3534dedd7507b39e15a0ecb9 Mon Sep 17 00:00:00 2001 From: Marcus Eisele Date: Fri, 9 Feb 2018 21:14:45 +0100 Subject: [PATCH 10/10] Update MySQL validation query to use lightweight ping Closes gh-11981 --- .../main/java/org/springframework/boot/jdbc/DatabaseDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index c2eab5f49ba..adf4984548e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -67,7 +67,7 @@ public enum DatabaseDriver { * MySQL. */ MYSQL("MySQL", "com.mysql.jdbc.Driver", - "com.mysql.jdbc.jdbc2.optional.MysqlXADataSource", "SELECT 1"), + "com.mysql.jdbc.jdbc2.optional.MysqlXADataSource", "/* ping */ SELECT 1"), /** * Maria DB.