diff options
| -rw-r--r-- | juick-server/build.gradle | 4 | ||||
| -rw-r--r-- | juick-server/src/main/java/com/juick/server/XMPPConnection.java | 4 | ||||
| -rw-r--r-- | juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/juick-server/build.gradle b/juick-server/build.gradle index 0ae74a2e..25c4c04f 100644 --- a/juick-server/build.gradle +++ b/juick-server/build.gradle @@ -26,8 +26,8 @@ dependencies { } compile 'xpp3:xpp3:1.1.4c' - compile "rocks.xmpp:xmpp-core-client:0.7.5" - compile "rocks.xmpp:xmpp-extensions-client:0.7.5" + compile "rocks.xmpp:xmpp-core-client:0.8.0" + compile "rocks.xmpp:xmpp-extensions-client:0.8.0" compile "javax.inject:javax.inject:1" compile "javax.xml.bind:jaxb-api:2.3.0" diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java index a959fa71..2ffd18bc 100644 --- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java +++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java @@ -30,7 +30,6 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -44,7 +43,6 @@ import rocks.xmpp.core.stanza.model.*; import rocks.xmpp.core.stanza.model.client.ClientMessage; import rocks.xmpp.core.stanza.model.client.ClientPresence; import rocks.xmpp.core.stanza.model.errors.Condition; -import rocks.xmpp.extensions.caps.model.EntityCapabilities; import rocks.xmpp.extensions.component.accept.ExternalComponent; import rocks.xmpp.extensions.filetransfer.FileTransfer; import rocks.xmpp.extensions.filetransfer.FileTransferManager; @@ -72,7 +70,6 @@ import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -129,7 +126,6 @@ public class XMPPConnection implements StanzaListener, NotificationListener { componentPort); PingManager pingManager = router.getManager(PingManager.class); pingManager.setEnabled(true); - router.disableFeature(EntityCapabilities.NAMESPACE); SoftwareVersionManager softwareVersionManager = router.getManager(SoftwareVersionManager.class); softwareVersionManager.setSoftwareVersion(new SoftwareVersion("Juick", "2.x", System.getProperty("os.name", "generic"))); diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java index 647f2717..ae28f827 100644 --- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java +++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java @@ -19,7 +19,6 @@ package com.juick.server.xmpp.s2s; import rocks.xmpp.addr.Jid; import rocks.xmpp.core.XmppException; -import rocks.xmpp.core.session.ConnectionConfiguration; import rocks.xmpp.core.session.XmppSession; import rocks.xmpp.core.session.XmppSessionConfiguration; import rocks.xmpp.core.stanza.model.IQ; @@ -34,8 +33,8 @@ import rocks.xmpp.core.stream.model.StreamElement; * Created by vitalyster on 06.02.2017. */ public class BasicXmppSession extends XmppSession { - protected BasicXmppSession(String xmppServiceDomain, XmppSessionConfiguration configuration, ConnectionConfiguration... connectionConfigurations) { - super(xmppServiceDomain, configuration, connectionConfigurations); + protected BasicXmppSession(String xmppServiceDomain, XmppSessionConfiguration configuration) { + super(xmppServiceDomain, configuration); } public static BasicXmppSession create(String xmppServiceDomain, XmppSessionConfiguration configuration) { |