resolve conflits

Author: ywei2017

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
-        springBootVersion = '2.3.4.RELEASE'
-        javaCfEnvVersion = '2.1.1.RELEASE'
+        springBootVersion = '2.4.0'
+        javaCfEnvVersion = '2.1.2.RELEASE'
     }
 
     repositories {
@@ -69,5 +69,4 @@ dependencies {
 
 jar {
     archiveBaseName = "spring-music"
-    archiveVersion = "" // omit the version from the war file name
 }

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 package org.cloudfoundry.samples.music.config.data;
 
 import org.cloudfoundry.samples.music.domain.Album;
-import org.cloudfoundry.samples.music.repositories.redis.RedisAlbumRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -15,11 +14,6 @@
 @Profile("redis")
 public class RedisConfig {
 
-    @Bean
-    public RedisAlbumRepository redisRepository(RedisTemplate<String, Album> redisTemplate) {
-        return new RedisAlbumRepository(redisTemplate);
-    }
-
     @Bean
     public RedisTemplate<String, Album> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<String, Album> template = new RedisTemplate<>();

gradlew

@@ -2,15 +2,20 @@
 
 import org.cloudfoundry.samples.music.domain.Album;
 import org.cloudfoundry.samples.music.domain.RandomIdGenerator;
+
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
+@Repository
+@Profile("redis")
 public class RedisAlbumRepository implements CrudRepository<Album, String> {
     public static final String ALBUMS_KEY = "albums";