update to spring boot 2
diff --git a/.gitignore b/.gitignore
index 1d62734..03f5777 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@
build/
target/
out/
+bin/
+.settings/
+.classpath
+.project
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/api/build.gradle b/api/build.gradle
index d010481..bd79091 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -19,17 +19,13 @@
repositories {
jcenter()
}
-
- dependencies {
- classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.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.9.RELEASE"
id 'maven-publish'
id 'java'
}
@@ -38,7 +34,7 @@
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]
@@ -49,6 +45,10 @@
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
api(MavenPublication) {
diff --git a/api/src/main/java/org/apache/fineract/cn/cheque/api/v1/client/ChequeManager.java b/api/src/main/java/org/apache/fineract/cn/cheque/api/v1/client/ChequeManager.java
index bf27ce5..21b91e8 100644
--- a/api/src/main/java/org/apache/fineract/cn/cheque/api/v1/client/ChequeManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/cheque/api/v1/client/ChequeManager.java
@@ -29,7 +29,7 @@
import org.apache.fineract.cn.api.annotation.ThrowsExceptions;
import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
import org.apache.fineract.cn.api.util.NotFoundException;
-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/component-test/build.gradle b/component-test/build.gradle
index 1bfc22a..c177d26 100644
--- a/component-test/build.gradle
+++ b/component-test/build.gradle
@@ -17,7 +17,7 @@
buildscript {
ext {
- springBootVersion = '1.4.1.RELEASE'
+ springBootVersion = '2.2.6.RELEASE'
}
repositories {
@@ -30,16 +30,17 @@
}
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 "io.spring.dependency-management" version "1.0.9.RELEASE"
+ id 'org.springframework.boot' version '2.2.6.RELEASE'
id 'maven-publish'
id 'java'
}
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -55,6 +56,10 @@
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
mavenJava(MavenPublication) {
diff --git a/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java b/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java
index 61c0aa9..6c6d592 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java
@@ -37,7 +37,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
diff --git a/component-test/src/main/java/org/apache/fineract/cn/cheque/TestCheques.java b/component-test/src/main/java/org/apache/fineract/cn/cheque/TestCheques.java
index c312032..5c6f77f 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/cheque/TestCheques.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/cheque/TestCheques.java
@@ -239,7 +239,7 @@
.when(this.accountingServiceSpy).accountExists(randomCheque.getMicr().getAccountNumber());
Mockito.doAnswer(invocation -> {
- final JournalEntry journalEntry = invocation.getArgumentAt(0, JournalEntry.class);
+ final JournalEntry journalEntry = invocation.getArgument(0);
final BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(journalEntry, "journalEntry");
this.validator.validate(journalEntry, bindingResult);
if (bindingResult.getErrorCount() != 0) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4de3557..56ca5bc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
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.3-bin.zip
diff --git a/service/build.gradle b/service/build.gradle
index 9f5ce5e..942fa80 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -17,7 +17,7 @@
buildscript {
ext {
- springBootVersion = '1.4.1.RELEASE'
+ springBootVersion = '2.2.6.RELEASE'
}
repositories {
jcenter()
@@ -25,10 +25,11 @@
}
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 "io.spring.dependency-management" version "1.0.9.RELEASE"
+ id 'org.springframework.boot' version '2.2.6.RELEASE'
id 'maven-publish'
id 'java'
id 'idea'
@@ -36,7 +37,7 @@
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = true
classifier = 'boot'
}
@@ -44,7 +45,7 @@
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.cheques', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis],
@@ -65,8 +66,12 @@
)
}
+jar {
+ enabled = true
+}
+
tasks.withType(PublishToMavenLocal) { task ->
- task.dependsOn 'bootRepackage'
+ task.dependsOn 'bootJar'
}
publishing {
@@ -79,7 +84,7 @@
}
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/cheque/service/ChequeConfiguration.java b/service/src/main/java/org/apache/fineract/cn/cheque/service/ChequeConfiguration.java
index c1bf239..bd447d1 100644
--- a/service/src/main/java/org/apache/fineract/cn/cheque/service/ChequeConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/cheque/service/ChequeConfiguration.java
@@ -33,7 +33,7 @@
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;
diff --git a/shared.gradle b/shared.gradle
index 612a334..3585cae 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,22 +16,22 @@
*/
group 'org.apache.fineract.cn.cheques'
-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',
- frameworkoffice : '0.1.0-BUILD-SNAPSHOT',
- frameworkaccounting : '0.1.0-BUILD-SNAPSHOT',
- frameworkdeposit : '0.1.0-BUILD-SNAPSHOT',
- frameworkcustomer : '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',
+ frameworkoffice : 'spring_boot_2-SNAPSHOT',
+ frameworkaccounting : 'spring_boot_2-SNAPSHOT',
+ frameworkdeposit : 'spring_boot_2-SNAPSHOT',
+ frameworkcustomer : 'spring_boot_2-SNAPSHOT',
+ validator : '6.1.4.Final'
]
tasks.withType(JavaCompile) {
@@ -47,8 +47,8 @@
dependencyManagement {
imports {
- mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Camden.SR1'
+ mavenBom 'io.spring.platform:platform-bom:Cairo-SR8'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR3'
}
}
@@ -113,6 +113,10 @@
"gradlew",
"gradlew.bat",
"README.md",
- "**/.dockerignore/**"
+ "**/.dockerignore/**",
+ "**/bin/**",
+ ".settings/**",
+ ".project",
+ ".classpath"
]
}