Browse Source

Merge branch '3.5.x'

Closes gh-47393
pull/47395/head
Stéphane Nicoll 3 months ago
parent
commit
04038101d2
  1. 4
      documentation/spring-boot-docs/src/docs/antora/modules/how-to/pages/nosql.adoc
  2. 2
      documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc
  3. 4
      documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc
  4. 6
      platform/spring-boot-dependencies/build.gradle

4
documentation/spring-boot-docs/src/docs/antora/modules/how-to/pages/nosql.adoc

@ -9,8 +9,8 @@ This section answers questions that arise from using NoSQL with Spring Boot. @@ -9,8 +9,8 @@ This section answers questions that arise from using NoSQL with Spring Boot.
[[howto.nosql.jedis-instead-of-lettuce]]
== Use Jedis Instead of Lettuce
By default, the Spring Boot starter (`spring-boot-starter-data-redis`) uses https://github.com/lettuce-io/lettuce-core/[Lettuce].
You need to exclude that dependency and include the https://github.com/xetorthio/jedis/[Jedis] one instead.
By default, the Spring Boot starter (`spring-boot-starter-data-redis`) uses https://github.com/redis/lettuce/[Lettuce].
You need to exclude that dependency and include the https://github.com/redis/jedis/[Jedis] one instead.
Spring Boot manages both of these dependencies, allowing you to switch to Jedis without specifying a version.
The following example shows how to accomplish this in Maven:

2
documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc

@ -1054,7 +1054,7 @@ Metrics for Jetty's javadoc:org.eclipse.jetty.server.Connector[] instances are b @@ -1054,7 +1054,7 @@ Metrics for Jetty's javadoc:org.eclipse.jetty.server.Connector[] instances are b
=== Redis Metrics
Auto-configuration registers a javadoc:io.lettuce.core.metrics.MicrometerCommandLatencyRecorder[] for the auto-configured javadoc:org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory[].
For more detail, see the {url-lettuce-docs}#command.latency.metrics.micrometer[Micrometer Metrics section] of the Lettuce documentation.
For more detail, see the {url-lettuce-docs}/advanced-usage/#observability[Observability section] of the Lettuce documentation.

4
documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc

@ -25,10 +25,10 @@ Spring Boot also provides auto-configuration for the InfluxDB client but it is d @@ -25,10 +25,10 @@ Spring Boot also provides auto-configuration for the InfluxDB client but it is d
== Redis
https://redis.io/[Redis] is a cache, message broker, and richly-featured key-value store.
Spring Boot offers basic auto-configuration for the https://github.com/lettuce-io/lettuce-core/[Lettuce] and https://github.com/xetorthio/jedis/[Jedis] client libraries and the abstractions on top of them provided by https://github.com/spring-projects/spring-data-redis[Spring Data Redis].
Spring Boot offers basic auto-configuration for the https://github.com/redis/lettuce/[Lettuce] and https://github.com/redis/jedis/[Jedis] client libraries and the abstractions on top of them provided by https://github.com/spring-projects/spring-data-redis[Spring Data Redis].
There is a `spring-boot-starter-data-redis` starter for collecting the dependencies in a convenient way.
By default, it uses https://github.com/lettuce-io/lettuce-core/[Lettuce].
By default, it uses https://github.com/redis/lettuce/[Lettuce].
That starter handles both traditional and reactive applications.
TIP: We also provide a `spring-boot-starter-data-redis-reactive` starter for consistency with the other stores with reactive support.

6
platform/spring-boot-dependencies/build.gradle

@ -1230,10 +1230,10 @@ bom { @@ -1230,10 +1230,10 @@ bom {
]
}
links {
site("https://github.com/lettuce-io/lettuce-core")
site("https://github.com/redis/lettuce")
javadoc("https://javadoc.io/doc/io.lettuce/lettuce-core/{version}", "io.lettuce.core")
docs("https://lettuce.io/core/{version}/reference/index.html")
releaseNotes("https://github.com/lettuce-io/lettuce-core/releases/tag/{version}")
docs("https://redis.github.io/lettuce")
releaseNotes("https://github.com/redis/lettuce/releases/tag/{version}")
}
}
library("Liquibase", "4.33.0") {

Loading…
Cancel
Save