Skip to content
Permalink
Browse files
Merge pull request #12 from muellners/spring_boot_2
update to spring boot 2
  • Loading branch information
Yemdjih Kaze Nasser committed May 15, 2020
2 parents 906131c + bffe51e commit 9c1a28231aabd7c451ce77cbbf36f4dbb0b9826b
Showing 10 changed files with 64 additions and 46 deletions.
@@ -3,6 +3,10 @@
build/
target/
out/
bin/
.settings/
.classpath
.project

# Ignore Gradle GUI config
gradle-app.setting
@@ -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) {
@@ -29,7 +29,7 @@
import org.apache.fineract.cn.api.annotation.ThrowsExceptions;
import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
import org.apache.fineract.cn.api.util.NotFoundException;
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;
@@ -17,7 +17,7 @@

buildscript {
ext {
springBootVersion = '1.4.1.RELEASE'
springBootVersion = '2.2.6.RELEASE'
}

repositories {
@@ -30,16 +30,17 @@ 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'
}
apply from: '../shared.gradle'

bootRepackage {
bootJar {
enabled = false
}

@@ -55,6 +56,10 @@ dependencies {
)
}

jar {
enabled = true
}

publishing {
publications {
mavenJava(MavenPublication) {
@@ -37,7 +37,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.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;
@@ -239,7 +239,7 @@ public void shouldProcessOpenCheque() throws Exception {
.when(this.accountingServiceSpy).accountExists(randomCheque.getMicr().getAccountNumber());

Mockito.doAnswer(invocation -> {
final JournalEntry journalEntry = invocation.getArgumentAt(0, JournalEntry.class);
final JournalEntry journalEntry = invocation.getArgument(0);
final BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(journalEntry, "journalEntry");
this.validator.validate(journalEntry, bindingResult);
if (bindingResult.getErrorCount() != 0) {
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=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
@@ -17,34 +17,35 @@

buildscript {
ext {
springBootVersion = '1.4.1.RELEASE'
springBootVersion = '2.2.6.RELEASE'
}
repositories {
jcenter()
}
}

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'
}

apply from: '../shared.gradle'

bootRepackage {
bootJar {
enabled = true
classifier = 'boot'
}

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.cheques', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis],
@@ -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
@@ -33,7 +33,7 @@
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;
@@ -16,22 +16,22 @@
*/

group 'org.apache.fineract.cn.cheques'
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',
frameworkoffice : '0.1.0-BUILD-SNAPSHOT',
frameworkaccounting : '0.1.0-BUILD-SNAPSHOT',
frameworkdeposit : '0.1.0-BUILD-SNAPSHOT',
frameworkcustomer : '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',
frameworkoffice : 'spring_boot_2-SNAPSHOT',
frameworkaccounting : 'spring_boot_2-SNAPSHOT',
frameworkdeposit : 'spring_boot_2-SNAPSHOT',
frameworkcustomer : 'spring_boot_2-SNAPSHOT',
validator : '6.1.4.Final'
]

tasks.withType(JavaCompile) {
@@ -47,8 +47,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'
}
}

@@ -113,6 +113,10 @@ rat {
"gradlew",
"gradlew.bat",
"README.md",
"**/.dockerignore/**"
"**/.dockerignore/**",
"**/bin/**",
".settings/**",
".project",
".classpath"
]
}

0 comments on commit 9c1a282

Please sign in to comment.