Repository: camel Updated Branches: refs/heads/master 70c18da39 -> cc6883dcb
Upgrade Smack to version 4.2.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc6883dc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc6883dc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc6883dc Branch: refs/heads/master Commit: cc6883dcb96aff85ecc03846000694a380783355 Parents: 70c18da Author: Andrea Cosentino <[email protected]> Authored: Tue Sep 5 09:07:40 2017 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Tue Sep 5 09:07:40 2017 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../xmpp/springboot/XmppComponentAutoConfiguration.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cc6883dc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8757f23..5d65f25 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -606,7 +606,7 @@ <sip-api-version>1.1</sip-api-version> <slf4j-api-version>1.7.22</slf4j-api-version> <slf4j-version>1.7.22</slf4j-version> - <smack-version>4.2.0</smack-version> + <smack-version>4.2.1</smack-version> <snakeyaml-version>1.18</snakeyaml-version> <snappy-version>1.1.2.6</snappy-version> <snmp4j-version>2.3.4_1</snmp4j-version> http://git-wip-us.apache.org/repos/asf/camel/blob/cc6883dc/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java index f8d2f3d..8fdfe96 100644 --- a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java @@ -26,7 +26,6 @@ import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spi.HasId; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; -import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; @@ -95,15 +94,16 @@ public class XmppComponentAutoConfiguration { IntrospectionSupport.getProperties(value, nestedParameters, null, false); Object nestedProperty = nestedClass.newInstance(); - CamelPropertiesHelper.setCamelProperties(camelContext, - nestedProperty, nestedParameters, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), nestedProperty, + nestedParameters); entry.setValue(nestedProperty); } catch (NoSuchFieldException e) { } } } - CamelPropertiesHelper.setCamelProperties(camelContext, component, - parameters, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), component, parameters); if (ObjectHelper.isNotEmpty(customizers)) { for (ComponentCustomizer<XmppComponent> customizer : customizers) { boolean useCustomizer = (customizer instanceof HasId)
