This is an automated email from the ASF dual-hosted git repository. vishwasbabu pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 8bfc1f63ab51f3f67ef600f3e94537fcd7f61e2e Author: Vishwas Babu A J <[email protected]> AuthorDate: Thu Feb 28 15:52:07 2019 -0800 Bumping spring boot version --- .gitignore | 4 ++++ fineract-provider/build.gradle | 6 ++++-- fineract-provider/dependencies.gradle | 2 +- .../infrastructure/cache/PlatformCacheConfiguration.java | 14 ++++++++++++++ .../jobs/service/JobRegisterServiceImpl.java | 3 ++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c7f7def..d0e2d66 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ *.ear .gradle build +*.iml +*.ipr +*.iws +*.DS_Store diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 4c29215..06043d9 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -57,8 +57,8 @@ sourceCompatibility = JavaVersion.VERSION_1_8 /* define binary compatibility version */ targetCompatibility = JavaVersion.VERSION_1_8 -project.ext.springBootVersion = '1.1.6.RELEASE' -project.ext.springVersion = '4.0.7.RELEASE' +project.ext.springBootVersion = '1.2.8.RELEASE' +project.ext.springVersion = '4.1.9.RELEASE' project.ext.springOauthVersion = '2.0.4.RELEASE' project.ext.jerseyVersion = '1.17' project.ext.springDataJpaVersion = '1.7.0.RELEASE' // also change spring-boot-gradle-plugin version above @@ -101,6 +101,8 @@ rat { '**/.classpath', '**/.project', '**/.idea/**', + '**/*.ipr', + '**/*.iws', '**/.settings/**', '**/bin/**', '**/.git/**', diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index 3ceb54d..d870c98 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -25,7 +25,7 @@ dependencies { } tomcat "org.apache.tomcat:tomcat-dbcp:${tomcatVersion}" - providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") + providedRuntime("org.springframework.boot:spring-boot-starter-tomcat:${springBootVersion}") providedCompile( // [group: 'javax.servlet', name: 'servlet-api', version: '2.5'], diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/PlatformCacheConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/PlatformCacheConfiguration.java index 38d1ac9..affc29e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/PlatformCacheConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/PlatformCacheConfiguration.java @@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurer; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.interceptor.CacheErrorHandler; +import org.springframework.cache.interceptor.CacheResolver; import org.springframework.cache.interceptor.DefaultKeyGenerator; import org.springframework.cache.interceptor.KeyGenerator; import org.springframework.context.annotation.Bean; @@ -43,7 +45,19 @@ public class PlatformCacheConfiguration implements CachingConfigurer { } @Override + public CacheResolver cacheResolver() { + //TODO https://issues.apache.org/jira/browse/FINERACT-705 + return null; + } + + @Override public KeyGenerator keyGenerator() { return new DefaultKeyGenerator(); } + + @Override + public CacheErrorHandler errorHandler() { + //TODO https://issues.apache.org/jira/browse/FINERACT-705 + return null; + } } \ No newline at end of file diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java index 89fe38e..d185387 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java @@ -18,6 +18,7 @@ */ package org.apache.fineract.infrastructure.jobs.service; +import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -382,7 +383,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi return targetObject; } - private Trigger createTrigger(final ScheduledJobDetail scheduledJobDetails, final JobDetail jobDetail) { + private Trigger createTrigger(final ScheduledJobDetail scheduledJobDetails, final JobDetail jobDetail) throws ParseException { final FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant(); final CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean(); cronTriggerFactoryBean.setName(scheduledJobDetails.getJobName() + "Trigger" + tenant.getId());
