Merge remote-tracking branch 'origin/master'

smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/Configuration.java

@@ -72,6 +72,8 @@ public enum DnsResolver {
 
     public final DomainBareJid service;
 
+    public final String host;
+
     public final String serviceTlsPin;
 
     public final SslContextFactory sslContextFactory;
@@ -138,6 +140,7 @@ public enum CompatibilityMode {
     private Configuration(Configuration.Builder builder) throws KeyManagementException, NoSuchAlgorithmException {
         service = Objects.requireNonNull(builder.service,
                         "'service' must be set. Either via 'properties' files or via system property 'sinttest.service'.");
+        host = builder.host;
         serviceTlsPin = builder.serviceTlsPin;
         if (serviceTlsPin != null) {
             SSLContext sslContext = Java7Pinning.forPin(serviceTlsPin);
@@ -197,6 +200,9 @@ else if (StringUtils.isNotEmpty(builder.accountOneUsername, builder.accountOnePa
             }
             b.setSecurityMode(securityMode);
             b.setXmppDomain(service);
+            if (host != null) {
+                b.setHost(host);
+            }
 
             if (debuggerFactory != null) {
                 b.setDebuggerFactory(debuggerFactory);
@@ -222,6 +228,8 @@ public static final class Builder {
 
         private DomainBareJid service;
 
+        private String host;
+
         private String serviceTlsPin;
 
         private SecurityMode securityMode;
@@ -287,6 +295,11 @@ public Builder setService(DomainBareJid service) {
             return this;
         }
 
+        private Builder setHost(String host) {
+            this.host = host;
+            return this;
+        }
+
         public Builder addEnabledTest(Class<? extends AbstractSmackIntTest> enabledTest) {
             if (enabledTests == null) {
                 enabledTests = new HashSet<>();
@@ -521,6 +534,7 @@ public static Configuration newConfiguration(String[] testPackages)
 
         Builder builder = builder();
         builder.setService(properties.getProperty("service"));
+        builder.setHost(properties.getProperty("host"));
         builder.setServiceTlsPin(properties.getProperty("serviceTlsPin"));
         builder.setSecurityMode(properties.getProperty("securityMode"));
         builder.setReplyTimeout(properties.getProperty("replyTimeout", "47000"));

smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/package-info.java

@@ -80,6 +80,10 @@
  * <td>XMPP service to run the tests on</td>
  * </tr>
  * <tr>
+ * <td>host</td>
+ * <td>IP address or DNS name of the XMPP service to run the tests on</td>
+ * </tr>
+ * <tr>
  * <td>serviceTlsPin</td>
  * <td>TLS Pin (used by <a href="https://github.com/Flowdalic/java-pinning">java-pinning</a>)</td>
  * </tr>

smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java

@@ -54,7 +54,7 @@
 import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 
-@SpecificationReference(document = "XEP-0115")
+@SpecificationReference(document = "XEP-0115", version = "1.6.0")
 public class EntityCapsTest extends AbstractSmackIntegrationTest {
 
     private final EntityCapsManager ecmTwo;

smack-integration-test/src/main/java/org/jivesoftware/smackx/chatstate/ChatStateIntegrationTest.java

@@ -30,7 +30,7 @@
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 
-@SpecificationReference(document = "XEP-0085")
+@SpecificationReference(document = "XEP-0085", version = "2.1")
 public class ChatStateIntegrationTest extends AbstractSmackIntegrationTest {
 
     // Listener for composing chat state

smack-integration-test/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandIntegrationTest.java

@@ -38,7 +38,7 @@
 import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 
-@SpecificationReference(document = "XEP-0050")
+@SpecificationReference(document = "XEP-0050", version = "1.3.0")
 public class AdHocCommandIntegrationTest extends AbstractSmackIntegrationTest {
 
     public AdHocCommandIntegrationTest(SmackIntegrationTestEnvironment environment) {

smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java

@@ -34,7 +34,7 @@
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 
-@SpecificationReference(document = "XEP-0096")
+@SpecificationReference(document = "XEP-0096", version = "1.3.1")
 public class FileTransferIntegrationTest extends AbstractSmackIntegrationTest {
 
     private static final int MAX_FT_DURATION = 360;

smack-integration-test/src/main/java/org/jivesoftware/smackx/geolocation/GeolocationIntegrationTest.java

@@ -38,7 +38,7 @@
 import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 import org.jxmpp.util.XmppDateTime;
 
-@SpecificationReference(document = "XEP-0080")
+@SpecificationReference(document = "XEP-0080", version = "1.9")
 public class GeolocationIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final GeoLocationManager glm1;

smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadIntegrationTest.java

@@ -38,7 +38,7 @@
 import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 
-@SpecificationReference(document = "XEP-0363")
+@SpecificationReference(document = "XEP-0363", version = "0.4.0")
 public class HttpFileUploadIntegrationTest extends AbstractSmackIntegrationTest {
 
     private static final int FILE_SIZE = 1024 * 128;

smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTControlIntegrationTest.java

@@ -38,7 +38,7 @@
 import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 import org.jxmpp.jid.Jid;
 
-@SpecificationReference(document = "XEP-0347")
+@SpecificationReference(document = "XEP-0347", version = "0.5.1")
 public class IoTControlIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final IoTControlManager IoTControlManagerOne;

smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTDataIntegrationTest.java

@@ -40,7 +40,7 @@
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 import org.igniterealtime.smack.inttest.util.IntegrationTestRosterUtil;
 
-@SpecificationReference(document = "XEP-0347")
+@SpecificationReference(document = "XEP-0347", version = "0.5.1")
 public class IoTDataIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final IoTDataManager iotDataManagerOne;

smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/IoTDiscoveryIntegrationTest.java

@@ -37,7 +37,7 @@
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 import org.jxmpp.jid.Jid;
 
-@SpecificationReference(document = "XEP-0347")
+@SpecificationReference(document = "XEP-0347", version = "0.5.1")
 public class IoTDiscoveryIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final IoTDiscoveryManager discoveryManagerOne;

smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/VersionIntegrationTest.java

@@ -30,7 +30,7 @@
 import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 
-@SpecificationReference(document = "XEP-0092")
+@SpecificationReference(document = "XEP-0092", version = "1.1")
 public class VersionIntegrationTest extends AbstractSmackIntegrationTest {
 
     public VersionIntegrationTest(SmackIntegrationTestEnvironment environment) {

smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/MamIntegrationTest.java

@@ -46,7 +46,7 @@
 import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 import org.jxmpp.jid.EntityBareJid;
 
-@SpecificationReference(document = "XEP-0313")
+@SpecificationReference(document = "XEP-0313", version = "0.6.3")
 public class MamIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final MamManager mamManagerConTwo;

smack-integration-test/src/main/java/org/jivesoftware/smackx/mood/MoodIntegrationTest.java

@@ -32,7 +32,7 @@
 import org.igniterealtime.smack.inttest.util.IntegrationTestRosterUtil;
 import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 
-@SpecificationReference(document = "XEP-0107")
+@SpecificationReference(document = "XEP-0107", version = "1.2.1")
 public class MoodIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final MoodManager mm1;

smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatEntityIntegrationTest.java

@@ -43,7 +43,7 @@
 import org.jxmpp.jid.EntityFullJid;
 import org.jxmpp.jid.parts.Resourcepart;
 
-@SpecificationReference(document = "XEP-0045")
+@SpecificationReference(document = "XEP-0045", version = "1.34.6")
 public class MultiUserChatEntityIntegrationTest extends AbstractMultiUserChatIntegrationTest {
 
     public MultiUserChatEntityIntegrationTest(SmackIntegrationTestEnvironment environment)

smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatIntegrationTest.java

@@ -45,7 +45,7 @@
 import org.jxmpp.jid.parts.Resourcepart;
 import org.jxmpp.stringprep.XmppStringprepException;
 
-@SpecificationReference(document = "XEP-0045")
+@SpecificationReference(document = "XEP-0045", version = "1.34.6")
 public class MultiUserChatIntegrationTest extends AbstractMultiUserChatIntegrationTest {
 
     public MultiUserChatIntegrationTest(SmackIntegrationTestEnvironment environment)

smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatLowLevelIntegrationTest.java

@@ -39,7 +39,7 @@
 import org.jxmpp.jid.parts.Localpart;
 import org.jxmpp.jid.parts.Resourcepart;
 
-@SpecificationReference(document = "XEP-0048")
+@SpecificationReference(document = "XEP-0048", version = "1.2")
 public class MultiUserChatLowLevelIntegrationTest extends AbstractSmackLowLevelIntegrationTest {
 
     public MultiUserChatLowLevelIntegrationTest(SmackIntegrationTestEnvironment environment) throws Exception {

smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java

@@ -55,7 +55,7 @@
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.jid.parts.Resourcepart;
 
-@SpecificationReference(document = "XEP-0045")
+@SpecificationReference(document = "XEP-0045", version = "1.34.6")
 public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatIntegrationTest {
 
     public MultiUserChatOccupantIntegrationTest(SmackIntegrationTestEnvironment environment)

smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatRolesAffiliationsPrivilegesIntegrationTest.java

@@ -47,7 +47,7 @@
 import org.jxmpp.jid.parts.Resourcepart;
 
 
-@SpecificationReference(document = "XEP-0045")
+@SpecificationReference(document = "XEP-0045", version = "1.34.6")
 public class MultiUserChatRolesAffiliationsPrivilegesIntegrationTest extends AbstractMultiUserChatIntegrationTest{
 
     public MultiUserChatRolesAffiliationsPrivilegesIntegrationTest(SmackIntegrationTestEnvironment environment)

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/MessageEncryptionIntegrationTest.java

@@ -36,7 +36,7 @@
  * During this test Alice sends an encrypted message to Bob. Bob decrypts it and sends a response to Alice.
  * It is checked whether the messages can be decrypted, and if used up pre-keys result in renewed bundles.
  */
-@SpecificationReference(document = "XEP-0384")
+@SpecificationReference(document = "XEP-0384", version = "0.3.0")
 public class MessageEncryptionIntegrationTest extends AbstractTwoUsersOmemoIntegrationTest {
 
     public MessageEncryptionIntegrationTest(SmackIntegrationTestEnvironment environment)

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoMamDecryptionTest.java

@@ -41,7 +41,7 @@
  * This test sends a message from Alice to Bob, while Bob has automatic decryption disabled.
  * Then Bob fetches his Mam archive and decrypts the result.
  */
-@SpecificationReference(document = "XEP-0384")
+@SpecificationReference(document = "XEP-0384", version = "0.3.0")
 public class OmemoMamDecryptionTest extends AbstractTwoUsersOmemoIntegrationTest {
     public OmemoMamDecryptionTest(SmackIntegrationTestEnvironment environment)
             throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/ReadOnlyDeviceIntegrationTest.java

@@ -34,7 +34,7 @@
 import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 
-@SpecificationReference(document = "XEP-0384")
+@SpecificationReference(document = "XEP-0384", version = "0.3.0")
 public class ReadOnlyDeviceIntegrationTest extends AbstractTwoUsersOmemoIntegrationTest {
 
     public ReadOnlyDeviceIntegrationTest(SmackIntegrationTestEnvironment environment) throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException, SmackException.NoResponseException, TestNotPossibleException {

smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/SessionRenegotiationIntegrationTest.java

@@ -26,7 +26,7 @@
 import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 
-@SpecificationReference(document = "XEP-0384")
+@SpecificationReference(document = "XEP-0384", version = "0.3.0")
 public class SessionRenegotiationIntegrationTest extends AbstractTwoUsersOmemoIntegrationTest {
 
     public SessionRenegotiationIntegrationTest(SmackIntegrationTestEnvironment environment)

smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/OXSecretKeyBackupIntegrationTest.java

@@ -52,7 +52,7 @@
 import org.pgpainless.key.OpenPgpV4Fingerprint;
 import org.pgpainless.key.protection.UnprotectedKeysProtector;
 
-@SpecificationReference(document = "XEP-0374")
+@SpecificationReference(document = "XEP-0374", version = "0.2.0")
 public class OXSecretKeyBackupIntegrationTest extends AbstractOpenPgpIntegrationTest {
 
     private static final String sessionId = StringUtils.randomString(10);

smack-integration-test/src/main/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingIntegrationTest.java

@@ -45,7 +45,7 @@
 import org.pgpainless.key.OpenPgpV4Fingerprint;
 import org.pgpainless.key.protection.UnprotectedKeysProtector;
 
-@SpecificationReference(document = "XEP-0374")
+@SpecificationReference(document = "XEP-0374", version = "0.2.0")
 public class OXInstantMessagingIntegrationTest extends AbstractOpenPgpIntegrationTest {
 
     private static final String sessionId = StringUtils.randomString(10);

smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/PingIntegrationTest.java

@@ -38,7 +38,7 @@
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 import org.jxmpp.jid.Jid;
 
-@SpecificationReference(document = "XEP-0199")
+@SpecificationReference(document = "XEP-0199", version = "2.0.1")
 public class PingIntegrationTest extends AbstractSmackIntegrationTest {
 
     public PingIntegrationTest(SmackIntegrationTestEnvironment environment) {

smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/PubSubIntegrationTest.java

@@ -37,7 +37,7 @@
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 import org.jxmpp.jid.DomainBareJid;
 
-@SpecificationReference(document = "XEP-0060")
+@SpecificationReference(document = "XEP-0060", version = "1.26.0")
 public class PubSubIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final PubSubManager pubSubManagerOne;

smack-integration-test/src/main/java/org/jivesoftware/smackx/softwareInfo/SoftwareInfoIntegrationTest.java

@@ -36,7 +36,7 @@
 import org.igniterealtime.smack.inttest.annotations.SpecificationReference;
 import org.igniterealtime.smack.inttest.util.IntegrationTestRosterUtil;
 
-@SpecificationReference(document = "XEP-0232")
+@SpecificationReference(document = "XEP-0232", version = "0.3")
 public class SoftwareInfoIntegrationTest extends AbstractSmackIntegrationTest {
 
     public final SoftwareInfoManager sim1;

smack-integration-test/src/main/java/org/jivesoftware/smackx/usertune/UserTuneIntegrationTest.java

@@ -36,7 +36,7 @@
 import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 import org.junit.jupiter.api.Assertions;
 
-@SpecificationReference(document = "XEP-0118")
+@SpecificationReference(document = "XEP-0118", version = "1.3.0")
 public class UserTuneIntegrationTest extends AbstractSmackIntegrationTest {
 
     private final UserTuneManager utm1;

smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java

@@ -511,7 +511,7 @@
  * </tr>
  * <tr>
  * <td>References</td>
- * <td><a href="https://xmpp.org/extensions/xep-0363.html">XEP-0372</a></td>
+ * <td><a href="https://xmpp.org/extensions/xep-0372.html">XEP-0372</a></td>
  * <td></td>
  * <td>Add references like mentions or external data to stanzas.</td>
  * </tr>