[jOOQ/jOOQ#12644] Upgrade Spring Boot example to Spring Boot 2.6

This commit is contained in:
Lukas Eder 2021-11-22 09:26:22 +01:00
parent 80d6967f15
commit 083b3063db
2 changed files with 15 additions and 8 deletions

View File

@ -10,16 +10,23 @@ import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
* The spring boot application.
* <p>
* Starting from jOOQ 3.15, jOOQ supports {@link DSLContext} with a configured
* R2DBC {@link Configuration#connectionFactory()} out of the box. Up until
* Spring Boot 2.5, Spring Boot is not aware of this, and may auto configure an
* R2DBC connection rather than a JDBC connection. To work around this, use
* {@link SpringBootApplication#exclude()} to explicitly exclude the
* {@link R2dbcAutoConfiguration}.
* R2DBC {@link Configuration#connectionFactory()} out of the box.
* <p>
* <em>Historic note:</em> Up until Spring Boot 2.5, Spring Boot is not aware of
* this, and may auto configure an R2DBC connection rather than a JDBC
* connection. To work around this, use {@link SpringBootApplication#exclude()}
* to explicitly exclude the {@link R2dbcAutoConfiguration}:
* <p>
* <code><pre>
* &#64;SpringBootApplication(exclude = { R2dbcAutoConfiguration.class })
* </pre></code>
* <p>
* However, it is recommended you upgrade to Spring Boot 2.6 instead.
*
* @author Thomas Darimont
* @author Lukas Eder
*/
@SpringBootApplication(exclude = { R2dbcAutoConfiguration.class })
@SpringBootApplication
public class Application {
public static void main(String[] args) {

View File

@ -57,8 +57,8 @@
<!-- Examples and/or extension modules use these dependencies -->
<hibernate.version>5.4.31.Final</hibernate.version>
<liquibase.version>4.4.1</liquibase.version>
<spring.version>5.3.7</spring.version>
<spring.boot.version>2.5.5</spring.boot.version>
<spring.version>5.3.13</spring.version>
<spring.boot.version>2.6.0</spring.boot.version>
<errorprone.version>2.3.4</errorprone.version>
<errorprone.version>2.9.0</errorprone.version>
<testcontainers.version>1.16.2</testcontainers.version>