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/05 15:43:29 UTC
[fineract-cn-accounting] branch spring_boot_2 updated: update
project 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-accounting.git
The following commit(s) were added to refs/heads/spring_boot_2 by this push:
new c49d895 update project dependencies
new c750ede Merge pull request #20 from muellners/spring_boot_2
c49d895 is described below
commit c49d895ceff87acb27b3d7c74afafe636cf316a8
Author: xurror <ka...@outlook.com>
AuthorDate: Tue Apr 28 12:46:22 2020 +0100
update project dependencies
---
.gitignore | 4 +++
api/build.gradle | 16 +++++++----
.../cn/accounting/api/v1/client/LedgerManager.java | 2 +-
component-test/build.gradle | 18 ++++++++----
.../cn/accounting/AbstractAccountingTest.java | 2 +-
importer/build.gradle | 18 ++++++++----
service/build.gradle | 23 ++++++++++------
.../service/AccountingServiceConfiguration.java | 2 +-
shared.gradle | 32 ++++++++++++----------
9 files changed, 74 insertions(+), 43 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8052ba8..a0b7b16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,10 @@ api/out/
component-test/out/
importer/out/
service/out/
+.project
+.classpath
+**/bin
+**/.settings
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/api/build.gradle b/api/build.gradle
index 7799c87..88b2584 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -22,19 +22,21 @@ 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 "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 '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'
}
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]
)
@@ -44,6 +46,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
api(MavenPublication) {
diff --git a/api/src/main/java/org/apache/fineract/cn/accounting/api/v1/client/LedgerManager.java b/api/src/main/java/org/apache/fineract/cn/accounting/api/v1/client/LedgerManager.java
index dd8e0b1..f6e0d10 100644
--- a/api/src/main/java/org/apache/fineract/cn/accounting/api/v1/client/LedgerManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/accounting/api/v1/client/LedgerManager.java
@@ -40,7 +40,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 047351e..31aee84 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 {
@@ -30,18 +30,20 @@ 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'
}
apply from: '../shared.gradle'
apply plugin: 'org.asciidoctor.convert'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -68,6 +70,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/accounting/AbstractAccountingTest.java b/component-test/src/main/java/org/apache/fineract/cn/accounting/AbstractAccountingTest.java
index d9c7237..5aec46f 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/accounting/AbstractAccountingTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/accounting/AbstractAccountingTest.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
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/importer/build.gradle b/importer/build.gradle
index cee57b1..6bc0fc1 100644
--- a/importer/build.gradle
+++ b/importer/build.gradle
@@ -17,7 +17,7 @@
buildscript {
ext {
- springBootVersion = '1.4.1.RELEASE'
+ springBootVersion = '2.2.6.RELEASE'
}
repositories {
@@ -26,17 +26,19 @@ 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-publish'
id 'java'
+ id 'idea'
}
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -47,6 +49,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
importer(MavenPublication) {
diff --git a/service/build.gradle b/service/build.gradle
index dacca72..d50b36c 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 {
jcenter()
@@ -25,10 +25,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'
@@ -36,7 +37,7 @@ plugins {
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = true
classifier = 'boot'
}
@@ -44,7 +45,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.accounting', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.customer', name: 'api', version: versions.frameworkcustomer],
@@ -61,8 +62,12 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
tasks.withType(PublishToMavenLocal) { task ->
- task.dependsOn 'bootRepackage'
+ task.dependsOn 'bootJar'
}
publishing {
publications {
@@ -74,7 +79,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/accounting/service/AccountingServiceConfiguration.java b/service/src/main/java/org/apache/fineract/cn/accounting/service/AccountingServiceConfiguration.java
index 840ccc9..a31f8f5 100644
--- a/service/src/main/java/org/apache/fineract/cn/accounting/service/AccountingServiceConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/accounting/service/AccountingServiceConfiguration.java
@@ -30,7 +30,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.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
diff --git a/shared.gradle b/shared.gradle
index 7c9bced..c96c300 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,20 +16,20 @@
*/
group 'org.apache.fineract.cn.accounting'
-version '0.1.0-BUILD-SNAPSHOT'
+version 'spring_boot_2-SNAPSHOT'
ext.versions = [
- frameworkanubis : '0.1.0-BUILD-SNAPSHOT',
- frameworkapi : '0.1.0-BUILD-SNAPSHOT',
- frameworklang : '0.1.0-BUILD-SNAPSHOT',
- frameworkpostgresql: '0.1.0-BUILD-SNAPSHOT',
- frameworkcassandra : '0.1.0-BUILD-SNAPSHOT',
- frameworkcommand : '0.1.0-BUILD-SNAPSHOT',
- frameworktest : '0.1.0-BUILD-SNAPSHOT',
- frameworkasync : '0.1.0-BUILD-SNAPSHOT',
- frameworkcustomer : '0.1.0-BUILD-SNAPSHOT',
+ frameworkanubis : 'spring_boot_2-SNAPSHOT',
+ frameworkapi : 'spring_boot_2-SNAPSHOT',
+ frameworklang : 'spring_boot_2-SNAPSHOT',
+ frameworkpostgresql: 'spring_boot_2-SNAPSHOT',
+ frameworkcassandra : 'spring_boot_2-SNAPSHOT',
+ frameworkcommand : 'spring_boot_2-SNAPSHOT',
+ frameworktest : 'spring_boot_2-SNAPSHOT',
+ frameworkasync : 'spring_boot_2-SNAPSHOT',
+ frameworkcustomer : 'spring_boot_2-SNAPSHOT',
apachecsvreader : '1.4',
- validator : '5.3.0.Final',
+ validator : '6.1.3.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.SR4'
}
}
@@ -112,6 +112,10 @@ rat {
"**/*.csv",
"gradlew",
"gradlew.bat",
- "README.md"
+ "README.md",
+ ".project",
+ "**/.settings/**",
+ ".classpath",
+ "**/bin/**"
]
}