From 19d34cbe4c4bed48791f49aa08ec00ef6997289c Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 20 Nov 2023 22:51:08 +0100 Subject: [PATCH] Remaining changes for renamed packages --- build.gradle.kts | 2 +- gradle/japicc.gradle.kts | 2 +- .../mqtt/client2/internal/netty/NettyEventLoopProvider.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d43422f4a..da2b0dab9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -166,7 +166,7 @@ tasks.shadowJar { } }) - val shadePrefix = "com.hivemq.client2.internal.shaded." + val shadePrefix = "com.hivemq.mqtt.client2.internal.shaded." val shadeFilePrefix = shadePrefix.replace(".", "_") relocate("io.netty", "${shadePrefix}io.netty") relocate("META-INF/native/libnetty", "META-INF/native/lib${shadeFilePrefix}netty") diff --git a/gradle/japicc.gradle.kts b/gradle/japicc.gradle.kts index 6161fecb4..a393bb4da 100644 --- a/gradle/japicc.gradle.kts +++ b/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.client2.internal", + "-skip-internal-packages", "com.hivemq.mqtt.client2.internal", "-non-impl", nonImplFile.path, "-check-annotations", "-s", prevJar.path, jar.path) diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/netty/NettyEventLoopProvider.java b/src/main/java/com/hivemq/mqtt/client2/internal/netty/NettyEventLoopProvider.java index 412e537eb..808ad2713 100644 --- a/src/main/java/com/hivemq/mqtt/client2/internal/netty/NettyEventLoopProvider.java +++ b/src/main/java/com/hivemq/mqtt/client2/internal/netty/NettyEventLoopProvider.java @@ -92,7 +92,7 @@ private NettyEventLoopProvider( if (executor == null) { eventLoopGroup = eventLoopGroupFactory.apply( threadCount, new ThreadPerTaskExecutor( - new DefaultThreadFactory("com.hivemq.client2.mqtt", Thread.MAX_PRIORITY))); + new DefaultThreadFactory("com.hivemq.mqtt.client2", Thread.MAX_PRIORITY))); } else if (executor instanceof MultithreadEventLoopGroup) { eventLoopGroup = (MultithreadEventLoopGroup) executor;