diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml index 772a0af2a85cf..23ba3a0479c77 100644 --- a/components/camel-xmpp/pom.xml +++ b/components/camel-xmpp/pom.xml @@ -61,7 +61,7 @@ org.igniterealtime.smack - smack-java7 + smack-java8 ${smack-version} diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java index b4862547c03f3..d9f7c7a9b67c3 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java @@ -18,15 +18,16 @@ import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.apache.camel.Exchange; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.support.DefaultHeaderFilterStrategy; import org.apache.camel.util.ObjectHelper; -import org.jivesoftware.smack.packet.DefaultExtensionElement; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.StandardExtensionElement; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smackx.jiveproperties.JivePropertiesManager; import org.jivesoftware.smackx.jiveproperties.packet.JivePropertiesExtension; @@ -135,8 +136,8 @@ public Map extractHeadersFromXmpp(Stanza stanza, Exchange exchan if (jpe instanceof JivePropertiesExtension) { extractHeadersFrom((JivePropertiesExtension) jpe, exchange, answer); } - if (jpe instanceof DefaultExtensionElement) { - extractHeadersFrom((DefaultExtensionElement) jpe, exchange, answer); + if (jpe instanceof StandardExtensionElement) { + extractHeadersFrom((StandardExtensionElement) jpe, exchange, answer); } if (stanza instanceof Message) { @@ -165,9 +166,10 @@ private void extractHeadersFrom(JivePropertiesExtension jpe, Exchange exchange, } } - private void extractHeadersFrom(DefaultExtensionElement jpe, Exchange exchange, Map answer) { - for (String name : jpe.getNames()) { - Object value = jpe.getValue(name); + private void extractHeadersFrom(StandardExtensionElement jpe, Exchange exchange, Map answer) { + for (Entry attributes : jpe.getAttributes().entrySet()) { + String name = attributes.getKey(); + String value = attributes.getValue(); if (!headerFilterStrategy.applyFilterToExternalHeaders(name, value, exchange)) { answer.put(name, value); } diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java index 48edffc949d0c..cfec90532b943 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java @@ -33,7 +33,7 @@ public XmppLogger(String direction) { @Override public void processStanza(Stanza stanza) { if (LOG.isDebugEnabled()) { - LOG.debug("{} : {}", direction, stanza.toXML(null)); + LOG.debug("{} : {}", direction, stanza.toXML()); } } } diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java index c540951ede2d6..f1862d7f1e35d 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppTestUtil.java @@ -27,6 +27,7 @@ import org.apache.camel.util.ObjectHelper; import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration; +import org.jivesoftware.smack.util.SslContextFactory; import org.jxmpp.jid.impl.JidCreate; public final class XmppTestUtil { @@ -41,14 +42,20 @@ public static void bindSSLContextTo(Registry registry, String hostAddress, int p keyStore.load(ObjectHelper.loadResourceAsStream("bogus_mina_tls.cer"), "boguspw".toCharArray()); TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); trustManagerFactory.init(keyStore); - SSLContext sslContext = SSLContext.getInstance("TLS"); + SSLContext sslContext = SSLContext.getInstance("TLSv1.3"); sslContext.init(null, trustManagerFactory.getTrustManagers(), null); ConnectionConfiguration connectionConfig = XMPPTCPConnectionConfiguration.builder() .setXmppDomain(JidCreate.domainBareFrom("apache.camel")) .setHostAddress(InetAddress.getByName(hostAddress)) .setPort(port) - .setCustomSSLContext(sslContext) + .setSslContextFactory(new SslContextFactory() { + + @Override + public SSLContext createSslContext() { + return sslContext; + } + }) .setHostnameVerifier((hostname, session) -> true) .build(); diff --git a/parent/pom.xml b/parent/pom.xml index 7120c7b78ec98..637c06c155f87 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -469,7 +469,7 @@ 1.48.1 2.0.17 2.0.17 - 4.3.5 + 4.4.8 3.17.2 4.3.0 6.11.1