This is an automated email from the ASF dual-hosted git repository. kaze pushed a commit to branch spring_boot_2 in repository https://gitbox.apache.org/repos/asf/fineract-cn-reporting.git
commit 75a4bcedbc4b0a8ffb40af2699a86c5ea49b580f Author: Audrey Ndum <[email protected]> AuthorDate: Wed Dec 30 17:06:02 2020 +0100 update dependencies --- api/build.gradle | 10 +++++----- component-test/build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- service/build.gradle | 22 +++++++++++----------- .../reporting/service/ReportingConfiguration.java | 9 ++------- shared.gradle | 17 +++++------------ 6 files changed, 28 insertions(+), 40 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index bd79091..aa90156 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -25,7 +25,7 @@ plugins { id 'com.github.hierynomus.license' version '0.15.0' id 'org.nosphere.apache.rat' version '0.6.0' id 'com.jfrog.artifactory' version '4.15.1' - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id "io.spring.dependency-management" version "1.0.10.RELEASE" id 'maven-publish' id 'java' } @@ -33,14 +33,14 @@ plugins { apply from: '../shared.gradle' dependencies { - compile( + implementation( [group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign'], [group: 'org.apache.fineract.cn', name: 'api', version: versions.frameworkapi], - [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator], - [group: 'org.hibernate', name: 'hibernate-validator-annotation-processor', version: versions.validator] + [group: 'org.hibernate.validator', name: 'hibernate-validator', version: versions.hibernatevalidator], + [group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: versions.hibernatevalidator] ) - testCompile( + testImplementation( [group: 'org.apache.fineract.cn', name: 'test', version: versions.frameworktest], ) } diff --git a/component-test/build.gradle b/component-test/build.gradle index e1e57e0..2501d5b 100644 --- a/component-test/build.gradle +++ b/component-test/build.gradle @@ -17,7 +17,7 @@ buildscript { ext { - springBootVersion = '2.2.6.RELEASE' + springBootVersion = '2.4.1' } repositories { @@ -33,8 +33,8 @@ plugins { id 'com.github.hierynomus.license' version '0.15.0' id 'org.nosphere.apache.rat' version '0.6.0' id 'com.jfrog.artifactory' version '4.15.1' - id "io.spring.dependency-management" version "1.0.9.RELEASE" - id 'org.springframework.boot' version '2.2.6.RELEASE' + id "io.spring.dependency-management" version "1.0.10.RELEASE" + id 'org.springframework.boot' version '2.4.1' id 'maven-publish' id 'java' } @@ -45,7 +45,7 @@ bootJar { } dependencies { - compile( + implementation( [group: 'org.apache.fineract.cn.reporting', name: 'api', version: project.version], [group: 'org.apache.fineract.cn.reporting', name: 'service', version: project.version], [group: 'org.apache.fineract.cn.anubis', name: 'test', version: versions.frameworkanubis], diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f9e9c0b..ece72c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip diff --git a/service/build.gradle b/service/build.gradle index 91b90c4..635e077 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -17,7 +17,7 @@ buildscript { ext { - springBootVersion = '2.2.6.RELEASE' + springBootVersion = '2.4.1' } repositories { jcenter() @@ -28,8 +28,8 @@ plugins { id 'com.github.hierynomus.license' version '0.15.0' id 'org.nosphere.apache.rat' version '0.6.0' id 'com.jfrog.artifactory' version '4.15.1' - id "io.spring.dependency-management" version "1.0.9.RELEASE" - id 'org.springframework.boot' version '2.2.6.RELEASE' + id "io.spring.dependency-management" version "1.0.10.RELEASE" + id 'org.springframework.boot' version '2.4.1' id 'maven-publish' id 'java' id 'idea' @@ -39,11 +39,11 @@ apply from: '../shared.gradle' bootJar { enabled = true - classifier = 'boot' + archiveClassifier = 'boot' } dependencies { - compile( + implementation( [group: 'org.springframework.cloud', name: 'spring-cloud-starter-config'], [group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-eureka-client'], [group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'], @@ -53,12 +53,12 @@ dependencies { [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], [group: 'org.apache.fineract.cn', name: 'async', version: versions.frameworkasync], [group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra], - [group: 'org.apache.fineract.cn', name: 'postgresql', version: '0.1.0-BUILD-SNAPSHOT'], + [group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql], [group: 'org.apache.fineract.cn', name: 'command', version: versions.frameworkcommand], - [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator], - [group: 'org.owasp.esapi', name: 'esapi', version: '2.1.0.1'], - [group: 'io.netty', name: 'netty-all', version: '4.1.39.Final'], - [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.39.Final'] + [group: 'org.hibernate.validator', name: 'hibernate-validator', version: versions.hibernatevalidator], + [group: 'org.owasp.esapi', name: 'esapi', version: '2.2.2.0'], + [group: 'io.netty', name: 'netty-all', version: '4.1.55.Final'], + [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.55.Final'] ) } @@ -80,7 +80,7 @@ publishing { } bootService(MavenPublication) { // "boot" jar - artifact(file("$buildDir/libs/$project.name-$project.version-${bootJar.classifier}.jar")) + artifact(file("$buildDir/libs/$project.name-$project.version-${bootJar.archiveClassifier}.jar")) groupId project.group artifactId ("$project.name-boot") version project.findProperty('externalVersion') ?: project.version diff --git a/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingConfiguration.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingConfiguration.java index 056e1cb..7b32ffc 100644 --- a/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingConfiguration.java @@ -33,8 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @SuppressWarnings("WeakerAccess") @Configuration @@ -53,7 +52,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter "org.apache.fineract.cn.reporting.service.rest", "org.apache.fineract.cn.reporting.service.internal" }) -public class ReportingConfiguration extends WebMvcConfigurerAdapter { +public class ReportingConfiguration implements WebMvcConfigurer { public ReportingConfiguration() { super(); @@ -64,8 +63,4 @@ public class ReportingConfiguration extends WebMvcConfigurerAdapter { return LoggerFactory.getLogger(ServiceConstants.LOGGER_NAME); } - @Override - public void configurePathMatch(final PathMatchConfigurer configurer) { - configurer.setUseSuffixPatternMatch(Boolean.FALSE); - } } diff --git a/shared.gradle b/shared.gradle index eff1145..551fdd4 100644 --- a/shared.gradle +++ b/shared.gradle @@ -27,7 +27,7 @@ ext.versions = [ frameworkcommand : 'spring_boot_2-SNAPSHOT', frameworktest: 'spring_boot_2-SNAPSHOT', frameworkanubis: 'spring_boot_2-SNAPSHOT', - validator : '6.1.4.Final' + hibernatevalidator : '6.1.7.Final' ] tasks.withType(JavaCompile) { @@ -43,24 +43,17 @@ repositories { dependencyManagement { imports { - mavenBom 'io.spring.platform:platform-bom:Cairo-SR8' - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR3' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR9' } } -// override certain dependency provided by Spring platform using newer releases -ext['cassandra.version'] = '3.6' -ext['cassandra-driver.version'] = '3.1.2' -ext['activemq.version'] = '5.13.2' -ext['spring-data-releasetrain.version'] = 'Gosling-SR2A' - dependencies { - compile( - [group: 'com.google.code.findbugs', name: 'jsr305'], + implementation( + [group: 'com.github.spotbugs', name: 'spotbugs', version: '4.2.0'], [group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql] ) - testCompile( + testImplementation( [group: 'org.springframework.boot', name: 'spring-boot-starter-test'] ) }
