From c26cac4c171e56e7612a7eaa06ae99d698cf561e Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 24 Jul 2017 13:42:12 -0400 Subject: [PATCH] Upgrade to the released Milestones * SF-5.0 RC3 * AMQP2.0 M5 * Security 5.0 M3 * Spring Twitter 2.0 M4 * Gradle 4.0.1 * Checkstyle 8.0 * JsonPath 2.3 * Fix deprecations and Checkstyle violations --- build.gradle | 15 +++++++-------- gradle/wrapper/gradle-wrapper.jar | Bin 54706 -> 54712 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../aop/PublisherAnnotationAdvisor.java | 11 +++++++---- .../integration/json/JsonPathUtils.java | 5 +++-- .../util/MessagingMethodInvokerHelper.java | 10 +++++----- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 021bddb3f5..d88ce6bd92 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,6 @@ subprojects { subproject -> aspectjVersion = '1.8.10' apacheSshdVersion = '1.4.0' boonVersion = '0.34' - chronicleVersion = '3.5.3' commonsDbcp2Version = '2.1.1' commonsIoVersion = '2.4' commonsNetVersion = '3.5' @@ -115,7 +114,7 @@ subprojects { subproject -> jpaApiVersion = '2.1.1' jrubyVersion = '9.1.5.0' jschVersion = '0.1.54' - jsonpathVersion = '2.2.0' + jsonpathVersion = '2.3.0' junitVersion = '4.12' jythonVersion = '2.5.3' kryoShadedVersion = '3.0.3' @@ -130,17 +129,17 @@ subprojects { subproject -> servletApiVersion = '3.1.0' slf4jVersion = "1.7.25" smackVersion = '4.1.9' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M4' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M5' springDataJpaVersion = '2.0.0.BUILD-SNAPSHOT' springDataMongoVersion = '2.0.0.BUILD-SNAPSHOT' springDataRedisVersion = '2.0.0.BUILD-SNAPSHOT' springGemfireVersion = '2.0.0.BUILD-SNAPSHOT' - springSecurityVersion = '5.0.0.BUILD-SNAPSHOT' - springSocialTwitterVersion = '2.0.0.M2' + springSecurityVersion = '5.0.0.M3' + springSocialTwitterVersion = '2.0.0.M4' springRetryVersion = '1.2.0.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.RC3' springWsVersion = '2.4.0.RELEASE' - tomcatVersion = "8.5.14" + tomcatVersion = "8.5.16" xmlUnitVersion = '1.6' xstreamVersion = '1.4.7' } @@ -237,7 +236,7 @@ subprojects { subproject -> checkstyle { configFile = file("$rootDir/src/checkstyle/checkstyle.xml") - toolVersion = "6.16.1" + toolVersion = "8.0" } artifacts { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index aff21d8accd0f2cc85f26406413ca97a14cd0744..bde50e136b69b14f820067e9a0b87aac662c7cc1 100644 GIT binary patch delta 770 zcmYk4T}YEr7{}l9OxCMSd;ORnZ!>Xe>MP15OsRnmgO)>BmX;NLk!kdaP|#J4qQJCl ze?lrnitY@`K~NW^vJZ1}Q|E-pEAJ#P(z@}k&W_VOa5&HJ|NNiloCA+%SodjI*H@GL zz4-Ahn`juKj&1VzxbujSyEFMl zq2GiyU-|zQ==B|C16cG`u`y)&YuPeh7i8mtU!z?Ng_TA)n2IkPPw3<5o{-V2mys6G z$hvJqIUZ=B!Q>749I()G&N|s?AvYf3>_j7V7l?3d;viL-6QLd#&FLr!Dk!T^4E&9W zRZzhV*=VXr!)QQ(`&(^p{|G9fl)qxS0}Txj3HGYXo+D*0~+sXM%ny~237g&y68D^iO3 zNFB?^y~sI!!D8exwYa!%H~L(~xDr+Hc3P!B_k~pXz=Xfk8X0>8I(v2^#2t5LRLXg} zF7@m2b*7$D+?(idE27WgS(S31Z^}<*50J4xff??oMr$t;WI)}^c#THU0U@Ohrt^Ch zEJRf*8{(2ppnXoIjyD|5csOUFjE^wH%=j^9VL!1w)v22YI0sCIA2c delta 672 zcmYL{T}YEr9LC@CmuAtX?^?z7u24)RUzs_>T2o_@RA{rA3$nBiVzo+?iVPGX5zLE1 z>p?UOB5%5|i;Rjv1`g+RAG*zLNYO<>Bz-_16y0_@Se~oj^E~JI!{L8?V;N7zG6r_8 z>GSnotCA$iecN$ZbN%U$%S;+j#-CSCWjyR$#IGrPwj{Y~GgrSE`K=iEJv|(Onw1t1 zXkf!w3Ru|$Ow%@6lJGsa0p4kq6ejQxQ&1F@aaJR1`GDo)*6?sMw81j6WeRK#?qzrJ zAXvwi@GW?P7LB5=HRX!>aE`q8Us;lR@p$GKS@JMGV}>_R58JFtW{YUJEZOMea#e|t zb>*3e&z6y?d|B#H7*bg$>O%)9t5%p!rw*=KBVL76GCG$n11w>cs@+1ihWAr`qrhmm znn}<{j*!j+i>Cm$A}VWvFH%V(9=z~uM|N7quBbwVUM@{I>CG3`D7PXl=x*JF*U>$6 zx|L(GNRG}a=qfICZ^7p|EA_Ms47MvcKChCgL&&C%b(r8%*CnK@ z%gj?5J7Nl}M}6!HeeDs!$JjomM``>#8Tw%zDne8LM(j??_!L)2b4OU)5_VcYD6n}@ zFVbfTh1cSVQ|u?K3m0hqo|rbdP(cOv1?DCX(3w$=dAOM@Wm$NcY+xUtPc^bHxR^Re nlYYGQSMUd_46vt5a`>03`TvplGL0(><@6pm(#4vpz+dwZ=#m4D diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 630a0d1bc1..e70f80422e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 15:29:14 EDT 2017 +#Mon Jul 24 12:58:44 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java index 34c72b4f7c..c67f1c7676 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,6 +46,8 @@ import org.springframework.util.Assert; * * @author Mark Fisher * @author Gary Russell + * @author Artem Bilan + * * @since 2.0 */ @SuppressWarnings("serial") @@ -55,9 +57,9 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen private final MessagePublishingInterceptor interceptor; - @SuppressWarnings("unchecked") //For JDK7 - public PublisherAnnotationAdvisor(Class ... publisherAnnotationTypes) { - this.publisherAnnotationTypes = new HashSet>(Arrays.asList(publisherAnnotationTypes)); + @SuppressWarnings("unchecked") + public PublisherAnnotationAdvisor(Class... publisherAnnotationTypes) { + this.publisherAnnotationTypes = new HashSet<>(Arrays.asList(publisherAnnotationTypes)); PublisherMetadataSource metadataSource = new MethodAnnotationPublisherMetadataSource(this.publisherAnnotationTypes); this.interceptor = new MessagePublishingInterceptor(metadataSource); } @@ -69,6 +71,7 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen /** + * A channel bean name to be used as default for publishing. * @param defaultChannelName the default channel name. * @since 4.0.3 */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java index 7065e36744..6a485d173b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 the original author or authors. + * Copyright 2013-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ import com.jayway.jsonpath.Predicate; * Note {@link #evaluate} is used as {@code #jsonPath()} SpEL function. * * @author Artem Bilan + * * @since 3.0 */ public final class JsonPathUtils { @@ -41,7 +42,7 @@ public final class JsonPathUtils { return JsonPath.read((File) json, jsonPath, predicates); } else if (json instanceof URL) { - return JsonPath.read((URL) json, jsonPath, predicates); + return JsonPath.read(((URL) json).openStream(), jsonPath, predicates); } else if (json instanceof InputStream) { return JsonPath.read((InputStream) json, jsonPath, predicates); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java index 5e103202f1..558cfabd21 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java @@ -759,13 +759,13 @@ public class MessagingMethodInvokerHelper extends AbstractExpressionEvaluator } }, method12 -> method12.getName().equals(methodName)); } - Method method = targetMethod.get(); - if (method != null) { - method = org.springframework.util.ClassUtils.getMostSpecificMethod(method, targetObject.getClass()); + Method theMethod = targetMethod.get(); + if (theMethod != null) { + theMethod = org.springframework.util.ClassUtils.getMostSpecificMethod(theMethod, targetObject.getClass()); InvocableHandlerMethod invocableHandlerMethod = - this.messageHandlerMethodFactory.createInvocableHandlerMethod(targetObject, method); + this.messageHandlerMethodFactory.createInvocableHandlerMethod(targetObject, theMethod); HandlerMethod handlerMethod = new HandlerMethod(invocableHandlerMethod, this.canProcessMessageList); - checkSpelInvokerRequired(targetClass.get(), method, handlerMethod); + checkSpelInvokerRequired(targetClass.get(), theMethod, handlerMethod); Class targetParameterType = handlerMethod.getTargetParameterType(); if (handlerMethod.isMessageMethod()) { if (candidateMessageMethods.containsKey(targetParameterType)) {