From d7d34c4443234c034b0c2fed9dc74239d8b8ed2b Mon Sep 17 00:00:00 2001 From: Chris Cranford Date: Mon, 20 Feb 2023 13:38:20 -0500 Subject: [PATCH] DBZ-6129 Upgrade to Quarkus 3.0.0.Alpha4 Quarkus 3 now includes Jakarta EE which replaces the old Java EE classes that were found within the `javax.*` package and are now in `jakarta.*`. --- debezium-parent/pom.xml | 2 +- .../outbox/quarkus/deployment/OutboxCommonProcessor.java | 6 +++--- .../internal/AdditionalJaxbMappingProducerImpl.java | 6 +++--- .../quarkus/internal/JsonNodeAttributeConverter.java | 2 +- .../io/debezium/outbox/reactive/quarkus/it/MyService.java | 4 ++-- .../debezium/outbox/reactive/quarkus/it/TestEntity.java | 6 +++--- .../reactive/quarkus/it/UpperCaseAttributeConverter.java | 2 +- .../outbox/reactive/quarkus/it/AbstractOutboxTest.java | 2 +- .../debezium/outbox/reactive/quarkus/it/OutboxTest.java | 2 +- .../quarkus/internal/AbstractEventDispatcher.java | 2 +- .../reactive/quarkus/internal/DebeziumOutboxHandler.java | 4 ++-- .../quarkus/internal/DebeziumTracerEventDispatcher.java | 4 ++-- .../reactive/quarkus/internal/DefaultEventDispatcher.java | 2 +- .../java/io/debezium/outbox/quarkus/it/MyService.java | 8 ++++---- .../java/io/debezium/outbox/quarkus/it/TestEntity.java | 6 +++--- .../outbox/quarkus/it/UpperCaseAttributeConverter.java | 2 +- .../io/debezium/outbox/quarkus/it/AbstractOutboxTest.java | 4 ++-- .../java/io/debezium/outbox/quarkus/it/OutboxTest.java | 4 ++-- .../outbox/quarkus/internal/AbstractEventDispatcher.java | 4 ++-- .../quarkus/internal/DebeziumTracerEventDispatcher.java | 6 +++--- .../outbox/quarkus/internal/DefaultEventDispatcher.java | 4 ++-- .../debezium/outbox/quarkus/internal/EventDispatcher.java | 2 +- pom.xml | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) diff --git a/debezium-parent/pom.xml b/debezium-parent/pom.xml index dda06d846..bcf61719b 100644 --- a/debezium-parent/pom.xml +++ b/debezium-parent/pom.xml @@ -115,7 +115,7 @@ impsort-maven-plugin ${version.impsort} - java.,javax.,org.,com.,io. + java.,jakarta.,javax.,org.,com.,io. * false ${format.skip} diff --git a/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java b/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java index 90469bc6e..32f3b8b45 100644 --- a/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java +++ b/debezium-quarkus-outbox-common/deployment/src/main/java/io/debezium/outbox/quarkus/deployment/OutboxCommonProcessor.java @@ -12,9 +12,9 @@ import java.io.PrintWriter; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping; import org.jboss.jandex.ClassInfo; diff --git a/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java index bc5311886..a64bdc237 100644 --- a/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java +++ b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AdditionalJaxbMappingProducerImpl.java @@ -22,9 +22,9 @@ import java.util.Collection; import java.util.Collections; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.hibernate.boot.jaxb.Origin; import org.hibernate.boot.jaxb.SourceType; diff --git a/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java index 0123e777a..496e9d25b 100644 --- a/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java +++ b/debezium-quarkus-outbox-common/runtime/src/main/java/io/debezium/outbox/quarkus/internal/JsonNodeAttributeConverter.java @@ -7,7 +7,7 @@ import java.io.IOException; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.HibernateException; diff --git a/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/MyService.java b/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/MyService.java index d34a57ddf..68025ff65 100644 --- a/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/MyService.java +++ b/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/MyService.java @@ -8,8 +8,8 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.debezium.outbox.reactive.quarkus.internal.DebeziumOutboxHandler; import io.smallrye.mutiny.Uni; diff --git a/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/TestEntity.java b/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/TestEntity.java index 3eecf935e..7b911a738 100644 --- a/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/TestEntity.java +++ b/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/TestEntity.java @@ -5,9 +5,9 @@ */ package io.debezium.outbox.reactive.quarkus.it; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * This entity class is merely a placeholder to address two concerns: diff --git a/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/UpperCaseAttributeConverter.java b/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/UpperCaseAttributeConverter.java index eb0afaf84..fa038fe0b 100644 --- a/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/UpperCaseAttributeConverter.java +++ b/debezium-quarkus-outbox-reactive/integration-tests/src/main/java/io/debezium/outbox/reactive/quarkus/it/UpperCaseAttributeConverter.java @@ -7,7 +7,7 @@ import java.util.Locale; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * An {@link AttributeConverter} that converters the input string to upper-case at persistence time diff --git a/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/AbstractOutboxTest.java b/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/AbstractOutboxTest.java index 719c38e87..aebc049f6 100644 --- a/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/AbstractOutboxTest.java +++ b/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/AbstractOutboxTest.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.metamodel.spi.MetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; diff --git a/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/OutboxTest.java b/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/OutboxTest.java index c94b8584b..eb8771071 100644 --- a/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/OutboxTest.java +++ b/debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/OutboxTest.java @@ -13,7 +13,7 @@ import java.time.Instant; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.reactive.mutiny.Mutiny; import org.junit.jupiter.api.Test; diff --git a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/AbstractEventDispatcher.java b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/AbstractEventDispatcher.java index aa18a2c7f..f0ecc4305 100644 --- a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/AbstractEventDispatcher.java +++ b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/AbstractEventDispatcher.java @@ -9,7 +9,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.reactive.mutiny.Mutiny; import org.hibernate.tuple.DynamicMapInstantiator; diff --git a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumOutboxHandler.java b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumOutboxHandler.java index d62f8d66e..de4cbea2c 100644 --- a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumOutboxHandler.java +++ b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumOutboxHandler.java @@ -5,8 +5,8 @@ */ package io.debezium.outbox.reactive.quarkus.internal; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.debezium.outbox.quarkus.ExportedEvent; import io.debezium.outbox.reactive.quarkus.DebeziumCustomCodec; diff --git a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumTracerEventDispatcher.java b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumTracerEventDispatcher.java index d5aba17d1..b5ef53af8 100644 --- a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumTracerEventDispatcher.java +++ b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DebeziumTracerEventDispatcher.java @@ -7,8 +7,8 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DefaultEventDispatcher.java b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DefaultEventDispatcher.java index f53d6e584..c90eea29c 100644 --- a/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DefaultEventDispatcher.java +++ b/debezium-quarkus-outbox-reactive/runtime/src/main/java/io/debezium/outbox/reactive/quarkus/internal/DefaultEventDispatcher.java @@ -5,7 +5,7 @@ */ package io.debezium.outbox.reactive.quarkus.internal; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/MyService.java b/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/MyService.java index be054b22a..d1519a0ba 100644 --- a/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/MyService.java +++ b/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/MyService.java @@ -8,10 +8,10 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import io.debezium.outbox.quarkus.ExportedEvent; diff --git a/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/TestEntity.java b/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/TestEntity.java index 9ea28ae50..39f1c5886 100644 --- a/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/TestEntity.java +++ b/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/TestEntity.java @@ -5,9 +5,9 @@ */ package io.debezium.outbox.quarkus.it; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * This entity class is merely a placeholder to address two concerns: diff --git a/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/UpperCaseAttributeConverter.java b/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/UpperCaseAttributeConverter.java index fa06150ad..da118aaa1 100644 --- a/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/UpperCaseAttributeConverter.java +++ b/debezium-quarkus-outbox/integration-tests/src/main/java/io/debezium/outbox/quarkus/it/UpperCaseAttributeConverter.java @@ -7,7 +7,7 @@ import java.util.Locale; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * An {@link AttributeConverter} that converters the input string to upper-case at persistence time diff --git a/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/AbstractOutboxTest.java b/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/AbstractOutboxTest.java index a19e22d5f..124cf80e3 100644 --- a/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/AbstractOutboxTest.java +++ b/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/AbstractOutboxTest.java @@ -13,8 +13,8 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.metamodel.spi.MetamodelImplementor; diff --git a/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/OutboxTest.java b/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/OutboxTest.java index 4cc411e64..04f2a9ece 100644 --- a/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/OutboxTest.java +++ b/debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/OutboxTest.java @@ -12,8 +12,8 @@ import java.time.Instant; import java.util.Map; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; diff --git a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventDispatcher.java b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventDispatcher.java index ebf09e516..28d5e2624 100644 --- a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventDispatcher.java +++ b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/AbstractEventDispatcher.java @@ -9,8 +9,8 @@ import java.util.Map; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.hibernate.Session; diff --git a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTracerEventDispatcher.java b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTracerEventDispatcher.java index e186c52e4..568395ff4 100644 --- a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTracerEventDispatcher.java +++ b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DebeziumTracerEventDispatcher.java @@ -7,9 +7,9 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DefaultEventDispatcher.java b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DefaultEventDispatcher.java index 6faae9c92..69c0d8c55 100644 --- a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DefaultEventDispatcher.java +++ b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/DefaultEventDispatcher.java @@ -5,8 +5,8 @@ */ package io.debezium.outbox.quarkus.internal; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/EventDispatcher.java b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/EventDispatcher.java index d3e2054a5..0230f14ec 100644 --- a/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/EventDispatcher.java +++ b/debezium-quarkus-outbox/runtime/src/main/java/io/debezium/outbox/quarkus/internal/EventDispatcher.java @@ -5,7 +5,7 @@ */ package io.debezium.outbox.quarkus.internal; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.debezium.outbox.quarkus.ExportedEvent; diff --git a/pom.xml b/pom.xml index 54e49c4a2..24eb2ad13 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ - 2.16.3.Final + 3.0.0.Alpha4 2.4.1.Final