Add updateCopyrights Gradle task

To avoid extra manual task to check all the files for actual Copyright
header an `updateCopyrights` is introduced to be performed before
`processResources` and check modified classes via `Git status` command
by the `grgit` plugin.
The `updateCopyrights` task is enabled only locally: when it's not on
Travis or Bamboo - no reason to infer code base when it is not going
to be committed.

Author: artembilan

build.gradle

@@ -13,6 +13,7 @@ buildscript {
 plugins {
 	id 'org.sonarqube' version '2.6.2'
 	id 'org.asciidoctor.convert' version '1.5.9.2'
+	id 'org.ajoberstar.grgit' version '3.0.0'
 }
 
 description = 'Spring Integration'
@@ -25,6 +26,9 @@ ext {
 	linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration.git'
 	linkScmDevConnection = 'scm:git:ssh://[email protected]:spring-projects/spring-integration.git'
 	docResourcesVersion = '0.1.0.RELEASE'
+
+	modifiedFiles =
+			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 }
 
 allprojects {
@@ -188,26 +192,59 @@ subprojects { subproject ->
 	[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
 
 	task checkTestConfigs {
-		doLast {
-			def configFiles = []
-			sourceSets.test.java.srcDirs.each {
-				fileTree(it).include('**/*.xml').exclude('**/log4j2-test.xml').each { configFile ->
-					def configXml = new XmlParser(false, false).parse(configFile)
+		def configFiles = []
+		sourceSets.test.java.srcDirs.each {
+			fileTree(it).include('**/*.xml').exclude('**/log4j2-test.xml').each { configFile ->
+				def configXml = new XmlParser(false, false).parse(configFile)
 
-					if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) {
-						configFiles << configFile
-					}
+				if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) {
+					configFiles << configFile
 				}
 			}
-			if (configFiles) {
+		}
+		inputs.files(configFiles)
+		outputs.dir('build')
+		doLast {
+			if (!inputs.files.empty) {
 				throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' +
-						configFiles.collect {relativePath(it)}.join('\n') +
+						inputs.files.collect {relativePath(it) }.join('\n') +
 						'\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' +
 						'on different versions of dependencies.')
 			}
 		}
 	}
 
+	task updateCopyrights {
+		onlyIf { !System.getenv('TRAVIS') && !System.getenv('bamboo_buildKey') }
+		inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) })
+		outputs.dir('build')
+
+		doLast {
+			def now = Calendar.instance.get(Calendar.YEAR) as String
+			inputs.files.each { file ->
+				def line
+				file.withReader { reader ->
+					while (line = reader.readLine()) {
+						def matcher = line =~ /Copyright (20\d\d)-?(20\d\d)?/
+						if (matcher.count) {
+							def beginningYear = matcher[0][1]
+							if (now != beginningYear || now != matcher[0][2]) {
+								def years = "$beginningYear-$now"
+								def sourceCode = file.text
+								sourceCode = sourceCode.replaceFirst(/20\d\d(-20\d\d)?/, years)
+								file.write(sourceCode)
+								println "Copyright updated for file: $file"
+							}
+							break
+						}
+					}
+				}
+			}
+		}
+	}
+
+	processResources.dependsOn updateCopyrights
+
 	jacocoTestReport {
 		reports {
 			xml.enabled false

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java

@@ -26,9 +26,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import java.io.IOException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeoutException;
 
 import org.junit.Test;
 
@@ -101,7 +99,7 @@ public void testRequeue() throws Exception {
 		testNackOrRequeue(false);
 	}
 
-	private void testNackOrRequeue(boolean requeue) throws IOException, TimeoutException {
+	private void testNackOrRequeue(boolean requeue) throws Exception {
 		Channel channel = mock(Channel.class);
 		willReturn(true).given(channel).isOpen();
 		Envelope envelope = new Envelope(123L, false, "ex", "rk");