Update Shedlock to proper version for

Update Shedlock to proper version for compatibility
Update Shedlock to proper version for compatibility
Update Shedlock to proper version for compatibility
Update Shedlock to proper version for compatibility
Update Shedlock to proper version for compatibility

Issue-ID: SO-2550
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I5378d1e964b5eaa88b9ac33ef3759d6120c76150

1 files changed, 2 insertions, 8 deletions

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
index 3a14b2ff84..0272bab1a1 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/application/MSORequestDBApplication.java
@@ -22,7 +22,6 @@
 
 package org.onap.so.adapters.requestsdb.application;
 
-import java.time.Duration;
 import javax.sql.DataSource;
 import org.onap.logging.filter.base.Constants;
 import org.onap.logging.filter.base.ONAPComponents;
@@ -34,8 +33,7 @@ import org.springframework.jmx.support.RegistrationPolicy;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import net.javacrumbs.shedlock.core.LockProvider;
 import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider;
-import net.javacrumbs.shedlock.spring.ScheduledLockConfiguration;
-import net.javacrumbs.shedlock.spring.ScheduledLockConfigurationBuilder;
+import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
 
 /**
  * @since Version 1.0
@@ -43,6 +41,7 @@ import net.javacrumbs.shedlock.spring.ScheduledLockConfigurationBuilder;
  */
 @SpringBootApplication(scanBasePackages = {"org.onap.so", "org.onap.logging.filter"})
 @EnableScheduling
+@EnableSchedulerLock(defaultLockAtMostFor = "120s")
 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
 public class MSORequestDBApplication {
 
@@ -66,10 +65,5 @@ public class MSORequestDBApplication {
         return new JdbcTemplateLockProvider(dataSource);
     }
 
-    @Bean
-    public ScheduledLockConfiguration taskScheduler(LockProvider lockProvider) {
-        return ScheduledLockConfigurationBuilder.withLockProvider(lockProvider).withPoolSize(10)
-                .withDefaultLockAtMostFor(Duration.ofMinutes(10)).build();
-    }
 
 }