From 9730f9cc65fd101340c4957d1981d2b282f2d44a Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Sun, 31 Aug 2014 14:05:34 +0200 Subject: [PATCH 1/2] added correct / missing license MPL headers Signed-off-by: Michael Vorburger --- .../src/main/resources/META-INF/spring/jndi.xml | 12 ++++++++---- .../spring/SpringConfigurationTest.java | 5 +++++ .../TestsWithoutDatabaseAndNoJobsConfiguration.java | 5 +++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mifosng-provider/src/main/resources/META-INF/spring/jndi.xml b/mifosng-provider/src/main/resources/META-INF/spring/jndi.xml index 43411f1e1..595b28fbe 100644 --- a/mifosng-provider/src/main/resources/META-INF/spring/jndi.xml +++ b/mifosng-provider/src/main/resources/META-INF/spring/jndi.xml @@ -1,7 +1,11 @@ - + - \ No newline at end of file + diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/SpringConfigurationTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/SpringConfigurationTest.java index 533445646..2ccfad2ce 100644 --- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/SpringConfigurationTest.java +++ b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/SpringConfigurationTest.java @@ -1,3 +1,8 @@ +/** + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + */ package org.mifosplatform.infrastructure.configuration.spring; import org.junit.Test; diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/TestsWithoutDatabaseAndNoJobsConfiguration.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/TestsWithoutDatabaseAndNoJobsConfiguration.java index 4e361ad8c..2ce46408f 100644 --- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/TestsWithoutDatabaseAndNoJobsConfiguration.java +++ b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/configuration/spring/TestsWithoutDatabaseAndNoJobsConfiguration.java @@ -1,3 +1,8 @@ +/** + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + */ package org.mifosplatform.infrastructure.configuration.spring; import javax.sql.DataSource; From e644d6f53dbb70e6e8915fd8366d98189a678af8 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Sun, 31 Aug 2014 14:10:34 +0200 Subject: [PATCH 2/2] license-gradle-plugin updated + license header presence verified for each pull request via travis_build.sh now --- mifosng-provider/build.gradle | 3 ++- travis_build.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mifosng-provider/build.gradle b/mifosng-provider/build.gradle index 38520c3e8..3095438cf 100644 --- a/mifosng-provider/build.gradle +++ b/mifosng-provider/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath 'org.gradle.api.plugins:gradle-tomcat-plugin:1.0', - 'nl.javadude.gradle.plugins:license-gradle-plugin:0.6.0', + 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0', 'org.zeroturnaround:gradle-jrebel-plugin:1.1.2' } } @@ -205,6 +205,7 @@ war { license { header rootProject.file('../LICENSE.md') + excludes(["**/*.mustache"]) strictCheck true } diff --git a/travis_build.sh b/travis_build.sh index ffb84a500..ad120bc7d 100755 --- a/travis_build.sh +++ b/travis_build.sh @@ -4,4 +4,4 @@ cd mifosng-provider # where you do not have access to any files like build/reports/tests/index.html, only the Console. # @see http://mrhaki.blogspot.ch/2013/05/gradle-goodness-show-more-information.html # @see http://forums.gradle.org/gradle/topics/whats_new_in_gradle_1_1_test_logging for alternative -./gradlew --info clean test +./gradlew --info clean licenseMain licenseTest licenseIntegrationTest test