From 9ee33c151f8110c21027954deb50944f869ca030 Mon Sep 17 00:00:00 2001
From: geroza <rozagerardo@gmail.com>
Date: Tue, 11 Dec 2018 20:39:09 -0200
Subject: [PATCH]  migrated modules to parent-boot-2 with spring-boot 2.1:
 spring-session/spring-session-jdbc spring-vault spring-webflux-amqp vaadin
 vavr

---
 spring-session/spring-session-jdbc/pom.xml    |  4 +--
 spring-vault/pom.xml                          | 25 +++----------------
 spring-webflux-amqp/pom.xml                   |  4 +--
 .../src/main/resources/application.yml        |  2 +-
 vaadin/pom.xml                                |  4 +--
 .../src/main/resources/application.properties |  2 ++
 vavr/pom.xml                                  |  4 +--
 7 files changed, 14 insertions(+), 31 deletions(-)
 create mode 100644 vaadin/src/main/resources/application.properties

diff --git a/spring-session/spring-session-jdbc/pom.xml b/spring-session/spring-session-jdbc/pom.xml
index a595a94914..ce6b5f5908 100644
--- a/spring-session/spring-session-jdbc/pom.xml
+++ b/spring-session/spring-session-jdbc/pom.xml
@@ -15,10 +15,10 @@
     </properties>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2.0-temp</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-vault/pom.xml b/spring-vault/pom.xml
index 6a7db5dd71..aad6da1cc3 100644
--- a/spring-vault/pom.xml
+++ b/spring-vault/pom.xml
@@ -13,10 +13,10 @@
 	<description>Spring Vault sample project</description>
 
 	<parent>
-		<artifactId>parent-boot-2.0-temp</artifactId>
+		<artifactId>parent-boot-2</artifactId>
 		<groupId>com.baeldung</groupId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../parent-boot-2.0-temp</relativePath>
+		<relativePath>../parent-boot-2</relativePath>
 	</parent>
 
 	<dependencies>
@@ -41,27 +41,8 @@
 
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
-				<configuration>
-					<excludes>
-						<exclude>**/*IntegrationTest.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.vault.core.version>2.0.1.RELEASE</spring.vault.core.version>
+		<spring.vault.core.version>2.1.1.RELEASE</spring.vault.core.version>
 	</properties>
 </project>
diff --git a/spring-webflux-amqp/pom.xml b/spring-webflux-amqp/pom.xml
index e4e0d55ce3..4faa165c50 100755
--- a/spring-webflux-amqp/pom.xml
+++ b/spring-webflux-amqp/pom.xml
@@ -11,10 +11,10 @@
     <description>Spring WebFlux AMQP Sample</description>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-webflux-amqp/src/main/resources/application.yml b/spring-webflux-amqp/src/main/resources/application.yml
index 3f527ce4c5..702aaba357 100755
--- a/spring-webflux-amqp/src/main/resources/application.yml
+++ b/spring-webflux-amqp/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   rabbitmq:
-    host: 192.168.99.100
+    host: localhost
     port: 5672
     username: guest
     password: guest
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index 1111c0aa0c..c34ffa3636 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -10,10 +10,10 @@
     <name>Vaadin</name>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
     
     <dependencyManagement>
diff --git a/vaadin/src/main/resources/application.properties b/vaadin/src/main/resources/application.properties
new file mode 100644
index 0000000000..1cb7086b82
--- /dev/null
+++ b/vaadin/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+#Vaadin supports spring-boot 2.1 properly from V8 onwards (according to this comment https://github.com/vaadin/spring/issues/331#issuecomment-435128475)
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
diff --git a/vavr/pom.xml b/vavr/pom.xml
index fa8eff1ce7..ae495e9830 100644
--- a/vavr/pom.xml
+++ b/vavr/pom.xml
@@ -7,10 +7,10 @@
     <name>vavr</name>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>