Merge branch '4.4'

settings.gradle

@@ -16,6 +16,7 @@ include 'smack-core',
 		'smack-resolver-javax',
 		'smack-sasl-javax',
 		'smack-sasl-provided',
+		'smack-streammanagement',
 		'smack-legacy',
 		'smack-jingle-old',
 		'smack-bosh',

smack-core/src/main/java/org/jivesoftware/smack/packet/XmlEnvironment.java

@@ -71,7 +71,7 @@ public class XmlEnvironment {
     }
 
     public String getEffectiveNamespaceOrUse(String namespace) {
-        String effectiveNamespace = getEffectiveLanguage();
+        String effectiveNamespace = getEffectiveNamespace();
         if (StringUtils.isNullOrEmpty(effectiveNamespace)) {
             return namespace;
         }

smack-streammanagement/build.gradle

@@ -0,0 +1,8 @@
+description = """\
+Smack support for XMPP Stream Management (XEP-0198)."""
+
+dependencies {
+	api project(':smack-core')
+
+	testFixturesApi(testFixtures(project(":smack-core")))
+}

smack-tcp/build.gradle

@@ -3,6 +3,7 @@ Smack for standard XMPP connections over TCP."""
 
 dependencies {
 	compile project(':smack-core')
+	api project(':smack-streammanagement')
 
 	testFixturesApi(testFixtures(project(":smack-core")))
 }

smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/tcp/OnceForThisStanza.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2014 Florian Schmaus
+ * Copyright © 2014-2020 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smack.sm.predicates;
+package org.jivesoftware.smack.sm.predicates.tcp;
 
 import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.packet.Stanza;

smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/tcp/package-info.java

@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2020 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * XMPPTCPConnection Stream Managment Predicates.
+ */
+package org.jivesoftware.smack.sm.predicates.tcp;