Skip to content

Commit 44b4dbf

Browse files
SgtSilvioSgtSilvio
committed
com.hivemq.client -> com.hivemq.client2
hivemq-mqtt-client -> hivemq-mqtt-client2
1 parent d0dc865 commit 44b4dbf

File tree

705 files changed

+3857
-3857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

705 files changed

+3857
-3857
lines changed

‎README.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,18 @@ If you use Gradle, just include the following inside your `build.gradle` file.
102102

103103
```groovy
104104
dependencies {
105-
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client', version: '1.2.1'
105+
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2', version: '2.0.0'
106106
}
107107
```
108108

109109
For optional features you can choose to include additional modules:
110110

111111
```groovy
112112
dependencies {
113-
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-websocket', version: '1.2.1'
114-
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-proxy', version: '1.2.1'
115-
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-epoll', version: '1.2.1'
116-
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-reactor', version: '1.2.1'
113+
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-websocket', version: '2.0.0'
114+
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-proxy', version: '2.0.0'
115+
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-epoll', version: '2.0.0'
116+
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-reactor', version: '2.0.0'
117117
}
118118
```
119119

@@ -127,8 +127,8 @@ If you use Maven, just include the following inside your `pom.xml` file.
127127
<dependencies>
128128
<dependency>
129129
<groupId>com.hivemq</groupId>
130-
<artifactId>hivemq-mqtt-client</artifactId>
131-
<version>1.2.1</version>
130+
<artifactId>hivemq-mqtt-client2</artifactId>
131+
<version>2.0.0</version>
132132
</dependency>
133133
</dependencies>
134134
...
@@ -156,32 +156,32 @@ For optional features you can choose to include additional modules:
156156
<dependencies>
157157
<dependency>
158158
<groupId>com.hivemq</groupId>
159-
<artifactId>hivemq-mqtt-client-websocket</artifactId>
160-
<version>1.2.1</version>
159+
<artifactId>hivemq-mqtt-client2-websocket</artifactId>
160+
<version>2.0.0</version>
161161
<type>pom</type>
162162
</dependency>
163163
</dependencies>
164164
<dependencies>
165165
<dependency>
166166
<groupId>com.hivemq</groupId>
167-
<artifactId>hivemq-mqtt-client-proxy</artifactId>
168-
<version>1.2.1</version>
167+
<artifactId>hivemq-mqtt-client2-proxy</artifactId>
168+
<version>2.0.0</version>
169169
<type>pom</type>
170170
</dependency>
171171
</dependencies>
172172
<dependencies>
173173
<dependency>
174174
<groupId>com.hivemq</groupId>
175-
<artifactId>hivemq-mqtt-client-epoll</artifactId>
176-
<version>1.2.1</version>
175+
<artifactId>hivemq-mqtt-client2-epoll</artifactId>
176+
<version>2.0.0</version>
177177
<type>pom</type>
178178
</dependency>
179179
</dependencies>
180180
<dependencies>
181181
<dependency>
182182
<groupId>com.hivemq</groupId>
183-
<artifactId>hivemq-mqtt-client-reactor</artifactId>
184-
<version>1.2.1</version>
183+
<artifactId>hivemq-mqtt-client2-reactor</artifactId>
184+
<version>2.0.0</version>
185185
</dependency>
186186
</dependencies>
187187
...
@@ -199,7 +199,7 @@ To use the shaded version just append `-shaded` to the artifact name.
199199

200200
```groovy
201201
dependencies {
202-
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-shaded', version: '1.2.1'
202+
implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-shaded', version: '2.0.0'
203203
}
204204
```
205205

@@ -211,8 +211,8 @@ dependencies {
211211
<dependencies>
212212
<dependency>
213213
<groupId>com.hivemq</groupId>
214-
<artifactId>hivemq-mqtt-client-shaded</artifactId>
215-
<version>1.2.1</version>
214+
<artifactId>hivemq-mqtt-client2-shaded</artifactId>
215+
<version>2.0.0</version>
216216
</dependency>
217217
</dependencies>
218218
...
@@ -232,13 +232,13 @@ repositories {
232232
}
233233
234234
dependencies {
235-
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client:develop-SNAPSHOT'
235+
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2:develop-SNAPSHOT'
236236
237237
// snapshots for optional modules
238-
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-websocket:develop-SNAPSHOT'
239-
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-proxy:develop-SNAPSHOT'
240-
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-epoll:develop-SNAPSHOT'
241-
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-reactor:develop-SNAPSHOT'
238+
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-websocket:develop-SNAPSHOT'
239+
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-proxy:develop-SNAPSHOT'
240+
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-epoll:develop-SNAPSHOT'
241+
implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-reactor:develop-SNAPSHOT'
242242
}
243243
```
244244

@@ -257,7 +257,7 @@ dependencies {
257257
<dependencies>
258258
<dependency>
259259
<groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
260-
<artifactId>hivemq-mqtt-client</artifactId>
260+
<artifactId>hivemq-mqtt-client2</artifactId>
261261
<version>develop-SNAPSHOT</version>
262262
</dependency>
263263
</dependencies>
@@ -266,39 +266,39 @@ dependencies {
266266
<dependencies>
267267
<dependency>
268268
<groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
269-
<artifactId>hivemq-mqtt-client-websocket</artifactId>
269+
<artifactId>hivemq-mqtt-client2-websocket</artifactId>
270270
<version>develop-SNAPSHOT</version>
271271
<type>pom</type>
272272
</dependency>
273273
</dependencies>
274274
<dependencies>
275275
<dependency>
276276
<groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
277-
<artifactId>hivemq-mqtt-client-proxy</artifactId>
277+
<artifactId>hivemq-mqtt-client2-proxy</artifactId>
278278
<version>develop-SNAPSHOT</version>
279279
<type>pom</type>
280280
</dependency>
281281
</dependencies>
282282
<dependencies>
283283
<dependency>
284284
<groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
285-
<artifactId>hivemq-mqtt-client-epoll</artifactId>
285+
<artifactId>hivemq-mqtt-client2-epoll</artifactId>
286286
<version>develop-SNAPSHOT</version>
287287
<type>pom</type>
288288
</dependency>
289289
</dependencies>
290290
<dependencies>
291291
<dependency>
292292
<groupId>com.github.hivemq.hivemq-mqtt-client</groupId>
293-
<artifactId>hivemq-mqtt-client-reactor</artifactId>
293+
<artifactId>hivemq-mqtt-client2-reactor</artifactId>
294294
<version>develop-SNAPSHOT</version>
295295
</dependency>
296296
</dependencies>
297297
...
298298
</project>
299299
```
300300

301-
Change the artifact name to `hivemq-mqtt-client-shaded` to get snapshots of the shaded version.
301+
Change the artifact name to `hivemq-mqtt-client2-shaded` to get snapshots of the shaded version.
302302

303303
JitPack works for all branches and also specific commits.
304304
Just specify `<branch>-SNAPSHOT` or the first 10 digits of the commit id in the version.
@@ -735,7 +735,7 @@ API but return `Completable`.
735735

736736
[Semantic Versioning](https://semver.org/) is used.
737737

738-
All code inside `com.hivemq.client.internal` packages must not be used directly. It can change at any time and is not
738+
All code inside `com.hivemq.client2.internal` packages must not be used directly. It can change at any time and is not
739739
part of the public API.
740740

741741
Interfaces annotated with `DoNotImplement` must not be implemented. The implementation is provided by the library.

‎build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ allprojects {
2525
plugins.apply("com.github.sgtsilvio.gradle.metadata")
2626

2727
metadata {
28-
moduleName.set("com.hivemq.client.mqtt")
28+
moduleName.set("com.hivemq.client2.mqtt")
2929
readableName.set("HiveMQ MQTT Client")
3030
organization {
3131
name.set("HiveMQ and the HiveMQ Community")
@@ -166,10 +166,10 @@ allprojects {
166166
tasks.jar {
167167
withConvention(aQute.bnd.gradle.BundleTaskConvention::class) {
168168
bnd("Export-Package: " +
169-
"com.hivemq.client.annotations.*," +
170-
"com.hivemq.client.mqtt.*," +
171-
"com.hivemq.client.rx.*," +
172-
"com.hivemq.client.util.*")
169+
"com.hivemq.client2.annotations.*," +
170+
"com.hivemq.client2.mqtt.*," +
171+
"com.hivemq.client2.rx.*," +
172+
"com.hivemq.client2.util.*")
173173
}
174174
}
175175

@@ -186,7 +186,7 @@ tasks.shadowJar {
186186
}
187187
})
188188

189-
val shadePrefix = "com.hivemq.client.internal.shaded."
189+
val shadePrefix = "com.hivemq.client2.internal.shaded."
190190
val shadeFilePrefix = shadePrefix.replace(".", "_")
191191
relocate("io.netty", "${shadePrefix}io.netty")
192192
relocate("META-INF/native/libnetty", "META-INF/native/lib${shadeFilePrefix}netty")

‎epoll/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
description = "Adds dependencies for the HiveMQ MQTT Client epoll module"
99

1010
metadata {
11-
moduleName.set("com.hivemq.client.mqtt.epoll")
11+
moduleName.set("com.hivemq.client2.mqtt.epoll")
1212
readableName.set("HiveMQ MQTT Client epoll module")
1313
}
1414

‎examples/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
description = "Examples using the HiveMQ MQTT Client"
99

1010
metadata {
11-
moduleName.set("com.hivemq.client.mqtt.examples")
11+
moduleName.set("com.hivemq.client2.mqtt.examples")
1212
readableName.set("HiveMQ MQTT Client examples")
1313
}
1414

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.hivemq.client.mqtt.examples;
17+
package com.hivemq.client2.mqtt.examples;
1818

19-
import com.hivemq.client.mqtt.datatypes.MqttQos;
20-
import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
21-
import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
19+
import com.hivemq.client2.mqtt.datatypes.MqttQos;
20+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient;
21+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
2222

2323
import java.util.concurrent.TimeUnit;
2424

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.hivemq.client.mqtt.examples;
18-
19-
import com.hivemq.client.mqtt.MqttGlobalPublishFilter;
20-
import com.hivemq.client.mqtt.datatypes.MqttQos;
21-
import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
22-
import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
23-
import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
24-
import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck;
25-
import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode;
26-
import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling;
27-
import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck;
17+
package com.hivemq.client2.mqtt.examples;
18+
19+
import com.hivemq.client2.mqtt.MqttGlobalPublishFilter;
20+
import com.hivemq.client2.mqtt.datatypes.MqttQos;
21+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient;
22+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient;
23+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
24+
import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck;
25+
import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode;
26+
import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling;
27+
import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck;
2828

2929
import java.util.concurrent.CountDownLatch;
3030

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.hivemq.client.mqtt.examples;
17+
package com.hivemq.client2.mqtt.examples;
1818

19-
import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
20-
import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
21-
import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext;
19+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient;
20+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
21+
import com.hivemq.client2.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext;
2222

2323
import java.time.LocalTime;
2424
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.hivemq.client.mqtt.examples;
17+
package com.hivemq.client2.mqtt.examples;
1818

19-
import com.hivemq.client.mqtt.datatypes.MqttQos;
20-
import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
21-
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
19+
import com.hivemq.client2.mqtt.datatypes.MqttQos;
20+
import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client;
21+
import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish;
2222

2323
/**
2424
* Shows how to implement a request/response pattern using response topic and correlation data.

‎gradle/japicc.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ allprojects {
189189
val command = listOf(
190190
"perl", bin.resolve("japi-compliance-checker.pl").path,
191191
"-lib", artifactId,
192-
"-skip-internal-packages", "com.hivemq.client.internal",
192+
"-skip-internal-packages", "com.hivemq.client2.internal",
193193
"-non-impl", nonImplFile.path,
194194
"-check-annotations", "-s",
195195
prevJar.path, jar.path)

‎proxy/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
description = "Adds dependencies for the HiveMQ MQTT Client proxy module"
99

1010
metadata {
11-
moduleName.set("com.hivemq.client.mqtt.proxy")
11+
moduleName.set("com.hivemq.client2.mqtt.proxy")
1212
readableName.set("HiveMQ MQTT Client proxy module")
1313
}
1414

0 commit comments

Comments
 (0)