restore password in CustomRedisCachingProvider

put placeholder in migration.sql and make db version consistent

pom.xml

@@ -29,7 +29,7 @@
 		<frontend.version>v6.0.5</frontend.version>
 
         <!-- THIS SHOULD BE KEPT IN SYNC TO VERSION IN CGDS.SQL -->
-		<db.version>2.13.1</db.version>
+		<db.version>3.0.0</db.version>
 
 		<!-- Version properties for dependencies that should have same version. -->
 		<!-- The rest can be set in the dependencyManagement section -->

src/main/java/org/cbioportal/persistence/util/CustomRedisCachingProvider.java

@@ -77,8 +77,8 @@ public RedissonClient getRedissonClient() {
         config.useMasterSlaveServers()
                 .setMasterAddress(leaderAddress)
                 .addSlaveAddress(followerAddress)
-                .setDatabase(database);
-                //.setPassword(password);
+                .setDatabase(database)
+                .setPassword(password);
 
         RedissonClient redissonClient = Redisson.create(config);
         LOG.debug("Created Redisson Client: " + redissonClient);

src/main/resources/db-scripts/migration.sql

@@ -1027,4 +1027,9 @@ ALTER TABLE `clinical_event_data` MODIFY COLUMN `VALUE` varchar(3000) NOT NULL;
 CREATE INDEX idx_clinical_event_key ON clinical_event_data (`KEY`);
 CREATE INDEX idx_clinical_event_value ON clinical_event_data (`VALUE`);
 CREATE INDEX idx_sample_stable_id ON sample (`STABLE_ID`);
-UPDATE `info` SET `DB_SCHEMA_VERSION`="2.13.1";
+UPDATE `info` SET `DB_SCHEMA_VERSION`="2.13.1";
+
+-- TODO: comprehensive conversion script needed here
+##version: 3.0.0
+DROP TABLE IF EXISTS `drug`;
+UPDATE `info` SET `DB_SCHEMA_VERSION`="3.0.0";