Skip to content

Commit

Permalink
Bumping spring boot version
Browse files Browse the repository at this point in the history
  • Loading branch information
vishwasbabu committed Feb 28, 2019
1 parent fa05d5a commit 8bfc1f6
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
*.ear
.gradle
build
*.iml
*.ipr
*.iws
*.DS_Store
6 changes: 4 additions & 2 deletions fineract-provider/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -101,6 +101,8 @@ rat {
'**/.classpath',
'**/.project',
'**/.idea/**',
'**/*.ipr',
'**/*.iws',
'**/.settings/**',
'**/bin/**',
'**/.git/**',
Expand Down
2 changes: 1 addition & 1 deletion fineract-provider/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
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;
Expand All @@ -42,8 +44,20 @@ public CacheManager cacheManager() {
return this.delegatingCacheManager;
}

@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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -382,7 +383,7 @@ private Object getBeanObject(final Class<?> classType) throws ClassNotFoundExcep
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());
Expand Down

0 comments on commit 8bfc1f6

Please sign in to comment.