diff --git a/distributed-caching/README.md b/distributed-caching/README.md index 8e1c4f09..473fdfc8 100644 --- a/distributed-caching/README.md +++ b/distributed-caching/README.md @@ -23,7 +23,7 @@ $ mvn clean package Setup the necessary environment variables: ```console -$ export DEBEZIUM_VERSION=2.1 +$ export DEBEZIUM_VERSION=2.3 ``` The `DEBEZIUM_VERSION` specifies which version of Debezium artifacts should be used. diff --git a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/facade/KafkaEventConsumer.java b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/facade/KafkaEventConsumer.java index 89163412..397dbe40 100644 --- a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/facade/KafkaEventConsumer.java +++ b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/facade/KafkaEventConsumer.java @@ -15,8 +15,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.infinispan.client.hotrod.RemoteCache; diff --git a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/TopologyProducer.java b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/TopologyProducer.java index 8a25f813..59f6641c 100644 --- a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/TopologyProducer.java +++ b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/TopologyProducer.java @@ -1,9 +1,14 @@ +/* + * Copyright Debezium Authors. + * + * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 + */ package io.debezium.examples.caching.cacheupdater.streams; import java.util.Collections; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.serialization.Serdes; diff --git a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderLineAndPurchaseOrder.java b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderLineAndPurchaseOrder.java index 91216c60..37c1c97f 100644 --- a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderLineAndPurchaseOrder.java +++ b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderLineAndPurchaseOrder.java @@ -1,3 +1,8 @@ +/* + * Copyright Debezium Authors. + * + * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 + */ package io.debezium.examples.caching.cacheupdater.streams.model; public class OrderLineAndPurchaseOrder { diff --git a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderWithLines.java b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderWithLines.java index 2cb201c2..2fc16873 100644 --- a/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderWithLines.java +++ b/distributed-caching/cache-update-service/src/main/java/io/debezium/examples/caching/cacheupdater/streams/model/OrderWithLines.java @@ -1,3 +1,8 @@ +/* + * Copyright Debezium Authors. + * + * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 + */ package io.debezium.examples.caching.cacheupdater.streams.model; import java.util.ArrayList; diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/OrderLine.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/OrderLine.java index d4cb1430..ed90c18c 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/OrderLine.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/OrderLine.java @@ -8,16 +8,17 @@ import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; + import java.math.BigDecimal; /** diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/PurchaseOrder.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/PurchaseOrder.java index b6f56d8c..d0463988 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/PurchaseOrder.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/model/PurchaseOrder.java @@ -10,15 +10,15 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Version; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/OrderResource.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/OrderResource.java index 4bad2c4f..a146fab6 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/OrderResource.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/OrderResource.java @@ -5,15 +5,15 @@ */ package io.debezium.examples.caching.order.rest; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/RestApplication.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/RestApplication.java index e2d73553..02fee9d8 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/RestApplication.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/RestApplication.java @@ -5,8 +5,8 @@ */ package io.debezium.examples.caching.order.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * Defines the application path for the Order Service rest application. diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/EntityNotFoundMapper.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/EntityNotFoundMapper.java index 7989b5e1..d30164b5 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/EntityNotFoundMapper.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/EntityNotFoundMapper.java @@ -5,9 +5,9 @@ */ package io.debezium.examples.caching.order.rest.util; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.debezium.examples.caching.commons.EntityNotFoundException; diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/JacksonProducer.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/JacksonProducer.java index 74186400..6008b1d8 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/JacksonProducer.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/JacksonProducer.java @@ -4,10 +4,11 @@ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ package io.debezium.examples.caching.order.rest.util; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; + +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/OptimisticLockMapper.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/OptimisticLockMapper.java index a1bd074d..9a6b6d4a 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/OptimisticLockMapper.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/rest/util/OptimisticLockMapper.java @@ -5,10 +5,10 @@ */ package io.debezium.examples.caching.order.rest.util; -import javax.persistence.OptimisticLockException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.persistence.OptimisticLockException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.debezium.examples.caching.commons.EntityNotFoundException; diff --git a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/service/OrderService.java b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/service/OrderService.java index 99a6f790..5eb6ceaf 100644 --- a/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/service/OrderService.java +++ b/distributed-caching/order-service/src/main/java/io/debezium/examples/caching/order/service/OrderService.java @@ -7,13 +7,13 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import org.infinispan.client.hotrod.RemoteCache; diff --git a/distributed-caching/pom.xml b/distributed-caching/pom.xml index 7903dff3..8258e947 100644 --- a/distributed-caching/pom.xml +++ b/distributed-caching/pom.xml @@ -13,9 +13,9 @@ UTF-8 quarkus-bom io.quarkus.platform - 2.16.5.Final - 2.22.0 - 2.1.3.Final + 3.2.3.Final + 3.0.0-M6 + 2.3.2.Final