Bumping spring boot version
This commit is contained in:
@@ -4,3 +4,7 @@
|
|||||||
*.ear
|
*.ear
|
||||||
.gradle
|
.gradle
|
||||||
build
|
build
|
||||||
|
*.iml
|
||||||
|
*.ipr
|
||||||
|
*.iws
|
||||||
|
*.DS_Store
|
||||||
|
|||||||
@@ -57,8 +57,8 @@ sourceCompatibility = JavaVersion.VERSION_1_8
|
|||||||
/* define binary compatibility version */
|
/* define binary compatibility version */
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
project.ext.springBootVersion = '1.1.6.RELEASE'
|
project.ext.springBootVersion = '1.2.8.RELEASE'
|
||||||
project.ext.springVersion = '4.0.7.RELEASE'
|
project.ext.springVersion = '4.1.9.RELEASE'
|
||||||
project.ext.springOauthVersion = '2.0.4.RELEASE'
|
project.ext.springOauthVersion = '2.0.4.RELEASE'
|
||||||
project.ext.jerseyVersion = '1.17'
|
project.ext.jerseyVersion = '1.17'
|
||||||
project.ext.springDataJpaVersion = '1.7.0.RELEASE' // also change spring-boot-gradle-plugin version above
|
project.ext.springDataJpaVersion = '1.7.0.RELEASE' // also change spring-boot-gradle-plugin version above
|
||||||
@@ -101,6 +101,8 @@ rat {
|
|||||||
'**/.classpath',
|
'**/.classpath',
|
||||||
'**/.project',
|
'**/.project',
|
||||||
'**/.idea/**',
|
'**/.idea/**',
|
||||||
|
'**/*.ipr',
|
||||||
|
'**/*.iws',
|
||||||
'**/.settings/**',
|
'**/.settings/**',
|
||||||
'**/bin/**',
|
'**/bin/**',
|
||||||
'**/.git/**',
|
'**/.git/**',
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
tomcat "org.apache.tomcat:tomcat-dbcp:${tomcatVersion}"
|
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(
|
providedCompile(
|
||||||
// [group: 'javax.servlet', name: 'servlet-api', version: '2.5'],
|
// [group: 'javax.servlet', name: 'servlet-api', version: '2.5'],
|
||||||
|
|||||||
+14
@@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.cache.CacheManager;
|
import org.springframework.cache.CacheManager;
|
||||||
import org.springframework.cache.annotation.CachingConfigurer;
|
import org.springframework.cache.annotation.CachingConfigurer;
|
||||||
import org.springframework.cache.annotation.EnableCaching;
|
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.DefaultKeyGenerator;
|
||||||
import org.springframework.cache.interceptor.KeyGenerator;
|
import org.springframework.cache.interceptor.KeyGenerator;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
@@ -42,8 +44,20 @@ public class PlatformCacheConfiguration implements CachingConfigurer {
|
|||||||
return this.delegatingCacheManager;
|
return this.delegatingCacheManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CacheResolver cacheResolver() {
|
||||||
|
//TODO https://issues.apache.org/jira/browse/FINERACT-705
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public KeyGenerator keyGenerator() {
|
public KeyGenerator keyGenerator() {
|
||||||
return new DefaultKeyGenerator();
|
return new DefaultKeyGenerator();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CacheErrorHandler errorHandler() {
|
||||||
|
//TODO https://issues.apache.org/jira/browse/FINERACT-705
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+2
-1
@@ -18,6 +18,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.apache.fineract.infrastructure.jobs.service;
|
package org.apache.fineract.infrastructure.jobs.service;
|
||||||
|
|
||||||
|
import java.text.ParseException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -382,7 +383,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi
|
|||||||
return targetObject;
|
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 FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
|
||||||
final CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
|
final CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
|
||||||
cronTriggerFactoryBean.setName(scheduledJobDetails.getJobName() + "Trigger" + tenant.getId());
|
cronTriggerFactoryBean.setName(scheduledJobDetails.getJobName() + "Trigger" + tenant.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user