Merge pull request #17 from muellners/spring_boot_2
update to spring boot 2
diff --git a/.gitignore b/.gitignore
index e6955aa..e86ea5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@
build/
target/
out/
+.classpath
+.project
+.settings
+bin/
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/api/build.gradle b/api/build.gradle
index d010481..0baeaa1 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -19,17 +19,14 @@
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 'org.springframework.boot' version '2.2.6.RELEASE'
id 'maven-publish'
id 'java'
}
@@ -38,7 +35,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 +46,10 @@
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
api(MavenPublication) {
diff --git a/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java b/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java
index cdee071..b34d390 100644
--- a/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java
@@ -36,7 +36,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.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/build.gradle b/build.gradle
index 6ceedbf..c886710 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@
dependsOn gradle.includedBuild('component-test').task(':rat')
}
-task dependencies {
+task otherDependencies {
group 'other'
dependsOn gradle.includedBuild('service').task(':htmlDependencyReport')
}
diff --git a/component-test/build.gradle b/component-test/build.gradle
index 83a857b..afb919a 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,20 +30,25 @@
}
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'
apply plugin: 'org.asciidoctor.convert'
-bootRepackage {
+bootJar {
enabled = false
}
+jar {
+ enabled = true
+}
+
dependencies {
compile(
[group: 'org.apache.fineract.cn.deposit-account-management', name: 'api', version: project.version],
diff --git a/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java b/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java
index 5076d2d..9221e6e 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java
@@ -40,7 +40,7 @@
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 290541c..a4b4429 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=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
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/service/build.gradle b/service/build.gradle
index dc4325f..bb00880 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 {
@@ -26,10 +26,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'
@@ -38,15 +39,19 @@
apply from: '../shared.gradle'
apply plugin: 'project-report'
-bootRepackage {
+bootJar {
enabled = true
classifier = 'boot'
}
+jar {
+ enabled = true
+}
+
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.deposit-account-management', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis],
@@ -67,7 +72,7 @@
}
tasks.withType(PublishToMavenLocal) { task ->
- task.dependsOn 'bootRepackage'
+ task.dependsOn 'bootJar'
}
publishing {
@@ -80,7 +85,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/deposit/service/DepositAccountManagementConfiguration.java b/service/src/main/java/org/apache/fineract/cn/deposit/service/DepositAccountManagementConfiguration.java
index 2f5a083..5ec8856 100644
--- a/service/src/main/java/org/apache/fineract/cn/deposit/service/DepositAccountManagementConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/deposit/service/DepositAccountManagementConfiguration.java
@@ -31,7 +31,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 5d8ffee..add8bfa 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,21 +16,21 @@
*/
group 'org.apache.fineract.cn.deposit-account-management'
-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',
- frameworkledger : '0.1.0-BUILD-SNAPSHOT',
- frameworkrhythm : '0.1.0-BUILD-SNAPSHOT',
+ 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',
+ frameworkledger : 'spring_boot_2-SNAPSHOT',
+ frameworkrhythm : 'spring_boot_2-SNAPSHOT',
javamoneylib : '0.9-SNAPSHOT',
- validator : '5.3.0.Final'
+ validator : '6.1.4.Final'
]
tasks.withType(JavaCompile) {
@@ -46,8 +46,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'
}
}
@@ -112,6 +112,10 @@
"**/build/**",
"gradlew",
"gradlew.bat",
- "README.md"
+ "README.md",
+ ".classpath",
+ ".project",
+ ".settings",
+ "**/bin/**"
]
}
