Merge pull request #12 from muellners/spring_boot_2

update to spring boot 2

diff --git a/.gitignore b/.gitignore
index 1d62734da51871376648734e2790d1b9490e92df..03f57775127447aeb6e8612d1658bcf5f80595b3 100644 (file)
--- 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 d010481628f5a480da7acdf703e011237d3efb55..bd790910ecea990584d152f9fd20fe6d5f44a790 100644 (file)
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -19,17 +19,13 @@ buildscript {
     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 @@ 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]
@@ -49,6 +45,10 @@ dependencies {
     )
 }
 
+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 bf27ce5d7c4ccd7b83ad8ef4c2c7b0bdf2e3d047..21b91e86cbd665a48ea29d8bf3bd307a1c8de51e 100644 (file)
--- 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.ThrowsException;
 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 1bfc22a1260564b2384809f8e08ac1af5aae3aff..c177d26be69769df1189bf930ecf13170d4ad2ac 100644 (file)
--- 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 @@ 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 "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 @@ dependencies {
     )
 }
 
+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 61c0aa98f2db1362304c7ae55f41eb57c6e2e8c5..6c6d592b83b9a53ee8ff03bac2f0467dd554ebc4 100644 (file)
--- 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.slf4j.LoggerFactory;
 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 c312032bede54f261ec2779ea0bac0ff3b62dc30..5c6f77f3559efcb51501ecc9ae2c217dacf618dc 100644 (file)
--- 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 @@ public class TestCheques extends AbstractChequeTest {
           .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 4de3557f11717a0ef5a8e9cc5a8c14e134b19f26..56ca5bc8a1e50aeaf6ddc0b3970fd34044b5096b 100644 (file)
--- 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.3-bin.zip

diff --git a/service/build.gradle b/service/build.gradle
index 9f5ce5ecde96884864ad57d7072a94b1bb7ee6e4..942fa80e136379114d6a1703f535066d6d2f72e7 100644 (file)
--- 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 @@ 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 "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 @@ plugins {
 
 apply from: '../shared.gradle'
 
-bootRepackage {
+bootJar {
     enabled = true
     classifier = 'boot'
 }
@@ -44,7 +45,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.cheques', name: 'api', version: project.version],
             [group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis],
@@ -65,8 +66,12 @@ dependencies {
     )
 }
 
+jar {
+    enabled = true
+}
+
 tasks.withType(PublishToMavenLocal) { task ->
-    task.dependsOn 'bootRepackage'
+    task.dependsOn 'bootJar'
 }
 
 publishing {
@@ -79,7 +84,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/cheque/service/ChequeConfiguration.java b/service/src/main/java/org/apache/fineract/cn/cheque/service/ChequeConfiguration.java
index c1bf2390d7b06f364616784c22f74c5284ca5547..bd447d1bf8f51a3c48c4c73ab538528f65bbd2ea 100644 (file)
--- 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.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;

diff --git a/shared.gradle b/shared.gradle
index 612a334f031bf48a8479d1647619c606d2e6f285..3585caef8a6472bfe64b5ab88923864e864e69ae 100644 (file)
--- 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 @@ repositories {
 
 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 @@ rat {
             "gradlew",
             "gradlew.bat",
             "README.md",
-            "**/.dockerignore/**"
+            "**/.dockerignore/**",
+            "**/bin/**",
+            ".settings/**",
+            ".project",
+            ".classpath"
     ]
 }