Skip to content

Commit 87708cd

Browse files
mario-schwede-hivemqhlohse
mario-schwede-hivemq
authored and
hlohse
committed
Migrate to Jakarta XML binding
1 parent b1ad275 commit 87708cd

40 files changed

+150
-170
lines changed

‎gradle/libs.versions.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jackson = "2.18.3"
1616
jacoco = "0.8.7"
1717
javassist = "3.30.2-GA"
1818
javax-annotation-api = "1.3.2"
19-
jaxb-api = "2.3.3"
20-
jaxb-impl = "2.3.9"
19+
jaxb-api = "4.0.2"
20+
jaxb-impl = "4.0.5"
2121
jctools = "4.0.5"
2222
junit = "4.13.2"
2323
kotlin = "1.9.25"
@@ -54,7 +54,7 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", ver
5454
javassist = { module = "org.javassist:javassist", version.ref = "javassist" }
5555
javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation-api" }
5656
jaxb-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jaxb-api" }
57-
jaxb-impl = { module = "com.sun.xml.bind:jaxb-impl", version.ref = "jaxb-impl" }
57+
jaxb-impl = { module = "org.glassfish.jaxb:jaxb-runtime", version.ref = "jaxb-impl" }
5858
jctools = { module = "org.jctools:jctools-core", version.ref = "jctools" }
5959
julToSlf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
6060
junit = { module = "junit:junit", version.ref = "junit" }

‎src/main/java/com/hivemq/configuration/entity/DisabledEntity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package com.hivemq.configuration.entity;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlElement;
2121

2222
/**
2323
* @author Florian Limpöck

‎src/main/java/com/hivemq/configuration/entity/EnabledEntity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package com.hivemq.configuration.entity;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlElement;
2121

2222
/**
2323
* @author Florian Limpöck

‎src/main/java/com/hivemq/configuration/entity/HiveMQConfigEntity.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import com.hivemq.configuration.entity.listener.ListenerEntity;
1919
import com.hivemq.extension.sdk.api.annotations.NotNull;
20+
import jakarta.xml.bind.annotation.XmlAccessType;
21+
import jakarta.xml.bind.annotation.XmlAccessorType;
22+
import jakarta.xml.bind.annotation.XmlElementRef;
23+
import jakarta.xml.bind.annotation.XmlElementWrapper;
24+
import jakarta.xml.bind.annotation.XmlRootElement;
2025

21-
import javax.xml.bind.annotation.XmlAccessType;
22-
import javax.xml.bind.annotation.XmlAccessorType;
23-
import javax.xml.bind.annotation.XmlElementRef;
24-
import javax.xml.bind.annotation.XmlElementWrapper;
25-
import javax.xml.bind.annotation.XmlRootElement;
2626
import java.util.ArrayList;
2727
import java.util.List;
2828

‎src/main/java/com/hivemq/configuration/entity/MqttConfigEntity.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@
2828
import com.hivemq.configuration.entity.mqtt.TopicAliasConfigEntity;
2929
import com.hivemq.configuration.entity.mqtt.WildcardSubscriptionsConfigEntity;
3030
import com.hivemq.extension.sdk.api.annotations.NotNull;
31-
32-
import javax.xml.bind.annotation.XmlAccessType;
33-
import javax.xml.bind.annotation.XmlAccessorType;
34-
import javax.xml.bind.annotation.XmlElementRef;
35-
import javax.xml.bind.annotation.XmlRootElement;
31+
import jakarta.xml.bind.annotation.XmlAccessType;
32+
import jakarta.xml.bind.annotation.XmlAccessorType;
33+
import jakarta.xml.bind.annotation.XmlElementRef;
34+
import jakarta.xml.bind.annotation.XmlRootElement;
3635

3736
/**
3837
* @author Dominik Obermaier

‎src/main/java/com/hivemq/configuration/entity/PersistenceEntity.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
package com.hivemq.configuration.entity;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19-
20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElement;
23-
import javax.xml.bind.annotation.XmlEnum;
24-
import javax.xml.bind.annotation.XmlEnumValue;
25-
import javax.xml.bind.annotation.XmlRootElement;
26-
import javax.xml.bind.annotation.XmlType;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElement;
22+
import jakarta.xml.bind.annotation.XmlEnum;
23+
import jakarta.xml.bind.annotation.XmlEnumValue;
24+
import jakarta.xml.bind.annotation.XmlRootElement;
25+
import jakarta.xml.bind.annotation.XmlType;
2726

2827
/**
2928
* @author Lukas Brandl

‎src/main/java/com/hivemq/configuration/entity/RestrictionsEntity.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
package com.hivemq.configuration.entity;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19-
20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElement;
23-
import javax.xml.bind.annotation.XmlRootElement;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElement;
22+
import jakarta.xml.bind.annotation.XmlRootElement;
2423

2524
import static com.hivemq.configuration.service.RestrictionsConfigurationService.INCOMING_BANDWIDTH_THROTTLING_DEFAULT;
2625
import static com.hivemq.configuration.service.RestrictionsConfigurationService.MAX_CLIENT_ID_LENGTH_DEFAULT;

‎src/main/java/com/hivemq/configuration/entity/SecurityConfigEntity.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
import com.hivemq.configuration.entity.security.RequestProblemInformationEntityConfig;
2121
import com.hivemq.configuration.entity.security.UTF8ValidationEntity;
2222
import com.hivemq.extension.sdk.api.annotations.NotNull;
23-
24-
import javax.xml.bind.annotation.XmlAccessType;
25-
import javax.xml.bind.annotation.XmlAccessorType;
26-
import javax.xml.bind.annotation.XmlElementRef;
27-
import javax.xml.bind.annotation.XmlRootElement;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlElementRef;
26+
import jakarta.xml.bind.annotation.XmlRootElement;
2827

2928
/**
3029
* @author Florian Limpöck

‎src/main/java/com/hivemq/configuration/entity/StringTrimAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.hivemq.configuration.entity;
1717

18-
import javax.xml.bind.annotation.adapters.XmlAdapter;
18+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
1919

2020
/**
2121
* @author Lukas Brandl
@@ -37,4 +37,4 @@ public String marshal(final String value) throws Exception {
3737
}
3838
return value.trim();
3939
}
40-
}
40+
}

‎src/main/java/com/hivemq/configuration/entity/UsageStatisticsEntity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package com.hivemq.configuration.entity;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlRootElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlRootElement;
2121

2222
/**
2323
* @author Christoph Schäbel

‎src/main/java/com/hivemq/configuration/entity/listener/ListenerEntity.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.annotations.Nullable;
20-
21-
import javax.xml.bind.annotation.XmlAccessType;
22-
import javax.xml.bind.annotation.XmlAccessorType;
23-
import javax.xml.bind.annotation.XmlElement;
20+
import jakarta.xml.bind.annotation.XmlAccessType;
21+
import jakarta.xml.bind.annotation.XmlAccessorType;
22+
import jakarta.xml.bind.annotation.XmlElement;
2423

2524
@XmlAccessorType(XmlAccessType.NONE)
2625
@SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
@@ -46,4 +45,4 @@ public int getPort() {
4645
public @Nullable String getName() {
4746
return name;
4847
}
49-
}
48+
}

‎src/main/java/com/hivemq/configuration/entity/listener/TCPListenerEntity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package com.hivemq.configuration.entity.listener;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlRootElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlRootElement;
2121

2222
/**
2323
* @author Dominik Obermaier

‎src/main/java/com/hivemq/configuration/entity/listener/TLSEntity.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
import com.hivemq.configuration.entity.listener.tls.TruststoreEntity;
2222
import com.hivemq.extension.sdk.api.annotations.NotNull;
2323
import com.hivemq.extension.sdk.api.annotations.Nullable;
24+
import jakarta.xml.bind.annotation.XmlAccessType;
25+
import jakarta.xml.bind.annotation.XmlAccessorType;
26+
import jakarta.xml.bind.annotation.XmlElement;
27+
import jakarta.xml.bind.annotation.XmlElementRef;
28+
import jakarta.xml.bind.annotation.XmlElementWrapper;
29+
import jakarta.xml.bind.annotation.XmlRootElement;
2430

25-
import javax.xml.bind.annotation.XmlAccessType;
26-
import javax.xml.bind.annotation.XmlAccessorType;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlElementRef;
29-
import javax.xml.bind.annotation.XmlElementWrapper;
30-
import javax.xml.bind.annotation.XmlRootElement;
3131
import java.util.ArrayList;
3232
import java.util.List;
3333

‎src/main/java/com/hivemq/configuration/entity/listener/TlsTCPListenerEntity.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
package com.hivemq.configuration.entity.listener;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19-
20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElementRef;
23-
import javax.xml.bind.annotation.XmlRootElement;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElementRef;
22+
import jakarta.xml.bind.annotation.XmlRootElement;
2423

2524
/**
2625
* @author Dominik Obermaier

‎src/main/java/com/hivemq/configuration/entity/listener/TlsWebsocketListenerEntity.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package com.hivemq.configuration.entity.listener;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElement;
22+
import jakarta.xml.bind.annotation.XmlElementRef;
23+
import jakarta.xml.bind.annotation.XmlElementWrapper;
24+
import jakarta.xml.bind.annotation.XmlRootElement;
1925

20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElement;
23-
import javax.xml.bind.annotation.XmlElementRef;
24-
import javax.xml.bind.annotation.XmlElementWrapper;
25-
import javax.xml.bind.annotation.XmlRootElement;
2626
import java.util.ArrayList;
2727
import java.util.List;
2828

‎src/main/java/com/hivemq/configuration/entity/listener/WebsocketListenerEntity.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package com.hivemq.configuration.entity.listener;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElement;
22+
import jakarta.xml.bind.annotation.XmlElementWrapper;
23+
import jakarta.xml.bind.annotation.XmlRootElement;
1924

20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElement;
23-
import javax.xml.bind.annotation.XmlElementWrapper;
24-
import javax.xml.bind.annotation.XmlRootElement;
2525
import java.util.ArrayList;
2626
import java.util.List;
2727

‎src/main/java/com/hivemq/configuration/entity/listener/tls/ClientAuthenticationModeEntity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package com.hivemq.configuration.entity.listener.tls;
1717

18-
import javax.xml.bind.annotation.XmlEnum;
19-
import javax.xml.bind.annotation.XmlEnumValue;
20-
import javax.xml.bind.annotation.XmlType;
18+
import jakarta.xml.bind.annotation.XmlEnum;
19+
import jakarta.xml.bind.annotation.XmlEnumValue;
20+
import jakarta.xml.bind.annotation.XmlType;
2121

2222
@XmlEnum
2323
@XmlType(name = "clientAuthenticationMode")

‎src/main/java/com/hivemq/configuration/entity/listener/tls/KeystoreEntity.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
package com.hivemq.configuration.entity.listener.tls;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19-
20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElement;
23-
import javax.xml.bind.annotation.XmlRootElement;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElement;
22+
import jakarta.xml.bind.annotation.XmlRootElement;
2423

2524
/**
2625
* @author Georg Held

‎src/main/java/com/hivemq/configuration/entity/listener/tls/TruststoreEntity.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
package com.hivemq.configuration.entity.listener.tls;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19-
20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElement;
23-
import javax.xml.bind.annotation.XmlRootElement;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElement;
22+
import jakarta.xml.bind.annotation.XmlRootElement;
2423

2524
/**
2625
* @author Georg Held

‎src/main/java/com/hivemq/configuration/entity/mqtt/KeepAliveConfigEntity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package com.hivemq.configuration.entity.mqtt;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlElement;
21-
import javax.xml.bind.annotation.XmlRootElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlElement;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222

2323
/**
2424
* @author Florian Limpöck

‎src/main/java/com/hivemq/configuration/entity/mqtt/MessageExpiryConfigEntity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package com.hivemq.configuration.entity.mqtt;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlElement;
21-
import javax.xml.bind.annotation.XmlRootElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlElement;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222

2323
import static com.hivemq.configuration.entity.mqtt.MqttConfigurationDefaults.MAX_EXPIRY_INTERVAL_DEFAULT;
2424

‎src/main/java/com/hivemq/configuration/entity/mqtt/PacketsConfigEntity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package com.hivemq.configuration.entity.mqtt;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlElement;
21-
import javax.xml.bind.annotation.XmlRootElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlElement;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222

2323
import static com.hivemq.mqtt.message.connack.Mqtt5CONNACK.DEFAULT_MAXIMUM_PACKET_SIZE_NO_LIMIT;
2424

‎src/main/java/com/hivemq/configuration/entity/mqtt/QoSConfigEntity.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package com.hivemq.configuration.entity.mqtt;
1717

18-
import javax.xml.bind.annotation.XmlAccessType;
19-
import javax.xml.bind.annotation.XmlAccessorType;
20-
import javax.xml.bind.annotation.XmlElement;
21-
import javax.xml.bind.annotation.XmlRootElement;
18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlElement;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222

2323
import static com.hivemq.configuration.entity.mqtt.MqttConfigurationDefaults.MAXIMUM_QOS_DEFAULT;
2424

‎src/main/java/com/hivemq/configuration/entity/mqtt/QueuedMessagesConfigEntity.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
package com.hivemq.configuration.entity.mqtt;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
19-
20-
import javax.xml.bind.annotation.XmlAccessType;
21-
import javax.xml.bind.annotation.XmlAccessorType;
22-
import javax.xml.bind.annotation.XmlElement;
23-
import javax.xml.bind.annotation.XmlEnum;
24-
import javax.xml.bind.annotation.XmlEnumValue;
25-
import javax.xml.bind.annotation.XmlRootElement;
26-
import javax.xml.bind.annotation.XmlType;
19+
import jakarta.xml.bind.annotation.XmlAccessType;
20+
import jakarta.xml.bind.annotation.XmlAccessorType;
21+
import jakarta.xml.bind.annotation.XmlElement;
22+
import jakarta.xml.bind.annotation.XmlEnum;
23+
import jakarta.xml.bind.annotation.XmlEnumValue;
24+
import jakarta.xml.bind.annotation.XmlRootElement;
25+
import jakarta.xml.bind.annotation.XmlType;
2726

2827
@XmlRootElement(name = "queued-messages")
2928
@XmlAccessorType(XmlAccessType.NONE)

0 commit comments

Comments
 (0)