[fineract] branch develop updated: use openjpa (with real dependencies) instead of shaded openjpa-all

[conradsp]

This is an automated email from the ASF dual-hosted git repository.

conradsp pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new a87b3a0  use openjpa (with real dependencies) instead of shaded 
openjpa-all
     new 9d28626  Merge pull request #607 from 
vorburger/OpenJPA-but-not_all_fatjar
a87b3a0 is described below

commit a87b3a0a4d6815d345650269c51fa146834625a9
Author: Michael Vorburger.ch <m...@vorburger.ch>
AuthorDate: Thu Jul 4 00:09:18 2019 +0200

    use openjpa (with real dependencies) instead of shaded openjpa-all
---
 fineract-provider/build.gradle        | 8 +-------
 fineract-provider/dependencies.gradle | 5 ++++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index e17ecef..7be5448 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -42,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:$openJPAVersion"
+     classpath "org.apache.openjpa:openjpa:$openJPAVersion"
      classpath 'at.schmutterer.oss.gradle:gradle-openjpa:0.2.0'
      classpath 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.2'
   }
@@ -178,9 +178,6 @@ configurations {
                exclude module: 'bcmail-jdk14'
                exclude module: 'bcprov-jdk14'
                exclude module: 'bctsp-jdk14'
-               exclude module: 'bval-core'
-               exclude module: 'org.apache.bval.bundle'
-               exclude module: 'bval-jsr303'
                exclude module: 'c3p0'
                exclude module: 'stax-api'
                exclude module: 'jaxb-api'
@@ -188,9 +185,6 @@ configurations {
                exclude module: 'jboss-logging'
                exclude module: 'itext-rtf'
                exclude module: 'classworlds'
-               exclude module: 'jcl-over-slf4j'
-               exclude module: 'jul-to-slf4j'
-               exclude module: 'serp'
        }
        runtime
        all*.exclude group: 'commons-logging'
diff --git a/fineract-provider/dependencies.gradle 
b/fineract-provider/dependencies.gradle
index 571786b..9221336 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -42,7 +42,7 @@ dependencies {
                                
                        [group: 'org.springframework.security.oauth', name: 
'spring-security-oauth2', version: springOauthVersion],
 
-                [group: 'org.apache.openjpa', name:'openjpa-all', version: 
openJPAVersion],
+                [group: 'org.apache.openjpa', name:'openjpa', 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],
@@ -97,6 +97,9 @@ dependencies {
                 [group: 'javax.validation', name: 'validation-api', version: 
'2.0.0.Final']
     )
 
+     // TODO FINERACT-777 use "implementation" instead of "compile" once we 
have upgraded Gradle (FINERACT-700)
+     compile 'org.apache.bval:org.apache.bval.bundle:2.0.2'
+
      testCompile 'junit:junit:4.11',
                  'junit:junit-dep:4.11',
                  'org.mockito:mockito-core:1.9.5',