You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ju...@apache.org on 2020/05/06 06:52:24 UTC
[fineract-cn-office] branch spring_boot_2 updated: update
dependencies
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-office.git
The following commit(s) were added to refs/heads/spring_boot_2 by this push:
new e6911f7 update dependencies
new 52edb3e Merge pull request #17 from muellners/spring_boot_2
e6911f7 is described below
commit e6911f7c860067ab7d732f52af3814708affe04d
Author: xurror <ka...@outlook.com>
AuthorDate: Wed May 6 06:37:17 2020 +0100
update dependencies
---
.gitignore | 4 +++
api/build.gradle | 16 +++++++----
.../office/api/v1/client/OrganizationManager.java | 2 +-
component-test/build.gradle | 19 ++++++++-----
.../fineract/cn/office/AbstractOfficeTest.java | 2 +-
service/build.gradle | 25 +++++++++-------
shared.gradle | 33 +++++++++++++---------
7 files changed, 62 insertions(+), 39 deletions(-)
diff --git a/.gitignore b/.gitignore
index a128955..603a041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@ target/
api/out
component-test/out
service/out
+.settings
+.project
+.classpath
+bin
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/api/build.gradle b/api/build.gradle
index b667700..7dfb584 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.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 'maven-publish'
id 'java'
}
@@ -39,12 +39,16 @@ 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]
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
api(MavenPublication) {
diff --git a/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java
index 9fba240..c8e1f6e 100644
--- a/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java
@@ -30,7 +30,7 @@ import javax.validation.Valid;
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/component-test/build.gradle b/component-test/build.gradle
index 2ac92f8..bb67857 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,15 +25,16 @@ 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.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 'org.springframework.boot' version '2.2.6.RELEASE'
+ id 'io.spring.dependency-management' version '1.0.9.RELEASE'
id 'maven-publish'
id 'java'
}
@@ -41,7 +42,7 @@ plugins {
apply from: '../shared.gradle'
apply plugin: 'org.asciidoctor.convert'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -66,6 +67,10 @@ asciidoctor {
'snippets': file('build/doc/generated-snippets/')
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
componentTest(MavenPublication) {
diff --git a/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java b/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java
index f2cd858..4973887 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-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 bfd04a5..de6ad62 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.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 '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'
@@ -37,7 +38,7 @@ plugins {
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = true
classifier = 'boot'
}
@@ -45,7 +46,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.hibernate', name: 'hibernate-validator', version: versions.validator],
[group: 'org.apache.fineract.cn.office', name: 'api', version: project.version],
@@ -54,15 +55,19 @@ dependencies {
[group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang],
[group: 'org.apache.fineract.cn', name: 'async', version: versions.frameworkasync],
[group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra],
- [group: 'org.apache.fineract.cn', name: 'postgresql', version:'0.1.0-BUILD-SNAPSHOT'],
+ [group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgres],
[group: 'org.apache.fineract.cn', name: 'command', version: versions.frameworkcommand],
[group: 'io.netty', name: 'netty-all', version: '4.1.39.Final'],
[group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.39.Final']
)
}
+jar {
+ enabled = true
+}
+
tasks.withType(PublishToMavenLocal) { task ->
- task.dependsOn 'bootRepackage'
+ task.dependsOn 'bootJar'
}
publishing {
@@ -75,7 +80,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/shared.gradle b/shared.gradle
index 1d2f623..abc3cbf 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,17 +16,18 @@
*/
group 'org.apache.fineract.cn.office'
-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',
- frameworkcommand : '0.1.0-BUILD-SNAPSHOT',
- frameworktest : '0.1.0-BUILD-SNAPSHOT',
- frameworkanubis : '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',
+ frameworkcommand : 'spring_boot_2-SNAPSHOT',
+ frameworktest : 'spring_boot_2-SNAPSHOT',
+ frameworkanubis : 'spring_boot_2-SNAPSHOT',
+ frameworkpostgres : 'spring_boot_2-SNAPSHOT',
+ validator : '6.1.4.Final',
]
tasks.withType(JavaCompile) {
@@ -46,8 +47,8 @@ configurations {
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'
}
}
@@ -60,8 +61,8 @@ ext['spring-data-releasetrain.version'] = 'Gosling-SR2A'
dependencies {
compile(
[group: 'com.google.code.findbugs', name: 'jsr305'],
- [group: 'org.apache.fineract.cn', name: 'postgresql', version: '0.1.0-BUILD-SNAPSHOT'],
- [group: 'postgresql', name: 'postgresql', version: '9.0-801.jdbc4']
+ [group: 'org.apache.fineract.cn', name: 'postgresql', version: 'spring_boot_2-SNAPSHOT'],
+ [group: 'org.postgresql', name: 'postgresql', version: '42.2.12']
)
testCompile(
@@ -114,6 +115,10 @@ rat {
"**/build/**",
"gradlew",
"gradlew.bat",
- "README.md"
+ "README.md",
+ ".project",
+ ".classpath",
+ ".settings/**",
+ "**/bin/**"
]
}