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-template.git
The following commit(s) were added to refs/heads/spring_boot_2 by this push:
new 0f20260 update to spring boot 2
new cb74647 Merge pull request #12 from muellners/spring_boot_2
0f20260 is described below
commit 0f20260dc5d37eff2ecb7e7ca548f6c2b47b5eac
Author: xurror <[email protected]>
AuthorDate: Fri May 15 19:12:09 2020 +0100
update to spring boot 2
---
.gitignore | 4 +++
api/build.gradle | 18 ++++++------
.../cn/template/api/v1/client/TemplateManager.java | 2 +-
component-test/build.gradle | 15 ++++++----
.../apache/fineract/cn/template/TestSample.java | 2 +-
gradle/wrapper/gradle-wrapper.properties | 3 +-
service/build.gradle | 24 +++++++++------
shared.gradle | 34 ++++++++++++----------
8 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/.gitignore b/.gitignore
index 554b089..db4ab43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,10 @@ build/
target/
**/out
**/build
+bin/
+.settings/
+.classpath
+.project
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/api/build.gradle b/api/build.gradle
index ef2cc86..bd79091 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -19,17 +19,13 @@ buildscript {
repositories {
jcenter()
}
-
- dependencies {
- classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.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.1'
+ id "io.spring.dependency-management" version "1.0.9.RELEASE"
id 'maven-publish'
id 'java'
}
@@ -38,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]
@@ -49,6 +45,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
api(MavenPublication) {
diff --git
a/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/TemplateManager.java
b/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/TemplateManager.java
index 9caf8dc..47b8c81 100644
---
a/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/TemplateManager.java
+++
b/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/TemplateManager.java
@@ -22,7 +22,7 @@ import org.apache.fineract.cn.template.api.v1.domain.Sample;
import java.util.List;
import org.apache.fineract.cn.api.annotation.ThrowsException;
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 7f02122..2b77f3e 100644
--- a/component-test/build.gradle
+++ b/component-test/build.gradle
@@ -25,16 +25,17 @@ 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 "io.spring.dependency-management" version "1.0.9.RELEASE"
+ id 'org.springframework.boot' version '2.2.6.RELEASE'
id 'maven-publish'
id 'java'
}
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -50,6 +51,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
componentTest(MavenPublication) {
diff --git
a/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java
b/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java
index 10fdd37..bde6a5b 100644
---
a/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java
+++
b/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java
@@ -41,7 +41,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/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index d6d8a83..5977e42 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
#Tue Oct 01 14:10:05 EEST 2019
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-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
diff --git a/service/build.gradle b/service/build.gradle
index 46871cf..739d5a3 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.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 "io.spring.dependency-management" version "1.0.9.RELEASE"
+ id 'org.springframework.boot' version '2.2.6.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.template', name: 'api', version:
project.version],
[group: 'org.apache.fineract.cn.anubis', name: 'library', version:
versions.frameworkanubis],
@@ -60,9 +61,14 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
tasks.withType(PublishToMavenLocal) { task ->
- task.dependsOn 'bootRepackage'
+ task.dependsOn 'bootJar'
}
+
publishing {
publications {
service(MavenPublication) {
@@ -73,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/shared.gradle b/shared.gradle
index 4cded3c..9eadf57 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,18 +16,19 @@
*/
group 'org.apache.fineract.cn.template'
-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',
- 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',
+ frameworkpostgresql: 'spring_boot_2-SNAPSHOT',
+ validator : '6.1.4.Final'
]
tasks.withType(JavaCompile) {
@@ -43,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'
}
}
@@ -57,7 +58,7 @@ 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: 'org.apache.fineract.cn', name: 'postgresql', version:
versions.frameworkpostgresql]
)
testCompile(
@@ -107,8 +108,11 @@ rat {
"**/build/**",
"gradlew",
"gradlew.bat",
- "README.md"
+ "README.md",
+ ".classpath",
+ ".project",
+ ".settings/**",
+ "**/bin/**"
]
- plainOutput = true
}
