Skip to content

Commit

Permalink
Remove Spring support classes #1358
Browse files Browse the repository at this point in the history
Lettuce no longer ships own Spring support classes. We recommend using Lettuce through Spring Data Redis.
  • Loading branch information
mp911de committed Jul 21, 2020
1 parent 3ef6ef0 commit a91d73d
Show file tree
Hide file tree
Showing 35 changed files with 231 additions and 1,022 deletions.
54 changes: 0 additions & 54 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
<rxjava3.version>3.0.4</rxjava3.version>
<reactive-streams-tck.version>1.0.3</reactive-streams-tck.version>
<slf4j.version>1.7.25</slf4j.version>
<spring.version>4.3.26.RELEASE</spring.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- You need a running redis+sentinel for all tests, therefore disabled by default -->
Expand Down Expand Up @@ -112,14 +111,6 @@
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-bom</artifactId>
Expand Down Expand Up @@ -259,26 +250,6 @@
<optional>true</optional>
</dependency>

<!-- Spring -->

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<optional>true</optional>
</dependency>

<!-- CDI -->

<dependency>
Expand Down Expand Up @@ -447,31 +418,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down
5 changes: 0 additions & 5 deletions src/main/asciidoc/integration-extension.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,3 @@ include::{ext-doc}/Codecs.asciidoc[leveloffset=+1]
[[cdi-support]]
=== CDI Support
include::{ext-doc}/CDI-Support.asciidoc[leveloffset=+1]

[[spring-support]]
=== Spring Support
include::{ext-doc}/Spring-Support.asciidoc[leveloffset=+1]

2 changes: 2 additions & 0 deletions src/main/asciidoc/new-features.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
Use methods accepting `Duration` instead.
* Lots of internal refinements.
* `xpending` methods return now `List<PendingMessage>` and `PendingMessages`
* Spring support removed.
Use Spring Data Redis for a seamless Spring integration with Lettuce.

[[new-features.5-3-0]]
== What's new in Lettuce 5.3
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/io/lettuce/core/protocol/CommandHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ protected void setState(LifecycleState lifecycleState) {
}
}

void setBuffer(ByteBuf buffer) {
this.buffer = buffer;
}

@Override
public Collection<RedisCommand<?, ?, ?>> drainQueue() {
return drainCommands(stack);
Expand Down

This file was deleted.

118 changes: 0 additions & 118 deletions src/main/java/io/lettuce/core/support/LettuceFactoryBeanSupport.java

This file was deleted.

74 changes: 0 additions & 74 deletions src/main/java/io/lettuce/core/support/RedisClientFactoryBean.java

This file was deleted.

Loading

0 comments on commit a91d73d

Please sign in to comment.