upgrade spring-boot-gradle-plugin, and deal with impacts (FINERACT-700)

because the old one previously used caused an UnsupportedOperationException
with the new Gradle, see https://issues.apache.org/jira/browse/FINERACT-700

The spring-jms and activemq-broker versions are set to what they were on before.
This commit is contained in:
Michael Vorburger
2019-07-09 10:02:13 +02:00
committed by Michael Vorburger.ch
parent 84d57dbe5b
commit 1ee141bb87
2 changed files with 8 additions and 8 deletions
+6 -6
View File
@@ -41,7 +41,7 @@ buildscript {
classpath 'org.gradle.api.plugins:gradle-tomcat-plugin:1.0', classpath 'org.gradle.api.plugins:gradle-tomcat-plugin:1.0',
'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0', 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0',
'org.zeroturnaround:gradle-jrebel-plugin:1.1.2', 'org.zeroturnaround:gradle-jrebel-plugin:1.1.2',
'org.springframework.boot:spring-boot-gradle-plugin:1.1.6.RELEASE' // also change springDataJpaVersion above 'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' // also change springDataJpaVersion below
classpath "org.apache.openjpa:openjpa-all:$openJPAVersion" classpath "org.apache.openjpa:openjpa-all:$openJPAVersion"
classpath 'at.schmutterer.oss.gradle:gradle-openjpa:0.2.0' classpath 'at.schmutterer.oss.gradle:gradle-openjpa:0.2.0'
classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.2' classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.2'
@@ -52,7 +52,7 @@ apply plugin: "org.nosphere.apache.rat"
apply plugin: 'rebel' apply plugin: 'rebel'
apply plugin: 'license' apply plugin: 'license'
apply plugin: 'war' apply plugin: 'war'
apply plugin: 'spring-boot' apply plugin: 'org.springframework.boot'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'tomcat' apply plugin: 'tomcat'
@@ -299,7 +299,7 @@ war {
from('../DISCLAIMER') { // notice the parens from('../DISCLAIMER') { // notice the parens
into "WEB-INF/" // no leading slash into "WEB-INF/" // no leading slash
} }
war.finalizedBy(bootRepackage) war.finalizedBy(bootWar)
} }
license { license {
@@ -439,8 +439,8 @@ def qualifyVersionIfNecessary(version) {
} }
springBoot { springBoot {
mainClass = 'org.apache.fineract.ServerWithMariaDB4jApplication' mainClassName = 'org.apache.fineract.ServerWithMariaDB4jApplication'
} }
bootRepackage { bootWar {
mainClass = 'org.apache.fineract.ServerWithMariaDB4jApplication' mainClassName = 'org.apache.fineract.ServerWithMariaDB4jApplication'
} }
+2 -2
View File
@@ -88,8 +88,8 @@ dependencies {
//[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0'] //[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
[group: 'io.swagger', name: 'swagger-jersey-jaxrs', version: '1.5.15'], [group: 'io.swagger', name: 'swagger-jersey-jaxrs', version: '1.5.15'],
[group: 'org.springframework', name:'spring-jms'], [group: 'org.springframework', name:'spring-jms', version: '4.0.7.RELEASE'],
[group: 'org.apache.activemq', name: 'activemq-broker'], [group: 'org.apache.activemq', name: 'activemq-broker', version: '5.9.1'],
[group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final'] [group: 'javax.validation', name: 'validation-api', version: '2.0.0.Final']
) )