From c296c314b3b4486e21b57d21173f4e59a35ae150 Mon Sep 17 00:00:00 2001 From: "Michael Vorburger.ch" Date: Wed, 3 Jul 2019 21:53:40 +0200 Subject: [PATCH 1/2] move versions in build.gradle so that the buildscript block can already use them --- fineract-provider/build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 5fa6e1ec6..a0da61f48 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -20,6 +20,13 @@ description = '''\ Run as: gradle clean tomcatrunwar ''' + +project.ext.springBootVersion = '1.2.8.RELEASE' +project.ext.springVersion = '4.1.9.RELEASE' +project.ext.springOauthVersion = '2.0.4.RELEASE' +project.ext.jerseyVersion = '1.17' +project.ext.springDataJpaVersion = '1.7.0.RELEASE' // also change spring-boot-gradle-plugin version below + buildscript { repositories { jcenter() @@ -31,7 +38,7 @@ buildscript { classpath 'org.gradle.api.plugins:gradle-tomcat-plugin:1.0', 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0', 'org.zeroturnaround:gradle-jrebel-plugin:1.1.2', - 'org.springframework.boot:spring-boot-gradle-plugin:1.1.6.RELEASE' // also change springDataJpaVersion below + 'org.springframework.boot:spring-boot-gradle-plugin:1.1.6.RELEASE' // also change springDataJpaVersion above classpath 'org.apache.openjpa:openjpa-all:2.4.1' classpath 'at.schmutterer.oss.gradle:gradle-openjpa:0.2.0' classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.2' @@ -57,16 +64,9 @@ sourceCompatibility = JavaVersion.VERSION_1_8 /* define binary compatibility version */ targetCompatibility = JavaVersion.VERSION_1_8 -project.ext.springBootVersion = '1.2.8.RELEASE' -project.ext.springVersion = '4.1.9.RELEASE' -project.ext.springOauthVersion = '2.0.4.RELEASE' -project.ext.jerseyVersion = '1.17' -project.ext.springDataJpaVersion = '1.7.0.RELEASE' // also change spring-boot-gradle-plugin version above - project.ext.mysqlUser='root' project.ext.mysqlPassword='mysql' - group = 'org.apache.fineract' buildDir = new File(rootProject.projectDir, "../build") repositories { From e97b12a3f90d8ee1192cd6ef8b48aec580a3d5b4 Mon Sep 17 00:00:00 2001 From: "Michael Vorburger.ch" Date: Wed, 3 Jul 2019 22:10:08 +0200 Subject: [PATCH 2/2] make OpenJPA version, used twice, a variable, instead of repeating it --- fineract-provider/build.gradle | 5 ++++- fineract-provider/dependencies.gradle | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index a0da61f48..4978a6bed 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -28,6 +28,9 @@ project.ext.jerseyVersion = '1.17' project.ext.springDataJpaVersion = '1.7.0.RELEASE' // also change spring-boot-gradle-plugin version below buildscript { + ext { + openJPAVersion = '2.4.1' + } repositories { jcenter() mavenCentral() @@ -39,7 +42,7 @@ buildscript { 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0', 'org.zeroturnaround:gradle-jrebel-plugin:1.1.2', 'org.springframework.boot:spring-boot-gradle-plugin:1.1.6.RELEASE' // also change springDataJpaVersion above - classpath 'org.apache.openjpa:openjpa-all:2.4.1' + classpath "org.apache.openjpa:openjpa-all:$openJPAVersion" classpath 'at.schmutterer.oss.gradle:gradle-openjpa:0.2.0' classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.2' } diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index 6cdd85c0e..6e788f47c 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -42,8 +42,7 @@ dependencies { [group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: springOauthVersion], - [group: 'org.apache.openjpa', name:'openjpa-all', version:'2.4.1'], - //[group: 'org.apache.openjpa', name:'openjpa-maven-plugin', version:'2.4.1'], + [group: 'org.apache.openjpa', name:'openjpa-all', version: openJPAVersion], //[group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'], [group: 'com.sun.jersey', name: 'jersey-core', version: jerseyVersion], [group: 'com.sun.jersey', name: 'jersey-servlet', version: jerseyVersion],