Merge branch '2.1.x'

This commit is contained in:
Marcin Grzejszczak
2019-09-17 17:20:03 +02:00
3 changed files with 6 additions and 5 deletions

View File

@@ -1,4 +1,5 @@
releaser.maven.buildCommand: ./scripts/noIntegration.sh
releaser.maven.deployCommand: ./mvnw deploy -DskipTests -B -Pfast,deploy -Dgradle.publishPlugins.task=-Phello=world {{systemProps}}
releaser.gradle.gradlePropsSubstitution:
verifierVersion: spring-cloud-contract
bootVersion: spring-boot
bootVersion: spring-boot

View File

@@ -1,5 +1,5 @@
apply plugin: 'maven'
apply plugin: 'signing'
//apply plugin: 'signing'
uploadArchives.dependsOn { [check] }
@@ -53,9 +53,9 @@ ext {
}
if (isReleaseToCentral) {
signing {
/*signing {
sign configurations.archives
}
}*/
apply plugin: 'com.gradle.plugin-publish'

View File

@@ -74,7 +74,7 @@ public class CamelStubMessages implements MessageVerifier<Message> {
ConsumerTemplate consumerTemplate = this.context.createConsumerTemplate();
Exchange exchange = consumerTemplate.receive(destination,
timeUnit.toMillis(timeout));
return exchange.getIn();
return exchange != null ? exchange.getIn() : null;
}
catch (Exception e) {
log.error("Exception occurred while trying to read a message from "