diff --git a/build.gradle b/build.gradle index eb6317c7a0..293285d460 100644 --- a/build.gradle +++ b/build.gradle @@ -6,12 +6,12 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion" - classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.2' + classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.6' } } plugins { - id 'org.sonarqube' version '2.7.1' + id 'org.sonarqube' version '2.8' id 'org.asciidoctor.convert' version '1.6.1' id 'org.ajoberstar.grgit' version '3.1.1' id 'io.spring.nohttp' version '0.0.3.RELEASE' apply false @@ -59,10 +59,10 @@ ext { googleJsr305Version = '3.0.2' groovyVersion = '2.5.8' hamcrestVersion = '2.1' - hazelcastVersion = '3.12.2' - hibernateVersion = '5.4.5.Final' + hazelcastVersion = '3.12.3' + hibernateVersion = '5.4.7.Final' hsqldbVersion = '2.5.0' - h2Version = '1.4.199' + h2Version = '1.4.200' jacksonVersion = '2.10.0' javaxActivationVersion = '1.2.0' javaxMailVersion = '1.6.2' @@ -79,23 +79,23 @@ ext { lettuceVersion = '5.2.0.RELEASE' log4jVersion = '2.12.1' micrometerVersion = '1.3.0' - mockitoVersion = '3.0.0' - mysqlVersion = '8.0.17' + mockitoVersion = '3.1.0' + mysqlVersion = '8.0.18' pahoMqttClientVersion = '1.2.0' postgresVersion = '42.2.8' - reactorVersion = 'Dysprosium-RELEASE' + reactorVersion = 'Dysprosium-BUILD-SNAPSHOT' resilience4jVersion = '1.1.0' - romeToolsVersion = '1.12.1' + romeToolsVersion = '1.12.2' rsocketVersion = '1.0.0-RC5' servletApiVersion = '4.0.1' smackVersion = '4.3.4' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.0.RELEASE' - springDataVersion = 'Moore-RELEASE' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.1.BUILD-SNAPSHOT' + springDataVersion = 'Moore-BUILD-SNAPSHOT' springSecurityVersion = '5.2.0.RELEASE' springRetryVersion = '1.2.4.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.RELEASE' - springWsVersion = '3.0.7.RELEASE' - tomcatVersion = "9.0.26" + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.1.BUILD-SNAPSHOT' + springWsVersion = '3.0.8.BUILD-SNAPSHOT' + tomcatVersion = "9.0.27" xstreamVersion = '1.4.11.1' } @@ -106,8 +106,8 @@ allprojects { maven { url 'https://repo.spring.io/libs-milestone' } if (version.endsWith('BUILD-SNAPSHOT')) { maven { url 'https://repo.spring.io/libs-snapshot' } + maven { url "https://oss.jfrog.org/artifactory/libs-snapshot" } // RSocket } - maven { url "https://oss.jfrog.org/artifactory/libs-snapshot" } // RSocket // maven { url 'https://repo.spring.io/libs-staging-local' } } @@ -320,7 +320,7 @@ subprojects { subproject -> } task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allJava } @@ -331,7 +331,7 @@ subprojects { subproject -> checkstyle { configFile = file("$rootDir/src/checkstyle/checkstyle.xml") - toolVersion = '8.24' + toolVersion = '8.25' } artifacts { @@ -342,7 +342,7 @@ subprojects { subproject -> jar { manifest { attributes( - 'Implementation-Version': version, + 'Implementation-Version': project.version, 'Created-By': "JDK ${System.properties['java.version']} (${System.properties['java.specification.vendor']})", 'Implementation-Title': subproject.name, 'Implementation-Vendor-Id': subproject.group, @@ -879,7 +879,7 @@ task checkAsciidocLinks { inputs.files.filter{ f -> f.path.endsWith('.adoc') }.each { file -> def doc = file.text def anchors = new HashSet<>() - def matcher = (doc =~ /\[\[([^]]+)\]\]/) + def matcher = (doc =~ /\[\[([^]]+)]]/) while (matcher.find()) { anchors.add(matcher.group(1)) } @@ -998,14 +998,14 @@ task api(type: Javadoc) { task schemaZip(type: Zip) { group = 'Distribution' - classifier = 'schema' - description = "Builds -${classifier} archive containing all " + + archiveClassifier = 'schema' + description = "Builds -${archiveClassifier} archive containing all " + "XSDs for deployment at static.springframework.org/schema." duplicatesStrategy = 'exclude' subprojects.findAll{ !it.name.endsWith('-bom') }.each { subproject -> - def Properties schemas = new Properties(); + Properties schemas = new Properties(); def shortName = subproject.name.replaceFirst("${rootProject.name}-", '') if (subproject.name.endsWith("-core")) { shortName = '' @@ -1029,8 +1029,8 @@ task schemaZip(type: Zip) { task docsZip(type: Zip, dependsOn: reference) { group = 'Distribution' - classifier = 'docs' - description = "Builds -${classifier} archive containing api and reference " + + archiveClassifier = 'docs' + description = "Builds -${archiveClassifier} archive containing api and reference " + "for deployment at static.springframework.org/spring-integration/docs." from('src/dist') { @@ -1054,8 +1054,8 @@ task docsZip(type: Zip, dependsOn: reference) { task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) { group = 'Distribution' - classifier = 'dist' - description = "Builds -${classifier} archive, containing all jars and docs, " + + archiveClassifier = 'dist' + description = "Builds -${archiveClassifier} archive, containing all jars and docs, " + "suitable for community download page." ext.baseDir = "${project.name}-${project.version}"; @@ -1068,11 +1068,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) { expand(copyright: new Date().format("yyyy"), version: project.version) } - from(zipTree(docsZip.archivePath)) { + from(zipTree(docsZip.archiveFile)) { into "${baseDir}/docs" } - from(zipTree(schemaZip.archivePath)) { + from(zipTree(schemaZip.archiveFile)) { into "${baseDir}/schema" } @@ -1089,11 +1089,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) { // Not published by default; only for use when building from source. task depsZip(type: Zip, dependsOn: distZip) { zipTask -> group = 'Distribution' - classifier = 'dist-with-deps' - description = "Builds -${classifier} archive, containing everything " + - "in the -${distZip.classifier} archive plus all dependencies." + archiveClassifier = 'dist-with-deps' + description = "Builds -${archiveClassifier} archive, containing everything " + + "in the -${distZip.archiveClassifier} archive plus all dependencies." - from zipTree(distZip.archivePath) + from zipTree(distZip.archiveFile) gradle.taskGraph.whenReady { taskGraph -> if (taskGraph.hasTask(":${zipTask.name}")) { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java index c9180aacfe..7f6c632610 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java @@ -23,7 +23,7 @@ import static org.mockito.BDDMockito.willAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.util.ArrayList; @@ -66,7 +66,7 @@ import org.springframework.util.ClassUtils; public class SourcePollingChannelAdapterFactoryBeanTests { @Test - public void testAdviceChain() throws Exception { + public void testAdviceChain() { SourcePollingChannelAdapterFactoryBean factoryBean = new SourcePollingChannelAdapterFactoryBean(); QueueChannel outputChannel = new QueueChannel(); TestApplicationContext context = TestUtils.createTestApplicationContext(); @@ -186,7 +186,7 @@ public class SourcePollingChannelAdapterFactoryBeanTests { taskScheduler.shutdown(); - verifyZeroInteractions(errorHandlerLogger); + verifyNoInteractions(errorHandlerLogger); verify(adapterLogger).debug(contains("Poll interrupted - during stop()?")); }