fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nazeer1100...@apache.org
Subject incubator-fineract git commit: 0.3.2 release changes
Date Tue, 12 Jul 2016 11:16:09 GMT
Repository: incubator-fineract
Updated Branches:
  refs/heads/develop 03558fbe8 -> be01e460f


0.3.2 release changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/be01e460
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/be01e460
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/be01e460

Branch: refs/heads/develop
Commit: be01e460f5c877e6c64530cb5b65b4bac3206a11
Parents: 03558fb
Author: Nazeer Hussain Shaik <nazeer.shaik@confluxtechnologies.com>
Authored: Tue Jul 12 16:24:10 2016 +0530
Committer: Nazeer Hussain Shaik <nazeer.shaik@confluxtechnologies.com>
Committed: Tue Jul 12 16:24:10 2016 +0530

----------------------------------------------------------------------
 README.md                                       |  5 ++--
 fineract-provider/build.gradle                  | 24 ++++++++++++++++----
 fineract-provider/dependencies.gradle           |  4 ++--
 fineract-provider/dev-dependencies.gradle       |  4 ++--
 fineract-provider/gradle.properties             |  3 ++-
 .../provider/CommandHandlerProvider.java        |  4 +---
 6 files changed, 30 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/be01e460/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8e9b096..14d8d59 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ Instructions to build war file
 1. Extract the archive file to your local directory
 2. Download gradle-wrapper.jar version 2.10 and place it in fineract-provider/gradle/wrapper
folder
 3. Change current working directory to fineract-provider
-4. Run './gradlew clean war' to build deployable war file which will be created at fineract-provider/build/libs
directory
+4. Run './gradlew clean war' or './gradlew build' to build deployable war file which will
be created at fineract-provider/build/libs directory. 
+
 
 Instructions to execute Integration tests
 ============
@@ -25,7 +26,7 @@ Instructions to execute Integration tests
 4. With fineract-provider as current working directory run below commands
 4.a. ./gradlew migrateTenantListDB -PdbName=mifosplatform-tenants
 4.b. ./gradlew migrateTenantDB -PdbName=mifostenant-default
-5. Run './gradlew clean integrationTest'
+5. Run './gradlew clean integrationTest -PbuildType=TEST'
 
 
 More details of the project can be found at https://cwiki.apache.org/confluence/display/FINERACT
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/be01e460/fineract-provider/build.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 49be6fa..2407819 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -2,7 +2,6 @@ description = '''\
 Run as:
 gradle clean tomcatrunwar
 '''
-
 buildscript {
   repositories {
   	 jcenter()
@@ -49,9 +48,12 @@ repositories {
 }
 
 configurations {
+	hibernateDependencies
 	providedRuntime // needed for Spring Boot executable WAR
     providedCompile
-	compile
+	compile() {
+		exclude module: 'hibernate-entitymanager'		
+	}
 	runtime
 	all*.exclude group: 'commons-logging'
 }
@@ -116,6 +118,11 @@ task dist(type:Zip){
 
 war {
     war.finalizedBy(bootRepackage)
+	if (project.hasProperty('buildType') && project.getProperty('buildType') == 'TEST')
{
+		from(configurations.hibernateDependencies) { // notice the parens
+        	into "WEB-INF/lib/" // no leading slash
+    }
+	}
 }
 
 license {
@@ -175,6 +182,7 @@ sourceSets {
  integrationTest {
     	compileClasspath += main.output + test.output
         runtimeClasspath += main.output + test.output
+        runtimeClasspath += configurations.hibernateDependencies
     }
 }
 
@@ -190,8 +198,6 @@ task integrationTest(type:Test){
         tomcatRunWar.daemon = true
         tomcatRunWar.execute()
     }
-
-
     testClassesDir = project.sourceSets.integrationTest.output.classesDir
     classpath = project.sourceSets.integrationTest.runtimeClasspath
 }
@@ -207,6 +213,16 @@ configurations {
 }
 dependencies {
     driver 'org.drizzle.jdbc:drizzle-jdbc:1.3'
+    hibernateDependencies(
+    [group:'org.springframework.boot', name:'spring-boot-starter-data-jpa', version:'1.1.6.RELEASE'],
+    ) 
+}
+
+test {
+	filter {
+        //includeTestsMatching "org.apache.fineract.infrastructure.configuration.spring.SpringConfigurationTest.*"
+        includeTestsMatching "org.apache.fineract.template.TemplateMergeServiceTest.*"
+    }
 }
 
 URLClassLoader loader = GroovyObject.class.classLoader

http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/be01e460/fineract-provider/dependencies.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index d8dabd5..4e5485a 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -19,7 +19,7 @@ dependencies {
                 [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:
springBootVersion],
                 [group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa',
version: springBootVersion],
                 [group: 'org.springframework.boot', name: 'spring-boot-starter-security',
version: springBootVersion],
-
+				[group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.0.0'],
                 [group: 'org.springframework', name: 'spring-context-support', version: springVersion],
 				
 	       		[group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version:
springOauthVersion],
@@ -70,7 +70,7 @@ dependencies {
                 // it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
                 [group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'],
                 // Once we've switched to Java 8 this dep can be removed.
-                [group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
+                //[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
      )
      testCompile 'junit:junit:4.11',
                  'junit:junit-dep:4.11',

http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/be01e460/fineract-provider/dev-dependencies.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/dev-dependencies.gradle b/fineract-provider/dev-dependencies.gradle
index 89ffcf1..b62e6b6 100644
--- a/fineract-provider/dev-dependencies.gradle
+++ b/fineract-provider/dev-dependencies.gradle
@@ -19,7 +19,7 @@ dependencies {
                 [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:
springBootVersion],
                 [group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa',
version: springBootVersion],
                 [group: 'org.springframework.boot', name: 'spring-boot-starter-security',
version: springBootVersion],
-
+				[group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.0.0'],
                 [group: 'org.springframework', name: 'spring-context-support', version: springVersion],
 				[group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version:
springOauthVersion],
 
@@ -69,7 +69,7 @@ dependencies {
                 // it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
                 [group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'],
                 // Once we've switched to Java 8 this dep can be removed.
-                [group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
+                //[group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0']
      )
      testCompile 'junit:junit:4.11',
                  'junit:junit-dep:4.11',

http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/be01e460/fineract-provider/gradle.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/gradle.properties b/fineract-provider/gradle.properties
index 2a19a0c..760ca3d 100644
--- a/fineract-provider/gradle.properties
+++ b/fineract-provider/gradle.properties
@@ -1,3 +1,4 @@
-releaseVersion=0.3.0-incubating
+releaseVersion=0.3.2-incubating
+buildType=BUILD
 
 

http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/be01e460/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
b/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
index a55d89b..1312069 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
@@ -32,7 +32,6 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Nonnull;
 import java.util.HashMap;
 
 /**
@@ -68,8 +67,7 @@ public class CommandHandlerProvider implements ApplicationContextAware {
      * @param entity the entity to lookup the handler, must be given.
      * @param action the action to lookup the handler, must be given.
      */
-    @Nonnull
-    public NewCommandSourceHandler getHandler (@Nonnull final String entity, @Nonnull final
String action) {
+    public NewCommandSourceHandler getHandler (final String entity, final String action)
{
         Preconditions.checkArgument(StringUtils.isNoneEmpty(entity), "An entity must be given!");
         Preconditions.checkArgument(StringUtils.isNoneEmpty(action), "An action must be given!");
 


Mime
View raw message