update dependencies
diff --git a/.gitignore b/.gitignore
index f9d7cba..b89f47d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
.idea
build/
target/
+.project
+.classpath
+bin/
+.settings/
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/build.gradle b/build.gradle
index bebea53..e5099f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,26 +21,25 @@
}
dependencies {
- classpath ("io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE")
+ classpath ("io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE")
}
}
plugins {
- id 'com.github.hierynomus.license' version '0.13.1'
- id("org.nosphere.apache.rat") version "0.3.1"
- id "com.jfrog.artifactory" version "4.9.5"
+ 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'
}
group 'org.apache.fineract.cn'
-version '0.1.0-BUILD-SNAPSHOT'
+version 'spring_boot_2-SNAPSHOT'
ext.versions = [
- frameworkapi : '0.1.0-BUILD-SNAPSHOT',
- frameworktest : '0.1.0-BUILD-SNAPSHOT',
- frameworkanubis : '0.1.0-BUILD-SNAPSHOT',
- validator : '5.3.0.Final',
- springcontext : '4.3.3.RELEASE',
- activeMQ : '5.13.2',
+ frameworkapi : 'spring_boot_2-SNAPSHOT',
+ frameworktest : 'spring_boot_2-SNAPSHOT',
+ frameworkanubis : 'spring_boot_2-SNAPSHOT',
+ springcontext : '5.2.5.RELEASE',
+ activeMQ : '5.15.2',
]
apply plugin: 'java'
@@ -61,8 +60,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'
}
}
@@ -79,8 +78,8 @@
[group: 'org.eclipse.aether', name: 'aether-connector-basic', version: '1.1.0'],
[group: 'org.eclipse.aether', name: 'aether-transport-file', version: '1.1.0'],
[group: 'org.eclipse.aether', name: 'aether-transport-http', version: '1.1.0'],
- [group: 'org.apache.maven', name: 'maven-aether-provider', version: '3.1.0'],
- [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka-server'],
+ [group: 'org.apache.maven', name: 'maven-aether-provider', version: '3.3.9'],
+ [group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-eureka-server'],
[group: 'org.springframework', name: 'spring-jms', version: versions.springcontext],
[group: 'org.apache.activemq', name: 'activemq-broker', version: versions.activeMQ],
[group: 'org.apache.activemq', name: 'activemq-spring', version: versions.activeMQ],
@@ -142,7 +141,10 @@
"**/aether/**",
"gradlew",
"gradlew.bat",
- "README.md"
+ "README.md",
+ ".project",
+ ".classpath",
+ "bin/**",
+ ".settings/**"
]
- plainOutput = true
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e42381..2fee6cd 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-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
diff --git a/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java b/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java
index 77e7c5d..7cfdc93 100644
--- a/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java
+++ b/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java
@@ -25,7 +25,7 @@
import org.junit.rules.ExternalResource;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.core.annotation.AnnotatedElementUtils;
import java.io.File;