Browse Source

Upgrade to Spring Data 2021.2.0-RC1

Closes gh-30610
pull/30774/head
Stephane Nicoll 4 years ago
parent
commit
2d663f2e94
  1. 5
      spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
  2. 5
      spring-boot-project/spring-boot-actuator/build.gradle
  3. 5
      spring-boot-project/spring-boot-autoconfigure/build.gradle
  4. 2
      spring-boot-project/spring-boot-dependencies/build.gradle
  5. 5
      spring-boot-project/spring-boot-docs/build.gradle
  6. 5
      spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle
  7. 5
      spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle
  8. 5
      spring-boot-project/spring-boot-test-autoconfigure/build.gradle

5
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@ -140,7 +140,10 @@ dependencies { @@ -140,7 +140,10 @@ dependencies {
optional("org.springframework.data:spring-data-cassandra") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-couchbase") {
exclude group: "com.querydsl", module: "querydsl-apt"
exclude group: "javax.annotation", module: "javax.annotation-api"
}
optional("org.springframework.data:spring-data-jpa")
optional("org.springframework.data:spring-data-ldap")
optional("org.springframework.data:spring-data-mongodb")

5
spring-boot-project/spring-boot-actuator/build.gradle

@ -72,7 +72,10 @@ dependencies { @@ -72,7 +72,10 @@ dependencies {
optional("org.springframework.data:spring-data-cassandra") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-couchbase") {
exclude group: "com.querydsl", module: "querydsl-apt"
exclude group: "javax.annotation", module: "javax.annotation-api"
}
optional("org.springframework.data:spring-data-elasticsearch") {
exclude(group: "commons-logging", module: "commons-logging")
}

5
spring-boot-project/spring-boot-autoconfigure/build.gradle

@ -168,7 +168,10 @@ dependencies { @@ -168,7 +168,10 @@ dependencies {
optional("org.springframework:spring-webflux")
optional("org.springframework:spring-webmvc")
optional("org.springframework.batch:spring-batch-core")
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-couchbase") {
exclude group: "com.querydsl", module: "querydsl-apt"
exclude group: "javax.annotation", module: "javax.annotation-api"
}
optional("org.springframework.data:spring-data-envers") {
exclude group: "javax.activation", module: "javax.activation-api"
exclude group: "javax.persistence", module: "javax.persistence-api"

2
spring-boot-project/spring-boot-dependencies/build.gradle

@ -1692,7 +1692,7 @@ bom { @@ -1692,7 +1692,7 @@ bom {
]
}
}
library("Spring Data Bom", "2021.2.0-M4") {
library("Spring Data Bom", "2021.2.0-RC1") {
prohibit("[2022.0.0-M1,)") {
because "it uses Spring Framework 6"
}

5
spring-boot-project/spring-boot-docs/build.gradle

@ -129,7 +129,10 @@ dependencies { @@ -129,7 +129,10 @@ dependencies {
implementation("org.springframework.amqp:spring-rabbit")
implementation("org.springframework.batch:spring-batch-core")
implementation("org.springframework.data:spring-data-cassandra")
implementation("org.springframework.data:spring-data-couchbase")
implementation("org.springframework.data:spring-data-couchbase") {
exclude group: "com.querydsl", module: "querydsl-apt"
exclude group: "javax.annotation", module: "javax.annotation-api"
}
implementation("org.springframework.data:spring-data-elasticsearch") {
exclude group: "commons-logging", module: "commons-logging"
}

5
spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle

@ -8,5 +8,8 @@ dependencies { @@ -8,5 +8,8 @@ dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("io.projectreactor:reactor-core")
api("io.reactivex:rxjava-reactive-streams")
api("org.springframework.data:spring-data-couchbase")
api("org.springframework.data:spring-data-couchbase") {
exclude group: "com.querydsl", module: "querydsl-apt"
exclude group: "javax.annotation", module: "javax.annotation-api"
}
}

5
spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle

@ -6,5 +6,8 @@ description = "Starter for using Couchbase document-oriented database and Spring @@ -6,5 +6,8 @@ description = "Starter for using Couchbase document-oriented database and Spring
dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("org.springframework.data:spring-data-couchbase")
api("org.springframework.data:spring-data-couchbase") {
exclude group: "com.querydsl", module: "querydsl-apt"
exclude group: "javax.annotation", module: "javax.annotation-api"
}
}

5
spring-boot-project/spring-boot-test-autoconfigure/build.gradle

@ -48,7 +48,10 @@ dependencies { @@ -48,7 +48,10 @@ dependencies {
optional("org.springframework.data:spring-data-cassandra") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-couchbase") {
exclude group: "com.querydsl", module: "querydsl-apt"
exclude group: "javax.annotation", module: "javax.annotation-api"
}
optional("org.springframework.data:spring-data-elasticsearch")
optional("org.springframework.data:spring-data-jdbc")
optional("org.springframework.data:spring-data-jpa")

Loading…
Cancel
Save