Bump org.springframework.boot from 3.3.5 to 3.4.0 (#42)

* Bump org.springframework.boot from 3.3.5 to 3.4.0 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.3.5 to 3.4.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.3.5...v3.4.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Updating Spring version, fixing deprecations and fixing a bug with configuration definition --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Roman Khlebnov <[email protected]>
SuppieRK · Nov 26, 2024 · 1a9aeb6 · 1a9aeb6
1 parent 7647987
commit 1a9aeb6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -14,13 +14,13 @@ This version does not allow setting most of the local cache properties in favor
 <dependency>
   <groupId>io.github.suppierk</groupId>
   <artifactId>spring-boot-multilevel-cache-starter</artifactId>
-  <version>3.3.5.0</version>
+  <version>3.4.0.0</version>
 </dependency>
 ```
 
 ### Gradle
 ```groovy
-implementation 'io.github.suppierk:spring-boot-multilevel-cache-starter:3.3.5.0'
+implementation 'io.github.suppierk:spring-boot-multilevel-cache-starter:3.4.0.0'
 ```
 
 ## Use cases

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id 'java-library'
 
     // Core frameworks
-    id 'org.springframework.boot' version '3.3.5'
+    id 'org.springframework.boot' version '3.4.0'
     id 'io.spring.dependency-management' version '1.1.6'
 
     // Publishing

diff --git a/gradle.properties b/gradle.properties
@@ -27,7 +27,7 @@ SONATYPE_AUTOMATIC_RELEASE=true
 
 GROUP=io.github.suppierk
 POM_ARTIFACT_ID=spring-boot-multilevel-cache-starter
-VERSION_NAME=3.3.5.0
+VERSION_NAME=3.4.0.0
 POM_PACKAGING=jar
 
 POM_NAME=Spring Boot Multilevel Cache Starter

diff --git a/src/main/java/io/github/suppie/spring/cache/MultiLevelCacheConfigurationProperties.java b/src/main/java/io/github/suppie/spring/cache/MultiLevelCacheConfigurationProperties.java
@@ -61,9 +61,7 @@ public class MultiLevelCacheConfigurationProperties {
    */
   public RedisCacheConfiguration toRedisCacheConfiguration() {
     RedisCacheConfiguration configuration =
-        RedisCacheConfiguration.defaultCacheConfig()
-            .disableCachingNullValues()
-            .entryTtl(timeToLive);
+        RedisCacheConfiguration.defaultCacheConfig().entryTtl(timeToLive);
 
     if (useKeyPrefix) {
       configuration.prefixCacheNameWith(keyPrefix);

diff --git a/src/test/java/io/github/suppie/spring/cache/MultiLevelCacheTest.java b/src/test/java/io/github/suppie/spring/cache/MultiLevelCacheTest.java
@@ -41,12 +41,12 @@
 import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cache.Cache;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @ActiveProfiles("test")
 @SpringBootTest(
@@ -61,10 +61,10 @@ class MultiLevelCacheTest {
 
   @Autowired MultiLevelCacheManager cacheManager;
 
-  @MockBean RedisMessageListenerContainer redisMessageListenerContainer;
+  @MockitoBean RedisMessageListenerContainer redisMessageListenerContainer;
 
-  @MockBean RedisConnection redisConnection;
-  @MockBean RedisConnectionFactory redisConnectionFactory;
+  @MockitoBean RedisConnection redisConnection;
+  @MockitoBean RedisConnectionFactory redisConnectionFactory;
 
   @ParameterizedTest
   @MethodSource("operations")