This is an automated email from the ASF dual-hosted git repository.
kaze pushed a commit to branch spring_boot_2
in repository https://gitbox.apache.org/repos/asf/fineract-cn-rhythm.git
The following commit(s) were added to refs/heads/spring_boot_2 by this push:
new ba95ef3 update spring dependencies
ba95ef3 is described below
commit ba95ef37db19797267407505827c1f2997c3a6f6
Author: xurror <[email protected]>
AuthorDate: Wed May 13 18:24:36 2020 +0100
update spring dependencies
---
.gitignore | 4 +++
api/build.gradle | 10 +++---
.../cn/rhythm/api/v1/client/RhythmManager.java | 2 +-
component-test/build.gradle | 19 +++++++----
.../fineract/cn/rhythm/AbstractRhythmTest.java | 2 +-
service/build.gradle | 23 ++++++++------
.../rhythm/service/config/RhythmConfiguration.java | 2 +-
.../ApplicationPermissionRequestCreator.java | 2 +-
shared.gradle | 37 ++++++++++++----------
spi/build.gradle | 14 +++++---
.../cn/rhythm/spi/v1/client/BeatListener.java | 2 +-
11 files changed, 69 insertions(+), 48 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7069aef..a78e56c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,10 @@ api/out/
component-test/out/
service/out/
spi/out/
+.project
+.classpath
+.settings
+bin
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/api/build.gradle b/api/build.gradle
index 2edca5c..0ea71e3 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -22,10 +22,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 "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'
}
@@ -34,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]
diff --git
a/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/client/RhythmManager.java
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/client/RhythmManager.java
index cf2218a..b7f3605 100644
---
a/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/client/RhythmManager.java
+++
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/client/RhythmManager.java
@@ -22,7 +22,7 @@ import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
import java.util.List;
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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/component-test/build.gradle b/component-test/build.gradle
index b113c3d..12c6eb0 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 {
@@ -25,22 +25,23 @@ buildscript {
}
dependencies {
- classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3")
+ classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.7")
}
}
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 'io.spring.dependency-management' version '1.0.9.RELEASE'
id 'maven-publish'
id 'java'
}
apply from: '../shared.gradle'
apply plugin: 'org.asciidoctor.convert'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -58,6 +59,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
asciidoctor {
sourceDir 'build/doc/asciidoc/'
outputDir 'build/doc/html5'
diff --git
a/component-test/src/main/java/org/apache/fineract/cn/rhythm/AbstractRhythmTest.java
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/AbstractRhythmTest.java
index e276f0a..26ef75e 100644
---
a/component-test/src/main/java/org/apache/fineract/cn/rhythm/AbstractRhythmTest.java
+++
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/AbstractRhythmTest.java
@@ -60,7 +60,7 @@ import org.springframework.beans.factory.annotation.Autowired;
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/service/build.gradle b/service/build.gradle
index 2e91004..f7f154e 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 @@ 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 'io.spring.dependency-management' version '1.0.9.RELEASE'
id 'maven'
id 'maven-publish'
id 'java'
@@ -38,7 +39,7 @@ plugins {
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = true
classifier = 'boot'
}
@@ -46,7 +47,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.rhythm', name: 'api', version:
project.version],
[group: 'org.apache.fineract.cn.rhythm', name: 'spi', version:
project.version],
@@ -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/rhythm/service/config/RhythmConfiguration.java
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmConfiguration.java
index 87d9523..3b5e05e 100644
---
a/service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmConfiguration.java
+++
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmConfiguration.java
@@ -34,7 +34,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.cloud.netflix.ribbon.RibbonClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
diff --git
a/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
index 3791e98..84c1dcb 100644
---
a/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
+++
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
@@ -25,7 +25,7 @@ import
org.apache.fineract.cn.identity.api.v1.client.ApplicationPermissionAlread
import org.apache.fineract.cn.identity.api.v1.domain.Permission;
import org.apache.fineract.cn.permittedfeignclient.annotation.EndpointSet;
import
org.apache.fineract.cn.permittedfeignclient.annotation.PermittedFeignClientsConfiguration;
-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/shared.gradle b/shared.gradle
index 381632b..71c9ed3 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,20 +16,20 @@
*/
group 'org.apache.fineract.cn.rhythm'
-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',
- frameworkpermittedfeignclient: '0.1.0-BUILD-SNAPSHOT',
- identity: '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',
+ frameworkpermittedfeignclient: 'spring_boot_2-SNAPSHOT',
+ identity: 'spring_boot_2-SNAPSHOT',
+ validator : '6.1.4.Final'
]
tasks.withType(JavaCompile) {
@@ -45,8 +45,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'
}
}
@@ -59,7 +59,7 @@ ext['spring-data-releasetrain.version'] = 'Gosling-SR2A'
dependencies {
compile(
[group: 'com.google.code.findbugs', name: 'jsr305'],
- [group: 'postgresql', name: 'postgresql', version: '9.0-801.jdbc4']
+ [group: 'org.postgresql', name: 'postgresql', version: '42.2.12']
)
testCompile(
@@ -113,7 +113,10 @@ rat {
"**/.dockerignore/**",
"**/target/**",
"**/*.log",
- "**/banner.txt"
+ "**/banner.txt",
+ ".project",
+ ".classpath",
+ "**/bin/**",
+ ".settings/**"
]
- plainOutput = true
}
diff --git a/spi/build.gradle b/spi/build.gradle
index 11701f3..1200d04 100644
--- a/spi/build.gradle
+++ b/spi/build.gradle
@@ -22,10 +22,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 "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'
}
@@ -34,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.apache.fineract.cn', name: 'cassandra', version:
versions.frameworkcassandra],
[group: 'org.apache.fineract.cn', name: 'command', version:
versions.frameworkcommand],
@@ -47,6 +47,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
spi(MavenPublication) {
diff --git
a/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/client/BeatListener.java
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/client/BeatListener.java
index f0ce7ab..86e5f7a 100644
---
a/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/client/BeatListener.java
+++
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/client/BeatListener.java
@@ -19,7 +19,7 @@
package org.apache.fineract.cn.rhythm.spi.v1.client;
import org.apache.fineract.cn.rhythm.spi.v1.domain.BeatPublish;
-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;
