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] 38/40: update dependencies
Date Fri, 08 May 2020 06:40:35 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 032a5c5641b368a920753eb94d609aa81ba639b5
Author: xurror <kaze.nasser@outlook.com>
AuthorDate: Wed May 6 09:52:20 2020 +0100

    update dependencies
---
 .gitignore                                         |  4 +++
 another-for-test/build.gradle                      |  7 +++---
 .../permittedfeignclient/another/api/Another.java  |  2 +-
 .../client/ApplicationPermissionRequirements.java  |  2 +-
 component-test/build.gradle                        |  3 ++-
 .../main/java/accessanother/api/AccessAnother.java |  2 +-
 .../service/AccessAnotherConfiguration.java        |  2 +-
 .../AnotherWithApplicationPermissions.java         |  2 +-
 .../PermittedFeignClientsConfiguration.java        |  2 +-
 .../config/PermittedFeignClientConfiguration.java  |  2 +-
 shared.gradle                                      | 29 ++++++++++++----------
 11 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 300fb08..022fad0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 .idea
 build/
 target/
+.settings
+bin
+.classpath
+.project
 
 # Ignore Gradle GUI config
 gradle-app.setting
diff --git a/another-for-test/build.gradle b/another-for-test/build.gradle
index fac63f4..229ab9c 100644
--- a/another-for-test/build.gradle
+++ b/another-for-test/build.gradle
@@ -29,6 +29,7 @@ plugins {
     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 'io.spring.dependency-management' version '1.0.9.RELEASE'
     id 'maven-publish'
     id 'java'
     id 'idea'
@@ -36,7 +37,7 @@ plugins {
 
 apply from: '../shared.gradle'
 
-bootRepackage {
+bootJar {
     enabled = true
     classifier = 'boot'
 }
@@ -58,7 +59,7 @@ dependencies {
 }
 
 tasks.withType(PublishToMavenLocal) { task ->
-    task.dependsOn 'bootRepackage'
+    task.dependsOn 'bootJar'
 }
 
 publishing {
@@ -71,7 +72,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 ("service-boot")
             version project.findProperty('externalVersion') ?: project.version
diff --git a/another-for-test/src/main/java/org/apache/fineract/cn/permittedfeignclient/another/api/Another.java
b/another-for-test/src/main/java/org/apache/fineract/cn/permittedfeignclient/another/api/Another.java
index ed81420..5b58d37 100644
--- a/another-for-test/src/main/java/org/apache/fineract/cn/permittedfeignclient/another/api/Another.java
+++ b/another-for-test/src/main/java/org/apache/fineract/cn/permittedfeignclient/another/api/Another.java
@@ -20,7 +20,7 @@ package org.apache.fineract.cn.permittedfeignclient.another.api;
 
 import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
 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.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/api/src/main/java/org/apache/finearct/cn/permittedfeignclient/api/v1/client/ApplicationPermissionRequirements.java
b/api/src/main/java/org/apache/finearct/cn/permittedfeignclient/api/v1/client/ApplicationPermissionRequirements.java
index cdd4e0f..8358734 100644
--- a/api/src/main/java/org/apache/finearct/cn/permittedfeignclient/api/v1/client/ApplicationPermissionRequirements.java
+++ b/api/src/main/java/org/apache/finearct/cn/permittedfeignclient/api/v1/client/ApplicationPermissionRequirements.java
@@ -19,7 +19,7 @@
 package org.apache.finearct.cn.permittedfeignclient.api.v1.client;
 
 import org.apache.finearct.cn.permittedfeignclient.api.v1.domain.ApplicationPermission;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/component-test/build.gradle b/component-test/build.gradle
index 805bca1..1064743 100644
--- a/component-test/build.gradle
+++ b/component-test/build.gradle
@@ -29,13 +29,14 @@ plugins {
     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 'io.spring.dependency-management' version '1.0.9.RELEASE'
     id 'maven-publish'
     id 'java'
 }
 
 apply from: '../shared.gradle'
 
-bootRepackage {
+bootJar {
     enabled = false
 }
 
diff --git a/component-test/src/main/java/accessanother/api/AccessAnother.java b/component-test/src/main/java/accessanother/api/AccessAnother.java
index b9717d8..745403e 100644
--- a/component-test/src/main/java/accessanother/api/AccessAnother.java
+++ b/component-test/src/main/java/accessanother/api/AccessAnother.java
@@ -20,7 +20,7 @@ package accessanother.api;
 
 import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
 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.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java
b/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java
index 6bd7090..5d3a9f2 100644
--- a/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java
+++ b/component-test/src/main/java/accessanother/service/AccessAnotherConfiguration.java
@@ -25,7 +25,7 @@ import org.apache.fineract.cn.lang.config.EnableServiceException;
 import org.apache.fineract.cn.lang.config.EnableTenantContext;
 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.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java
b/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java
index af3fd4c..2309526 100644
--- a/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java
+++ b/component-test/src/main/java/accessanother/service/apiforother/AnotherWithApplicationPermissions.java
@@ -21,7 +21,7 @@ package accessanother.service.apiforother;
 import org.apache.fineract.cn.permittedfeignclient.annotation.EndpointSet;
 import org.apache.fineract.cn.permittedfeignclient.annotation.PermittedFeignClientsConfiguration;
 import org.apache.fineract.cn.anubis.annotation.Permittable;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java
b/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java
index b81df81..b16e10a 100644
--- a/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java
+++ b/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/annotation/PermittedFeignClientsConfiguration.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.netflix.feign.FeignClientsConfiguration;
+import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 
diff --git a/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/config/PermittedFeignClientConfiguration.java
b/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/config/PermittedFeignClientConfiguration.java
index 933fc15..0c60238 100644
--- a/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/config/PermittedFeignClientConfiguration.java
+++ b/library/src/main/java/org/apache/fineract/cn/permittedfeignclient/config/PermittedFeignClientConfiguration.java
@@ -33,7 +33,7 @@ import org.apache.fineract.cn.identity.api.v1.client.IdentityManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cloud.netflix.feign.support.SpringMvcContract;
+import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/shared.gradle b/shared.gradle
index a351a6b..1121dfa 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,18 +16,18 @@
  */
 
 group 'org.apache.fineract.cn.permitted-feign-client'
-version '0.1.0-BUILD-SNAPSHOT'
+version 'spring_boot_2-SNAPSHOT'
 
 ext.versions = [
-        frameworktest       : '0.1.0-BUILD-SNAPSHOT',
-        frameworkapi        : '0.1.0-BUILD-SNAPSHOT',
-        frameworkcassandra  : '0.1.0-BUILD-SNAPSHOT',
-        frameworklang       : '0.1.0-BUILD-SNAPSHOT',
-        frameworkidentity   : '0.1.0-BUILD-SNAPSHOT',
-        frameworkanubis     : '0.1.0-BUILD-SNAPSHOT',
-        frameworkservicestarter : '0.1.0-BUILD-SNAPSHOT',
+        frameworktest       : 'spring_boot_2-SNAPSHOT',
+        frameworkapi        : 'spring_boot_2-SNAPSHOT',
+        frameworkcassandra  : 'spring_boot_2-SNAPSHOT',
+        frameworklang       : 'spring_boot_2-SNAPSHOT',
+        frameworkidentity   : 'spring_boot_2-SNAPSHOT',
+        frameworkanubis     : 'spring_boot_2-SNAPSHOT',
+        frameworkservicestarter : 'spring_boot_2-SNAPSHOT',
         jjwt                : '0.6.0',
-        hibernatevalidator  : '5.3.0.Final',
+        hibernatevalidator  : '6.1.4.Final',
         expiringmap         : '0.5.9'
 ]
 
@@ -44,8 +44,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'
     }
 }
 
@@ -108,7 +108,10 @@ rat {
             "**/build/**",
             "gradlew",
             "gradlew.bat",
-            "README.md"
+            "README.md",
+            ".project",
+            ".classpath",
+            "**/bin/**",
+            ".settings/**"
     ]
-    plainOutput = true
 }


Mime
View raw message