Merge branch 'master' into REPORT-912

Author: wikumChamith

.gitignore

@@ -14,20 +14,13 @@ api/.classpath
 api/.project
 api/.settings/*
 api/target/*
-api-1.9/.classpath
-api-1.9/.project
-api-1.9/.settings/*
-api-2.0/.classpath
-api-2.0/.project
-api-2.0/.settings/*
 api-tests/.classpath
 api-tests/.project
 api-tests/.settings/*
 omod/.classpath
 omod/.project
 omod/.settings/*
 omod/target/*
-test-1.9/target/*
 /.settings
 
 .DS_Store

api-tests/src/test/resources/log4j.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Configuration xmlns="http://logging.apache.org/log4j/2.0/config">
+	<Properties>
+		<!-- The default pattern is stored as a property so that it's only defined once.
+		     It's also quite challenging to escape using Log4j2's variable substitution. -->
+		<Property name="defaultPattern">%p - %C{1}.%M(%L) |%d{ISO8601}| %m%n</Property>
+	</Properties>
+	<Appenders>
+		<!-- the console appender is not required but usually a good idea -->
+		<Console name="CONSOLE" target="SYSTEM_OUT">
+			<PatternLayout pattern="${openmrs:logLayout:-${defaultPattern}}" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework" additivity="false" level="WARN" />
+		<Logger name="org.hibernate" additivity="false" level="ERROR" />
+		<Logger name="org.openmrs.module.reporting" level="INFO"/>
+		<Root level="WARN">
+			<AppenderRef ref="CONSOLE" />
+		</Root>
+	</Loggers>
+</Configuration>

api-tests/src/test/resources/log4j2.xml

@@ -10,4 +10,5 @@
 	<name>Reporting API</name>
 	<description>API project for Reporting</description>
 
+
 </project>

api/pom.xml

@@ -15,7 +15,7 @@
 	</description>
 	<activator>@[email protected]</activator>
 	<updateURL>https://dev.openmrs.org/modules/download/@MODULE_ID@/update.rdf</updateURL>
-	<require_version>1.11.3 - 1.11.*, 1.10.2 - 1.10.*, 1.9.9 - 1.9.*, 1.12</require_version>
+	<require_version>${openMRSVersion}</require_version>
 
 	<require_modules>
 	   	<require_module version="${serializationVersion}">org.openmrs.module.serialization.xstream</require_module>

omod/src/main/resources/config.xml

@@ -45,9 +45,9 @@
 		<calculationVersion>1.2</calculationVersion>
 		<quartzVersion>2.1.1</quartzVersion>
 		<poiVersion>3.12</poiVersion>
-        <jodatimeVersion>2.12.5</jodatimeVersion>
-        <handlebarsVersion>1.1.2</handlebarsVersion>
-        <openmrsTestutilsVersion>1.7.0</openmrsTestutilsVersion>
+    <jodatimeVersion>2.12.5</jodatimeVersion>
+    <handlebarsVersion>1.1.2</handlebarsVersion>
+    <openmrsTestutilsVersion>1.7.0</openmrsTestutilsVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<MODULE_ID>${project.parent.artifactId}</MODULE_ID>
 		<MODULE_NAME>Reporting</MODULE_NAME>
@@ -271,7 +271,6 @@
 		</dependency>
 	</dependencies>
 
-
 	<build>
 		<resources>
 			<resource>