migrated modules to parent-boot-2 with spring-boot 2.1:

spring-session/spring-session-jdbc
spring-vault
spring-webflux-amqp
vaadin
vavr
This commit is contained in:
geroza 2018-12-11 20:39:09 -02:00
parent 99dd82d2ff
commit 9ee33c151f
7 changed files with 14 additions and 31 deletions

View File

@ -15,10 +15,10 @@
</properties> </properties>
<parent> <parent>
<artifactId>parent-boot-2.0-temp</artifactId> <artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2.0-temp</relativePath> <relativePath>../../parent-boot-2</relativePath>
</parent> </parent>
<dependencies> <dependencies>

View File

@ -13,10 +13,10 @@
<description>Spring Vault sample project</description> <description>Spring Vault sample project</description>
<parent> <parent>
<artifactId>parent-boot-2.0-temp</artifactId> <artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2.0-temp</relativePath> <relativePath>../parent-boot-2</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@ -41,27 +41,8 @@
</dependencies> </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> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <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> </properties>
</project> </project>

View File

@ -11,10 +11,10 @@
<description>Spring WebFlux AMQP Sample</description> <description>Spring WebFlux AMQP Sample</description>
<parent> <parent>
<artifactId>parent-boot-2.0-temp</artifactId> <artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2.0-temp</relativePath> <relativePath>../parent-boot-2</relativePath>
</parent> </parent>
<dependencies> <dependencies>

View File

@ -1,6 +1,6 @@
spring: spring:
rabbitmq: rabbitmq:
host: 192.168.99.100 host: localhost
port: 5672 port: 5672
username: guest username: guest
password: guest password: guest

View File

@ -10,10 +10,10 @@
<name>Vaadin</name> <name>Vaadin</name>
<parent> <parent>
<artifactId>parent-boot-2.0-temp</artifactId> <artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2.0-temp</relativePath> <relativePath>../parent-boot-2</relativePath>
</parent> </parent>
<dependencyManagement> <dependencyManagement>

View File

@ -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

View File

@ -7,10 +7,10 @@
<name>vavr</name> <name>vavr</name>
<parent> <parent>
<artifactId>parent-boot-2.0-temp</artifactId> <artifactId>parent-boot-2</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2.0-temp</relativePath> <relativePath>../parent-boot-2</relativePath>
</parent> </parent>
<dependencies> <dependencies>