Release 2.7.0

Closes gh-2084

.sdkmanrc

@@ -0,0 +1,6 @@
+# Use sdkman to run "sdk env" to initialize with correct JDK version
+# Enable auto-env through the sdkman_auto_env config
+# See https://sdkman.io/usage#config
+# A summary is to add the following to ~/.sdkman/etc/config
+# sdkman_auto_env=true
+java=8.0.332-zulu

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-version=2.7.0-SNAPSHOT
+version=2.7.0

gradle/dependency-management.gradle

@@ -1,11 +1,11 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.18'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.19'
 		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328'
 		mavenBom 'org.junit:junit-bom:5.8.2'
-		mavenBom 'org.springframework:spring-framework-bom:5.3.19'
-		mavenBom 'org.springframework.data:spring-data-bom:2021.2.0-RC1'
-		mavenBom 'org.springframework.security:spring-security-bom:5.7.0-RC1'
+		mavenBom 'org.springframework:spring-framework-bom:5.3.20'
+		mavenBom 'org.springframework.data:spring-data-bom:2021.2.0'
+		mavenBom 'org.springframework.security:spring-security-bom:5.7.0'
 		mavenBom 'org.testcontainers:testcontainers-bom:1.17.1'
 	}
 

spring-session-docs/antora.yml

@@ -1,3 +1,2 @@
 name: ROOT
 version: '2.7.0'
-prerelease: '-SNAPSHOT'

spring-session-samples/spring-session-sample-boot-mongodb-reactive/spring-session-sample-boot-mongodb-reactive.gradle

@@ -5,7 +5,7 @@ dependencies {
 	implementation  "org.springframework.boot:spring-boot-starter-webflux"
 	implementation  "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation  "org.springframework.boot:spring-boot-starter-data-mongodb-reactive"
-    implementation  "org.testcontainers:mongodb"
+	implementation  "de.flapdoodle.embed:de.flapdoodle.embed.mongo"
 
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
 	testImplementation "org.seleniumhq.selenium:htmlunit-driver"

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/java/org/springframework/session/mongodb/examples/SpringSessionMongoReactiveApplication.java

@@ -18,16 +18,7 @@ package org.springframework.session.mongodb.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
 import org.springframework.session.data.mongo.config.annotation.web.reactive.EnableMongoWebSession;
-import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Pure Spring-based application (using Spring Boot for dependency management), hence no
@@ -40,35 +31,8 @@ import java.util.Map;
 @EnableMongoWebSession
 public class SpringSessionMongoReactiveApplication {
 
-	/**
-	 * Use Testcontainers to managed MongoDB through Docker.
-	 * <p>
-	 * @see https://bsideup.github.io/posts/local_development_with_testcontainers/
-	 */
-	static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-		static MongoDBContainer mongo = new MongoDBContainer(DockerImageName.parse("mongo:5.0"));
-
-		public static Map<String, String> getProperties() {
-			mongo.start();
-
-			HashMap<String, String> properties = new HashMap<>();
-			properties.put("spring.data.mongodb.host", mongo.getHost());
-			properties.put("spring.data.mongodb.port", mongo.getFirstMappedPort() + "");
-			return properties;
-		}
-
-		@Override
-		public void initialize(ConfigurableApplicationContext context) {
-			ConfigurableEnvironment env = context.getEnvironment();
-			env.getPropertySources().addFirst(new MapPropertySource("testcontainers", (Map) getProperties()));
-		}
-	}
-
-
 	public static void main(String[] args) {
-		SpringApplication application = new SpringApplication(SpringSessionMongoReactiveApplication.class);
-		application.addInitializers(new Initializer());
-		application.run(args);
+		SpringApplication.run(SpringSessionMongoReactiveApplication.class);
 	}
+
 }

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.properties

@@ -1,2 +0,0 @@
-logging.level.org.springframework.data.mongodb=DEBUG
-logging.level.org.springframework.session=DEBUG

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml

@@ -0,0 +1,8 @@
+logging:
+  level:
+    org.springframework.data.mongodb: DEBUG
+    org.springframework.session: DEBUG
+spring:
+  mongodb:
+    embedded:
+      version: 3.4.3

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/test/java/org/springframework/session/mongodb/examples/AttributeTests.java

@@ -16,21 +16,21 @@
 
 package org.springframework.session.mongodb.examples;
 
+import java.util.List;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.session.mongodb.examples.pages.HomePage;
 import org.springframework.session.mongodb.examples.pages.HomePage.Attribute;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -39,7 +39,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ContextConfiguration(initializers = SpringSessionMongoReactiveApplication.Initializer.class)
 public class AttributeTests {
 
 	@LocalServerPort

spring-session-samples/spring-session-sample-boot-mongodb-traditional/spring-session-sample-boot-mongodb-traditional.gradle

@@ -8,8 +8,7 @@ dependencies {
     implementation  "org.thymeleaf.extras:thymeleaf-extras-springsecurity5"
     implementation "org.springframework.boot:spring-boot-starter-data-mongodb"
     implementation "org.springframework.boot:spring-boot-starter-security"
-    implementation "org.testcontainers:mongodb"
-
+    implementation "de.flapdoodle.embed:de.flapdoodle.embed.mongo"
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.seleniumhq.selenium:htmlunit-driver"

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/EmbeddedMongoPortLogger.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014-2016 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
+ *
+ *      https://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.session.mongodb.examples;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+class EmbeddedMongoPortLogger implements ApplicationRunner, EnvironmentAware {
+
+	private static final Log logger = LogFactory.getLog(EmbeddedMongoPortLogger.class);
+
+	private Environment environment;
+
+	@Override
+	public void run(ApplicationArguments args) throws Exception {
+		String port = this.environment.getProperty("local.mongo.port");
+		logger.info("Embedded Mongo started on port " + port + ", use 'mongo --port " + port + "' command to connect");
+	}
+
+	@Override
+	public void setEnvironment(Environment environment) {
+		this.environment = environment;
+	}
+
+}

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/SpringSessionMongoTraditionalBoot.java

@@ -18,15 +18,6 @@ package org.springframework.session.mongodb.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author Rob Winch
@@ -34,34 +25,8 @@ import java.util.Map;
 @SpringBootApplication
 public class SpringSessionMongoTraditionalBoot {
 
-	/**
-	 * Use Testcontainers to managed MongoDB through Docker.
-	 * <p>
-	 * @see https://bsideup.github.io/posts/local_development_with_testcontainers/
-	 */
-	static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-		static MongoDBContainer mongo = new MongoDBContainer(DockerImageName.parse("mongo:5.0"));
-
-		public static Map<String, String> getProperties() {
-			mongo.start();
-
-			HashMap<String, String> properties = new HashMap<>();
-			properties.put("spring.data.mongodb.host", mongo.getHost());
-			properties.put("spring.data.mongodb.port", mongo.getFirstMappedPort() + "");
-			return properties;
-		}
-
-		@Override
-		public void initialize(ConfigurableApplicationContext context) {
-			ConfigurableEnvironment env = context.getEnvironment();
-			env.getPropertySources().addFirst(new MapPropertySource("testcontainers", (Map) getProperties()));
-		}
-	}
-
 	public static void main(String[] args) {
-		SpringApplication application = new SpringApplication(SpringSessionMongoTraditionalBoot.class);
-		application.addInitializers(new Initializer());
-		application.run(args);
+		SpringApplication.run(SpringSessionMongoTraditionalBoot.class, args);
 	}
+
 }

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties

@@ -1,5 +1,4 @@
 spring.thymeleaf.cache=false
 spring.template.cache=false
-
-logging.level.org.springframework.data.mongodb=DEBUG
-logging.level.org.springframework.session=DEBUG
+spring.data.mongodb.port=0
+spring.mongodb.embedded.version=3.4.3

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/test/java/org/springframework/session/mongodb/examples/BootTests.java

@@ -33,7 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.session.mongodb.examples.pages.HomePage;
 import org.springframework.session.mongodb.examples.pages.LoginPage;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
@@ -46,7 +45,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ExtendWith(SpringExtension.class)
 @AutoConfigureMockMvc
 @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
-@ContextConfiguration(initializers = SpringSessionMongoTraditionalBoot.Initializer.class)
 public class BootTests {
 
 	@Autowired