From commits-return-8962-archive-asf-public=cust-asf.ponee.io@fineract.apache.org Fri May 15 17:23:36 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8C570180608 for ; Fri, 15 May 2020 19:23:35 +0200 (CEST) Received: (qmail 75749 invoked by uid 500); 15 May 2020 17:23:35 -0000 Mailing-List: contact commits-help@fineract.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fineract.apache.org Delivered-To: mailing list commits@fineract.apache.org Received: (qmail 75740 invoked by uid 99); 15 May 2020 17:23:34 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 May 2020 17:23:34 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C83AB85E29; Fri, 15 May 2020 17:23:34 +0000 (UTC) Date: Fri, 15 May 2020 17:23:34 +0000 To: "commits@fineract.apache.org" Subject: [fineract-cn-notifications] branch spring_boot_2 updated: update to spring boot 2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158956341474.6337.15863696110965479984@gitbox.apache.org> From: kaze@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: fineract-cn-notifications X-Git-Refname: refs/heads/spring_boot_2 X-Git-Reftype: branch X-Git-Oldrev: 9be6cefc44c4d23ba6980d6d0ca135cc8954ec12 X-Git-Newrev: b826d9d523bc21aeb46279f009b67a45d93fcf81 X-Git-Rev: b826d9d523bc21aeb46279f009b67a45d93fcf81 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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-notifications.git The following commit(s) were added to refs/heads/spring_boot_2 by this push: new b826d9d update to spring boot 2 new d072279 Merge pull request #22 from muellners/spring_boot_2 b826d9d is described below commit b826d9d523bc21aeb46279f009b67a45d93fcf81 Author: xurror AuthorDate: Fri May 15 16:42:38 2020 +0100 update to spring boot 2 --- .gitignore | 4 ++ api/build.gradle | 18 ++++----- .../api/v1/client/NotificationManager.java | 2 +- component-test/build.gradle | 17 +++++--- .../cn/notification/AbstractNotificationTest.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 +- service/build.gradle | 25 +++++++----- .../internal/config/NotificationConfiguration.java | 6 +-- shared.gradle | 46 ++++++++++++---------- 9 files changed, 70 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index f74c5e4..d1a46cf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,10 @@ logs **/logs **/target local.properties +.classpath +.project +.settings +bin # Ignore Gradle GUI config gradle-app.setting diff --git a/api/build.gradle b/api/build.gradle index ff12569..43ce524 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.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' } @@ -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/notification/api/v1/client/NotificationManager.java b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java index 6e9b0f4..4e094cc 100644 --- a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java +++ b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java @@ -24,7 +24,7 @@ import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration; import org.apache.fineract.cn.notification.api.v1.domain.EmailConfiguration; import org.apache.fineract.cn.notification.api.v1.domain.SMSConfiguration; import org.apache.fineract.cn.notification.api.v1.domain.Template; -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 04720a4..6bb36e9 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' asciidoctorVersion = '1.5.3' } repositories { @@ -29,10 +29,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 "io.spring.dependency-management" version "1.0.9.RELEASE" + id 'org.springframework.boot' version '2.2.6.RELEASE' id 'maven-publish' id 'java' } @@ -40,7 +41,7 @@ plugins { apply from: '../shared.gradle' apply plugin: 'org.asciidoctor.convert' -bootRepackage { +bootJar { enabled = false } @@ -74,6 +75,10 @@ asciidoctor { attributes "source-highlighter": "highlightjs", '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/notification/AbstractNotificationTest.java b/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java index 01ed4b4..65dbc35 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java @@ -34,7 +34,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 7933538..13fbd1f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ #Mon Sep 30 20:06:23 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 3485dce..e323ca2 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 "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' } @@ -51,9 +52,9 @@ dependencies { [group: 'org.apache.fineract.cn.portfolio', name: 'api', version: versions.fineractcnportfolio], [group: 'org.apache.fineract.cn.office', name: 'api', version: versions.fineractcnoffice], [group: 'org.apache.fineract.cn.identity', name: 'api', version: versions.fineractcnidentity], - + [group: 'org.thymeleaf', name: 'thymeleaf-spring4', version: '3.0.11.RELEASE'], [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.notification', name: 'api', version: project.version], [group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis], @@ -71,8 +72,12 @@ dependencies { ) } +jar { + enabled = true +} + tasks.withType(PublishToMavenLocal) { task -> - task.dependsOn 'bootRepackage' + task.dependsOn 'bootJar' } publishing { @@ -85,7 +90,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/notification/service/internal/config/NotificationConfiguration.java b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/config/NotificationConfiguration.java index 40a89e4..5cca5b5 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/internal/config/NotificationConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/config/NotificationConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.context.properties.EnableConfigurationProperties; 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; @@ -52,7 +52,7 @@ import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.thymeleaf.spring4.SpringTemplateEngine; import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.templatemode.StandardTemplateModeHandlers; +import org.thymeleaf.templatemode.TemplateMode; import java.nio.charset.StandardCharsets; @@ -145,7 +145,7 @@ public class NotificationConfiguration extends WebMvcConfigurerAdapter { SpringResourceTemplateResolver emailTemplateResolver = new SpringResourceTemplateResolver(); emailTemplateResolver.setPrefix("classpath:/templates/"); emailTemplateResolver.setSuffix(".html"); - emailTemplateResolver.setTemplateMode(StandardTemplateModeHandlers.HTML5.getTemplateModeName()); + emailTemplateResolver.setTemplateMode(TemplateMode.HTML5); emailTemplateResolver.setCharacterEncoding(StandardCharsets.UTF_8.name()); return emailTemplateResolver; } diff --git a/shared.gradle b/shared.gradle index 70c64da..df5136d 100644 --- a/shared.gradle +++ b/shared.gradle @@ -16,27 +16,27 @@ */ group 'org.apache.fineract.cn.notification' -version '0.1.0-BUILD-SNAPSHOT' +version 'spring_boot_2-SNAPSHOT' ext.versions = [ - fineractcnidentity : '0.1.0-BUILD-SNAPSHOT', - fineractcnoffice : '0.1.0-BUILD-SNAPSHOT', - fineractcncustomer : '0.1.0-BUILD-SNAPSHOT', - fineractcnaccounting : '0.1.0-BUILD-SNAPSHOT', - fineractcnportfolio : '0.1.0-BUILD-SNAPSHOT', - fineractcnteller : '0.1.0-BUILD-SNAPSHOT', - fineractcnpayroll : '0.1.0-BUILD-SNAPSHOT', - fineractcngroup : '0.1.0-BUILD-SNAPSHOT', - 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', - validator : '5.3.0.Final', + fineractcnidentity : 'spring_boot_2-SNAPSHOT', + fineractcnoffice : 'spring_boot_2-SNAPSHOT', + fineractcncustomer : 'spring_boot_2-SNAPSHOT', + fineractcnaccounting : 'spring_boot_2-SNAPSHOT', + fineractcnportfolio : 'spring_boot_2-SNAPSHOT', + fineractcnteller : 'spring_boot_2-SNAPSHOT', + fineractcnpayroll : 'spring_boot_2-SNAPSHOT', + fineractcngroup : 'spring_boot_2-SNAPSHOT', + 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', + validator : '6.1.4.Final', springjavamail : '1.4.1.RELEASE', twilioapi : '7.17.+', junit : '4.12', @@ -57,8 +57,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' } } @@ -125,6 +125,10 @@ rat { "gradlew", "gradlew.bat", "README.md", + ".classpath", + ".project", + ".settings/**", + "**/bin/**" ] }