com.hivemq.client -> com.hivemq.client2

hivemq-mqtt-client -> hivemq-mqtt-client2

Author: SgtSilvio

README.md

@@ -101,18 +101,18 @@ If you use Gradle, just include the following inside your `build.gradle(.kts)` f
 
 ```groovy
 dependencies {
-  implementation("com.hivemq:hivemq-mqtt-client:1.2.2")
+    implementation("com.hivemq:hivemq-mqtt-client2:2.0.0")
 }
 ```
 
 For optional features you can choose to include additional modules:
 
 ```groovy
 dependencies {
-  implementation(platform("com.hivemq:hivemq-mqtt-client-websocket:1.2.2"))
-  implementation(platform("com.hivemq:hivemq-mqtt-client-proxy:1.2.2"))
-  implementation(platform("com.hivemq:hivemq-mqtt-client-epoll:1.2.2"))
-  implementation("com.hivemq:hivemq-mqtt-client-reactor:1.2.2")
+    implementation(platform("com.hivemq:hivemq-mqtt-client2-websocket:2.0.0"))
+    implementation(platform("com.hivemq:hivemq-mqtt-client2-proxy:2.0.0"))
+    implementation(platform("com.hivemq:hivemq-mqtt-client2-epoll:2.0.0"))
+    implementation("com.hivemq:hivemq-mqtt-client2-reactor:2.0.0")
 }
 ```
 
@@ -126,8 +126,8 @@ If you use Maven, just include the following inside your `pom.xml` file.
     <dependencies>
         <dependency>
             <groupId>com.hivemq</groupId>
-            <artifactId>hivemq-mqtt-client</artifactId>
-            <version>1.2.2</version>
+            <artifactId>hivemq-mqtt-client2</artifactId>
+            <version>2.0.0</version>
         </dependency>
     </dependencies>
     ...
@@ -155,32 +155,32 @@ For optional features you can choose to include additional modules:
     <dependencies>
         <dependency>
             <groupId>com.hivemq</groupId>
-            <artifactId>hivemq-mqtt-client-websocket</artifactId>
-            <version>1.2.2</version>
+            <artifactId>hivemq-mqtt-client2-websocket</artifactId>
+            <version>2.0.0</version>
             <type>pom</type>
         </dependency>
     </dependencies>
     <dependencies>
         <dependency>
             <groupId>com.hivemq</groupId>
-            <artifactId>hivemq-mqtt-client-proxy</artifactId>
-            <version>1.2.2</version>
+            <artifactId>hivemq-mqtt-client2-proxy</artifactId>
+            <version>2.0.0</version>
             <type>pom</type>
         </dependency>
     </dependencies>
     <dependencies>
         <dependency>
             <groupId>com.hivemq</groupId>
-            <artifactId>hivemq-mqtt-client-epoll</artifactId>
-            <version>1.2.2</version>
+            <artifactId>hivemq-mqtt-client2-epoll</artifactId>
+            <version>2.0.0</version>
             <type>pom</type>
         </dependency>
     </dependencies>
     <dependencies>
         <dependency>
             <groupId>com.hivemq</groupId>
-            <artifactId>hivemq-mqtt-client-reactor</artifactId>
-            <version>1.2.2</version>
+            <artifactId>hivemq-mqtt-client2-reactor</artifactId>
+            <version>2.0.0</version>
         </dependency>
     </dependencies>
     ...
@@ -198,7 +198,7 @@ To use the shaded version just append `-shaded` to the artifact name.
 
 ```groovy
 dependencies {
-  implementation("com.hivemq:hivemq-mqtt-client-shaded:1.2.2")
+    implementation("com.hivemq:hivemq-mqtt-client2-shaded:2.0.0")
 }
 ```
 
@@ -210,8 +210,8 @@ dependencies {
     <dependencies>
         <dependency>
             <groupId>com.hivemq</groupId>
-            <artifactId>hivemq-mqtt-client-shaded</artifactId>
-            <version>1.2.2</version>
+            <artifactId>hivemq-mqtt-client2-shaded</artifactId>
+            <version>2.0.0</version>
         </dependency>
     </dependencies>
     ...
@@ -226,18 +226,18 @@ Snapshots can be obtained using [JitPack](https://jitpack.io/#hivemq/hivemq-mqtt
 
 ```groovy
 repositories {
-  ...
-  maven { url 'https://jitpack.io' }
+    ...
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
-  implementation("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client:develop-SNAPSHOT")
+    implementation("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2:develop-SNAPSHOT")
 
-  // snapshots for optional modules
-  implementation(platform("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-websocket:develop-SNAPSHOT"))
-  implementation(platform("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-proxy:develop-SNAPSHOT"))
-  implementation(platform("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-epoll:develop-SNAPSHOT"))
-  implementation("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-reactor:develop-SNAPSHOT")
+    // snapshots for optional modules
+    implementation(platform("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-websocket:develop-SNAPSHOT"))
+    implementation(platform("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-proxy:develop-SNAPSHOT"))
+    implementation(platform("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-epoll:develop-SNAPSHOT"))
+    implementation("com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-reactor:develop-SNAPSHOT")
 }
 ```
 
@@ -256,7 +256,7 @@ dependencies {
     <dependencies>
         <dependency>
             <groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
-            <artifactId>hivemq-mqtt-client</artifactId>
+            <artifactId>hivemq-mqtt-client2</artifactId>
             <version>develop-SNAPSHOT</version>
         </dependency>
     </dependencies>
@@ -265,39 +265,39 @@ dependencies {
     <dependencies>
         <dependency>
             <groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
-            <artifactId>hivemq-mqtt-client-websocket</artifactId>
+            <artifactId>hivemq-mqtt-client2-websocket</artifactId>
             <version>develop-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
     </dependencies>
     <dependencies>
         <dependency>
             <groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
-            <artifactId>hivemq-mqtt-client-proxy</artifactId>
+            <artifactId>hivemq-mqtt-client2-proxy</artifactId>
             <version>develop-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
     </dependencies>
     <dependencies>
         <dependency>
             <groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
-            <artifactId>hivemq-mqtt-client-epoll</artifactId>
+            <artifactId>hivemq-mqtt-client2-epoll</artifactId>
             <version>develop-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
     </dependencies>
     <dependencies>
         <dependency>
             <groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
-            <artifactId>hivemq-mqtt-client-reactor</artifactId>
+            <artifactId>hivemq-mqtt-client2-reactor</artifactId>
             <version>develop-SNAPSHOT</version>
         </dependency>
     </dependencies>
     ...
 </project>
 ```
 
-Change the artifact name to `hivemq-mqtt-client-shaded` to get snapshots of the shaded version.
+Change the artifact name to `hivemq-mqtt-client2-shaded` to get snapshots of the shaded version.
 
 JitPack works for all branches and also specific commits.
 Just specify `<branch>-SNAPSHOT` or the first 10 digits of the commit id in the version.
@@ -734,7 +734,7 @@ API but return `Completable`.
 
 [Semantic Versioning](https://semver.org/) is used.
 
-All code inside `com.hivemq.client.internal` packages must not be used directly. It can change at any time and is not
+All code inside `com.hivemq.client2.internal` packages must not be used directly. It can change at any time and is not
 part of the public API.
 
 Interfaces annotated with `DoNotImplement` must not be implemented. The implementation is provided by the library.

build.gradle.kts

@@ -23,7 +23,7 @@ allprojects {
     plugins.apply("com.github.sgtsilvio.gradle.metadata")
 
     metadata {
-        moduleName.set("com.hivemq.client.mqtt")
+        moduleName.set("com.hivemq.client2.mqtt")
         readableName.set("HiveMQ MQTT Client")
         organization {
             name.set("HiveMQ and the HiveMQ Community")
@@ -158,10 +158,10 @@ allprojects {
 tasks.jar {
     withConvention(aQute.bnd.gradle.BundleTaskConvention::class) {
         bnd("Export-Package: " +
-                "com.hivemq.client.annotations.*," +
-                "com.hivemq.client.mqtt.*," +
-                "com.hivemq.client.rx.*," +
-                "com.hivemq.client.util.*")
+                "com.hivemq.client2.annotations.*," +
+                "com.hivemq.client2.mqtt.*," +
+                "com.hivemq.client2.rx.*," +
+                "com.hivemq.client2.util.*")
     }
 }
 
@@ -176,7 +176,7 @@ tasks.shadowJar {
         }
     })
 
-    val shadePrefix = "com.hivemq.client.internal.shaded."
+    val shadePrefix = "com.hivemq.client2.internal.shaded."
     val shadeFilePrefix = shadePrefix.replace(".", "_")
     relocate("io.netty", "${shadePrefix}io.netty")
     relocate("META-INF/native/libnetty", "META-INF/native/lib${shadeFilePrefix}netty")

epoll/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 description = "Adds dependencies for the HiveMQ MQTT Client epoll module"
 
 metadata {
-    moduleName.set("com.hivemq.client.mqtt.epoll")
+    moduleName.set("com.hivemq.client2.mqtt.epoll")
     readableName.set("HiveMQ MQTT Client epoll module")
 }
 

examples/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 description = "Examples using the HiveMQ MQTT Client"
 
 metadata {
-    moduleName.set("com.hivemq.client.mqtt.examples")
+    moduleName.set("com.hivemq.client2.mqtt.examples")
     readableName.set("HiveMQ MQTT Client examples")
 }
 

examples/src/main/java/com/hivemq/client/mqtt/examples/AsyncDemo.java renamed to examples/src/main/java/com/hivemq/client2/mqtt/examples/AsyncDemo.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hivemq.client.mqtt.examples;
+package com.hivemq.client2.mqtt.examples;
 
-import com.hivemq.client.mqtt.datatypes.MqttQos;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import com.hivemq.client2.mqtt.datatypes.MqttQos;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
 
 import java.util.concurrent.TimeUnit;
 

examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java renamed to examples/src/main/java/com/hivemq/client2/mqtt/examples/Mqtt5Features.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.hivemq.client.mqtt.examples;
-
-import com.hivemq.client.mqtt.MqttGlobalPublishFilter;
-import com.hivemq.client.mqtt.datatypes.MqttQos;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
-import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck;
-import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode;
-import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling;
-import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck;
+package com.hivemq.client2.mqtt.examples;
+
+import com.hivemq.client2.mqtt.MqttGlobalPublishFilter;
+import com.hivemq.client2.mqtt.datatypes.MqttQos;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
+import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck;
+import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode;
+import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling;
+import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck;
 
 import java.util.concurrent.CountDownLatch;
 

examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java renamed to examples/src/main/java/com/hivemq/client2/mqtt/examples/ReconnectStrategy.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hivemq.client.mqtt.examples;
+package com.hivemq.client2.mqtt.examples;
 
-import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
-import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
+import com.hivemq.client2.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext;
 
 import java.time.LocalTime;
 import java.util.concurrent.CompletableFuture;

examples/src/main/java/com/hivemq/client/mqtt/examples/RequestResponse.java renamed to examples/src/main/java/com/hivemq/client2/mqtt/examples/RequestResponse.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hivemq.client.mqtt.examples;
+package com.hivemq.client2.mqtt.examples;
 
-import com.hivemq.client.mqtt.datatypes.MqttQos;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
-import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
+import com.hivemq.client2.mqtt.datatypes.MqttQos;
+import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
+import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish;
 
 /**
  * Shows how to implement a request/response pattern using response topic and correlation data.

gradle/japicc.gradle.kts

@@ -189,7 +189,7 @@ allprojects {
                         val command = listOf(
                                 "perl", bin.resolve("japi-compliance-checker.pl").path,
                                 "-lib", artifactId,
-                                "-skip-internal-packages", "com.hivemq.client.internal",
+                                "-skip-internal-packages", "com.hivemq.client2.internal",
                                 "-non-impl", nonImplFile.path,
                                 "-check-annotations", "-s",
                                 prevJar.path, jar.path)

proxy/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 description = "Adds dependencies for the HiveMQ MQTT Client proxy module"
 
 metadata {
-    moduleName.set("com.hivemq.client.mqtt.proxy")
+    moduleName.set("com.hivemq.client2.mqtt.proxy")
     readableName.set("HiveMQ MQTT Client proxy module")
 }