You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ka...@apache.org on 2021/01/11 17:42:05 UTC
[fineract-cn-payroll] branch spring_boot_2 updated: update
dependencies
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-payroll.git
The following commit(s) were added to refs/heads/spring_boot_2 by this push:
new b1b5721 update dependencies
b1b5721 is described below
commit b1b5721a7e9d5e687dae92d50144714d91f993a4
Author: Audrey Ndum <au...@gmail.com>
AuthorDate: Fri Dec 18 19:52:33 2020 +0100
update dependencies
---
api/build.gradle | 20 ++++++++-----
.../cn/payroll/api/v1/client/PayrollManager.java | 2 +-
.../api/v1/domain/PayrollCollectionSheet.java | 3 +-
component-test/build.gradle | 20 ++++++++-----
.../fineract/cn/payroll/AbstractPayrollTest.java | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
service/build.gradle | 26 +++++++++-------
.../service/PayrollServiceConfiguration.java | 11 ++-----
.../payroll/service/rest/util/PageableBuilder.java | 2 +-
shared.gradle | 35 +++++++++++-----------
10 files changed, 66 insertions(+), 57 deletions(-)
diff --git a/api/build.gradle b/api/build.gradle
index d010481..d270b4e 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -21,15 +21,15 @@ buildscript {
}
dependencies {
- classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE'
+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE'
}
}
plugins {
- id "com.github.hierynomus.license" version "0.13.1"
- id("org.nosphere.apache.rat") version "0.5.2"
- id "com.jfrog.artifactory" version "4.9.5"
- id "io.spring.dependency-management" version "1.0.8.RELEASE"
+ 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.10.RELEASE'
id 'maven-publish'
id 'java'
}
@@ -38,10 +38,10 @@ apply from: '../shared.gradle'
dependencies {
compile(
- [group: 'org.springframework.cloud', name: 'spring-cloud-starter-feign'],
+ [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(
@@ -49,6 +49,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
api(MavenPublication) {
diff --git a/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java
index bae7952..e40b8be 100644
--- a/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java
@@ -27,7 +27,7 @@ import javax.validation.Valid;
import org.apache.fineract.cn.api.annotation.ThrowsException;
import org.apache.fineract.cn.api.annotation.ThrowsExceptions;
import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionSheet.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionSheet.java
index be5da6e..813e3ed 100644
--- a/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionSheet.java
+++ b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/domain/PayrollCollectionSheet.java
@@ -20,8 +20,9 @@ package org.apache.fineract.cn.payroll.api.v1.domain;
import java.util.List;
import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+
import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
-import org.hibernate.validator.constraints.NotEmpty;
public class PayrollCollectionSheet {
diff --git a/component-test/build.gradle b/component-test/build.gradle
index 9ebbbf3..c278b7c 100644
--- a/component-test/build.gradle
+++ b/component-test/build.gradle
@@ -17,7 +17,7 @@
buildscript {
ext {
- springBootVersion = '1.4.1.RELEASE'
+ springBootVersion = '2.4.1'
}
repositories {
@@ -25,22 +25,22 @@ buildscript {
}
dependencies {
- classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3")
+ classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.7")
}
}
plugins {
- id "com.github.hierynomus.license" version "0.13.1"
- id("org.nosphere.apache.rat") version "0.5.2"
- id "com.jfrog.artifactory" version "4.9.5"
- id "org.springframework.boot" version "1.4.3.RELEASE"
+ 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 'org.springframework.boot' version '2.4.1'
id 'maven-publish'
id 'java'
}
apply from: '../shared.gradle'
apply plugin: 'org.asciidoctor.convert'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -54,7 +54,7 @@ dependencies {
[group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang],
[group: 'org.springframework.boot', name: 'spring-boot-starter-test'],
[group: 'org.springframework.restdocs', name: 'spring-restdocs-mockmvc'],
- [group: 'junit', name: 'junit', version: '4.12']
+ [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0']
)
}
@@ -65,6 +65,10 @@ asciidoctor {
attributes "source-highlighter": "highlightjs", 'snippets': file('build/doc/generated-snippets/')
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
componentTest(MavenPublication) {
diff --git a/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java
index 7aa71fd..a9400e2 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java
@@ -33,8 +33,8 @@ import org.junit.Rule;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 67ff678..76d0bcc 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-4.10.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 25f6626..8d52bb1 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -17,7 +17,7 @@
buildscript {
ext {
- springBootVersion = '1.4.1.RELEASE'
+ springBootVersion = '2.4.1'
}
repositories {
jcenter()
@@ -25,10 +25,10 @@ buildscript {
}
plugins {
- id "com.github.hierynomus.license" version "0.13.1"
- id("org.nosphere.apache.rat") version "0.5.2"
- id "com.jfrog.artifactory" version "4.9.5"
- id "org.springframework.boot" version "1.4.3.RELEASE"
+ 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 'org.springframework.boot' version '2.4.1'
id 'maven-publish'
id 'java'
id 'idea'
@@ -36,7 +36,7 @@ plugins {
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = true
classifier = 'boot'
}
@@ -44,7 +44,7 @@ bootRepackage {
dependencies {
compile(
[group: 'org.springframework.cloud', name: 'spring-cloud-starter-config'],
- [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka'],
+ [group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-eureka-client'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'],
[group: 'org.apache.fineract.cn.payroll', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.accounting', name: 'api', version: versions.frameworkaccounting],
@@ -57,13 +57,17 @@ dependencies {
[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: 'io.netty', name: 'netty-all', version: '4.1.39.Final'],
- [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.39.Final']
+ [group: 'io.netty', name: 'netty-all', version: '4.1.55.Final'],
+ [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.55.Final']
)
}
+jar {
+ enabled = true
+}
+
tasks.withType(PublishToMavenLocal) { task ->
- task.dependsOn 'bootRepackage'
+ task.dependsOn 'bootJar'
}
publishing {
publications {
@@ -75,7 +79,7 @@ publishing {
}
bootService(MavenPublication) {
// "boot" jar
- artifact(file("$buildDir/libs/$project.name-$project.version-${bootRepackage.classifier}.jar"))
+ artifact(file("$buildDir/libs/$project.name-$project.version-${bootJar.classifier}.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/payroll/service/PayrollServiceConfiguration.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java
index 4c3c8f1..ab5e99f 100644
--- a/service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java
@@ -31,13 +31,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
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
@@ -63,7 +62,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
@EnableJpaRepositories({
"org.apache.fineract.cn.payroll.service.internal.repository"
})
-public class PayrollServiceConfiguration extends WebMvcConfigurerAdapter {
+public class PayrollServiceConfiguration implements WebMvcConfigurer {
public PayrollServiceConfiguration() {
super();
@@ -74,8 +73,4 @@ public class PayrollServiceConfiguration extends WebMvcConfigurerAdapter {
return LoggerFactory.getLogger(ServiceConstants.LOGGER_NAME);
}
- @Override
- public void configurePathMatch(final PathMatchConfigurer configurer) {
- configurer.setUseSuffixPatternMatch(Boolean.FALSE);
- }
}
diff --git a/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/util/PageableBuilder.java b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/util/PageableBuilder.java
index 82befa0..2fea131 100644
--- a/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/util/PageableBuilder.java
+++ b/service/src/main/java/org/apache/fineract/cn/payroll/service/rest/util/PageableBuilder.java
@@ -39,6 +39,6 @@ public class PageableBuilder {
final Integer sizeToUse = size != null ? size : 20;
final String sortColumnToUse = sortColumn != null ? sortColumn : "customerIdentifier";
final Sort.Direction direction = sortDirection != null ? Sort.Direction.valueOf(sortDirection.toUpperCase()) : Sort.Direction.ASC;
- return new PageRequest(pageIndexToUse, sizeToUse, direction, sortColumnToUse);
+ return PageRequest.of(pageIndexToUse, sizeToUse, direction, sortColumnToUse);
}
}
diff --git a/shared.gradle b/shared.gradle
index 8c9fe20..dce2a85 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,20 +16,20 @@
*/
group 'org.apache.fineract.cn.payroll'
-version '0.1.0-BUILD-SNAPSHOT'
+version 'spring_boot_2-SNAPSHOT'
ext.versions = [
- frameworkapi : '0.1.0-BUILD-SNAPSHOT',
- frameworklang : '0.1.0-BUILD-SNAPSHOT',
- frameworkasync : '0.1.0-BUILD-SNAPSHOT',
- frameworkcassandra : '0.1.0-BUILD-SNAPSHOT',
- frameworkpostgresql : '0.1.0-BUILD-SNAPSHOT',
- frameworkcommand : '0.1.0-BUILD-SNAPSHOT',
- frameworktest: '0.1.0-BUILD-SNAPSHOT',
- frameworkanubis: '0.1.0-BUILD-SNAPSHOT',
- frameworkcustomer: '0.1.0-BUILD-SNAPSHOT',
- frameworkaccounting: '0.1.0-BUILD-SNAPSHOT',
- validator : '5.3.0.Final'
+ frameworkapi : 'spring_boot_2-SNAPSHOT',
+ frameworklang : 'spring_boot_2-SNAPSHOT',
+ frameworkasync : 'spring_boot_2-SNAPSHOT',
+ frameworkcassandra : 'spring_boot_2-SNAPSHOT',
+ frameworkpostgresql : 'spring_boot_2-SNAPSHOT',
+ frameworkcommand : 'spring_boot_2-SNAPSHOT',
+ frameworktest: 'spring_boot_2-SNAPSHOT',
+ frameworkanubis: 'spring_boot_2-SNAPSHOT',
+ frameworkcustomer: 'spring_boot_2-SNAPSHOT',
+ frameworkaccounting: 'spring_boot_2-SNAPSHOT',
+ hibernatevalidator : '6.1.7.Final'
]
tasks.withType(JavaCompile) {
@@ -43,22 +43,23 @@ repositories {
maven { url 'https://mifos.jfrog.io/mifos/libs-snapshot/' }
}
+apply plugin: 'io.spring.dependency-management'
+
dependencyManagement {
imports {
- mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Camden.SR1'
+ 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['cassandra.version'] = '3.11.9'
+ext['cassandra-driver.version'] = '4.9.0'
ext['activemq.version'] = '5.13.2'
ext['spring-data-releasetrain.version'] = 'Gosling-SR2A'
dependencies {
compile(
- [group: 'com.google.code.findbugs', name: 'jsr305'],
+ [group: 'com.github.spotbugs', name: 'spotbugs', version: '4.2.0'],
[group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql]
)