Merge branch 'master' into dateSupport

Author: Shiva Kumar

pom.xml

@@ -130,6 +130,16 @@
 					<target>1.7</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<excludes>
+						<exclude>**/logback.xml</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -148,4 +158,4 @@
 	</pluginRepositories>
 
 
-</project>
+</project>