From 046475a69e7d66d71f5d8e937cee1ab1bd81d98b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 21 Sep 2016 15:00:24 +0200 Subject: [PATCH] Remove deprecated spring-boot-starter-redis --- spring-boot-starters/pom.xml | 2 - .../spring-boot-starter-redis/pom.xml | 57 ------------------- ...erDeprecationWarningAutoConfiguration.java | 47 --------------- .../main/resources/META-INF/spring.factories | 3 - .../main/resources/META-INF/spring.provides | 1 - 5 files changed, 110 deletions(-) delete mode 100644 spring-boot-starters/spring-boot-starter-redis/pom.xml delete mode 100644 spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDeprecationWarningAutoConfiguration.java delete mode 100644 spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.factories delete mode 100644 spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.provides diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index ce9af98e89..9eda7150f7 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -57,8 +57,6 @@ spring-boot-starter-mustache spring-boot-starter-actuator spring-boot-starter-parent - - spring-boot-starter-redis spring-boot-starter-security spring-boot-starter-social-facebook spring-boot-starter-social-twitter diff --git a/spring-boot-starters/spring-boot-starter-redis/pom.xml b/spring-boot-starters/spring-boot-starter-redis/pom.xml deleted file mode 100644 index c402fd2ed7..0000000000 --- a/spring-boot-starters/spring-boot-starter-redis/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starters - 1.5.0.BUILD-SNAPSHOT - - spring-boot-starter-redis - spring-boot-starter-redis (DEPRECATED) - Starter for using Redis key-value data store with Spring Data Redis and - the Jedis client. Deprecated as of 1.4 in favor of spring-boot-starter-data-redis - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.data - spring-data-redis - - - redis.clients - jedis - - - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - duplicate-dependencies - validate - - check - - - - changelog.txt - - - - - - - - diff --git a/spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDeprecationWarningAutoConfiguration.java b/spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 57b606cdbe..0000000000 --- a/spring-boot-starters/spring-boot-starter-redis/src/main/java/org/springframework/boot/starter/redis/RedisStarterDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2012-2016 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.starter.redis; - -import javax.annotation.PostConstruct; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Configuration; - -/** - * {@link EnableAutoConfiguration Auto-configuration} to print a deprecation warning about - * the starter. - * - * @author Phillip Webb - * @since 1.4.0 - */ -@Configuration -@Deprecated -public class RedisStarterDeprecationWarningAutoConfiguration { - - private static final Log logger = LogFactory - .getLog(RedisStarterDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - logger.warn("spring-boot-starter-redis is deprecated as of Spring Boot 1.4, " - + "please migrate to spring-boot-starter-data-redis"); - } - -} diff --git a/spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.factories b/spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 598e4a2aa9..0000000000 --- a/spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.boot.starter.redis.RedisStarterDeprecationWarningAutoConfiguration diff --git a/spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.provides deleted file mode 100644 index ef52e2ea08..0000000000 --- a/spring-boot-starters/spring-boot-starter-redis/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: spring-data-redis,jedis \ No newline at end of file