fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject [fineract-cn-permitted-feign-client] 36/40: Update libraries and dependencies - Update spring and spring cloud version - Move hibernate-validator to new artifact
Date Fri, 08 May 2020 06:40:33 GMT
This is an automated email from the ASF dual-hosted git repository.

juhan pushed a commit to branch spring_boot_2
in repository https://gitbox.apache.org/repos/asf/fineract-cn-permitted-feign-client.git

commit 84a456a21f168edfd5a9e8d61eb6ce7922ecd69d
Author: xurror <kaze.nasser@outlook.com>
AuthorDate: Sun Apr 19 13:34:00 2020 +0100

    Update libraries and dependencies
    - Update spring and spring cloud version
    - Move hibernate-validator to new artifact
---
 another-for-test/build.gradle                          | 18 +++++++++---------
 api/build.gradle                                       | 14 +++++++-------
 component-test/build.gradle                            | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 library/build.gradle                                   | 18 +++++++++---------
 .../ApplicationPermissionRequirementsServiceTest.java  |  2 +-
 shared.gradle                                          |  2 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/another-for-test/build.gradle b/another-for-test/build.gradle
index feaeb72..ed42dcb 100644
--- a/another-for-test/build.gradle
+++ b/another-for-test/build.gradle
@@ -17,7 +17,7 @@
 
 buildscript {
     ext {
-        springBootVersion = '1.4.1.RELEASE'
+        springBootVersion = '2.2.6.RELEASE'
     }
     repositories {
         jcenter()
@@ -25,10 +25,10 @@ buildscript {
 }
 
 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 "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.2.6.RELEASE'
     id 'maven-publish'
     id 'java'
     id 'idea'
@@ -44,16 +44,16 @@ 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-server'],
             [group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'],
-            [group: 'org.hibernate', name: 'hibernate-validator', version: versions.hibernatevalidator],
+            [group: 'org.hibernate.validator', name: 'hibernate-validator', version: versions.hibernatevalidator],
             [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang],
             [group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra],
             [group: 'io.jsonwebtoken', name: 'jjwt', version: versions.jjwt],
             [group: 'org.apache.fineract.cn.anubis', name: 'api', version: versions.frameworkanubis],
             [group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis],
-            [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.48.Final'],
+            [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.48.Final']
     )
 }
 
diff --git a/api/build.gradle b/api/build.gradle
index 0fbd89c..460c129 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -22,15 +22,15 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.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 "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.5"
+    id "io.spring.dependency-management" version "1.0.9.RELEASE"
     id 'maven-publish'
     id 'java'
 }
@@ -40,8 +40,8 @@ apply from: '../shared.gradle'
 
 dependencies {
     compile (
-            [group: 'org.springframework.cloud', name: 'spring-cloud-starter-feign'],
-            [group: 'org.hibernate', name: 'hibernate-validator', version: versions.hibernatevalidator],
+            [group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign'],
+            [group: 'org.hibernate.validator', name: 'hibernate-validator', version: versions.hibernatevalidator],
             [group: 'com.google.code.gson', name: 'gson'],
             [group: 'org.apache.fineract.cn', name: 'api', version: versions.frameworkapi],
             [group: 'org.apache.fineract.cn.identity', name: 'api', version: versions.frameworkidentity]
diff --git a/component-test/build.gradle b/component-test/build.gradle
index 16d17ca..805bca1 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 {
         jcenter()
@@ -25,10 +25,10 @@ buildscript {
 }
 
 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 "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.2.6.RELEASE'
     id 'maven-publish'
     id 'java'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 290541c..6623300 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-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/build.gradle b/library/build.gradle
index e27a743..5547156 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -21,15 +21,15 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.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 "io.spring.dependency-management" version "0.6.1.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,16 +38,16 @@ apply from: '../shared.gradle'
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-netflix:1.2.0.RELEASE'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR3'
     }
 }
 
 dependencies {
     compile(
-            [group: 'org.springframework.cloud', name: 'spring-cloud-starter-feign'],
-            [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka'],
+            [group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign'],
+            [group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-eureka-server'],
             [group: 'org.springframework.cloud', name: 'spring-cloud-starter-security'],
-            [group: 'org.hibernate', name: 'hibernate-validator', version: versions.hibernatevalidator],
+            [group: 'org.hibernate.validator', name: 'hibernate-validator', version: versions.hibernatevalidator],
             [group: 'io.jsonwebtoken', name: 'jjwt', version: versions.jjwt],
             [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang],
             [group: 'org.apache.fineract.cn', name: 'api', version: versions.frameworkapi],
diff --git a/library/src/test/java/org/apache/fineract/cn/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java
b/library/src/test/java/org/apache/fineract/cn/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java
index f7e6e1a..b12947e 100644
--- a/library/src/test/java/org/apache/fineract/cn/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java
+++ b/library/src/test/java/org/apache/fineract/cn/permittedfeignclient/service/ApplicationPermissionRequirementsServiceTest.java
@@ -29,7 +29,7 @@ import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
 import org.apache.fineract.cn.identity.api.v1.domain.Permission;
 import org.junit.Assert;
 import org.junit.Test;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
diff --git a/shared.gradle b/shared.gradle
index 1068642..a351a6b 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -28,7 +28,7 @@ ext.versions = [
         frameworkservicestarter : '0.1.0-BUILD-SNAPSHOT',
         jjwt                : '0.6.0',
         hibernatevalidator  : '5.3.0.Final',
-        expiringmap         : '0.5.8'
+        expiringmap         : '0.5.9'
 ]
 
 tasks.withType(JavaCompile) {


Mime
View raw message