diff --git a/auditlog/log-enricher/pom.xml b/auditlog/log-enricher/pom.xml index 86cd7252..a399a7a7 100644 --- a/auditlog/log-enricher/pom.xml +++ b/auditlog/log-enricher/pom.xml @@ -13,16 +13,13 @@ io.debezium.demos.auditing auditing-log-enricher 1.0-SNAPSHOT - - 1.8 - 1.8 - + io.quarkus quarkus-bom - ${version.quarkus1} + ${version.quarkus.latest} pom import @@ -57,7 +54,7 @@ io.quarkus quarkus-maven-plugin - ${version.quarkus1} + ${version.quarkus.latest} @@ -89,7 +86,7 @@ io.quarkus quarkus-maven-plugin - ${version.quarkus1} + ${version.quarkus.latest} diff --git a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/BufferOffsets.java b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/BufferOffsets.java index e9f14d66..9c9cd640 100644 --- a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/BufferOffsets.java +++ b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/BufferOffsets.java @@ -1,7 +1,7 @@ package io.debezium.demos.auditing.enricher; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; /** * Keeps track of the position within the key/value state store that is used as diff --git a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/ChangeEventEnricher.java b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/ChangeEventEnricher.java index 962f185f..73214298 100644 --- a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/ChangeEventEnricher.java +++ b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/ChangeEventEnricher.java @@ -4,8 +4,8 @@ import java.util.Arrays; import java.util.Optional; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.apache.kafka.streams.KeyValue; import org.apache.kafka.streams.kstream.Transformer; diff --git a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/JsonObjectSerde.java b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/JsonObjectSerde.java index 92c03ba6..aa3bfc11 100644 --- a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/JsonObjectSerde.java +++ b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/JsonObjectSerde.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.util.Map; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; diff --git a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/TopologyProducer.java b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/TopologyProducer.java index 9154948d..4665671a 100644 --- a/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/TopologyProducer.java +++ b/auditlog/log-enricher/src/main/java/io/debezium/demos/auditing/enricher/TopologyProducer.java @@ -1,8 +1,8 @@ package io.debezium.demos.auditing.enricher; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.json.JsonObject; import org.apache.kafka.common.serialization.Serdes; import org.apache.kafka.streams.StreamsBuilder; diff --git a/auditlog/vegetables-service/pom.xml b/auditlog/vegetables-service/pom.xml index eb83ae3a..63614e7b 100644 --- a/auditlog/vegetables-service/pom.xml +++ b/auditlog/vegetables-service/pom.xml @@ -13,16 +13,13 @@ io.debezium.demos.auditing auditing-vegetables-service 1.0-SNAPSHOT - - 1.8 - 1.8 - + io.quarkus quarkus-bom - ${version.quarkus1} + ${version.quarkus.latest} pom import @@ -73,7 +70,7 @@ io.quarkus quarkus-maven-plugin - ${version.quarkus1} + ${version.quarkus.latest} @@ -105,7 +102,7 @@ io.quarkus quarkus-maven-plugin - ${version.quarkus1} + ${version.quarkus.latest} diff --git a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/model/Vegetable.java b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/model/Vegetable.java index 564b6f97..0c0c65c6 100644 --- a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/model/Vegetable.java +++ b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/model/Vegetable.java @@ -1,10 +1,10 @@ package io.debezium.demos.auditing.vegetables.model; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity public class Vegetable { diff --git a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/VegetableResource.java b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/VegetableResource.java index 8bdfd870..9bd940c0 100644 --- a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/VegetableResource.java +++ b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/VegetableResource.java @@ -1,18 +1,18 @@ package io.debezium.demos.auditing.vegetables.rest; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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 javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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 jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/util/ErrorMapper.java b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/util/ErrorMapper.java index 74115587..fc5a20c5 100644 --- a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/util/ErrorMapper.java +++ b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/rest/util/ErrorMapper.java @@ -1,11 +1,11 @@ package io.debezium.demos.auditing.vegetables.rest.util; -import javax.json.Json; -import javax.persistence.EntityNotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.json.Json; +import jakarta.persistence.EntityNotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class ErrorMapper implements ExceptionMapper { diff --git a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/service/VegetableService.java b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/service/VegetableService.java index 47dc696c..6b66827e 100644 --- a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/service/VegetableService.java +++ b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/service/VegetableService.java @@ -1,8 +1,8 @@ package io.debezium.demos.auditing.vegetables.service; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import io.debezium.demos.auditing.vegetables.model.Vegetable; diff --git a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/Audited.java b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/Audited.java index 680fccc6..70718c3b 100644 --- a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/Audited.java +++ b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/Audited.java @@ -7,8 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target({METHOD, TYPE}) diff --git a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionContextData.java b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionContextData.java index 514d8589..252e5163 100644 --- a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionContextData.java +++ b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionContextData.java @@ -2,10 +2,10 @@ import java.time.ZonedDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name="transaction_context_data") diff --git a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionInterceptor.java b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionInterceptor.java index bd647dd9..774a13b5 100644 --- a/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionInterceptor.java +++ b/auditlog/vegetables-service/src/main/java/io/debezium/demos/auditing/vegetables/transactioncontext/TransactionInterceptor.java @@ -4,14 +4,14 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.persistence.EntityManager; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.persistence.EntityManager; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/auditlog/vegetables-service/src/main/resources/application.properties b/auditlog/vegetables-service/src/main/resources/application.properties index 0703c7bc..fc5657f7 100644 --- a/auditlog/vegetables-service/src/main/resources/application.properties +++ b/auditlog/vegetables-service/src/main/resources/application.properties @@ -1,12 +1,11 @@ mp.jwt.verify.issuer=farmshop mp.jwt.verify.publickey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjYWJ6Zt9Jo9dxVuMglo0rYN4vBV0T7AP+qD/aI7tTrus6ZMvTi/+JKlNpEAS0b6yasYjxuKmh3eYT0PbGmGERr07VDsVcV/iezl9pj+fceY4lebrExS36yGQJs6BUXYF4P8ynmvnKC40AuyxKFgb3T08h1jxoBsBKlPfAT620ZP1vwgGwZB7iAfzdNYtt3z2NtkyPMaD1mHU6rxewjVN9XVSSSPKO8nFPTYsm1i4ePohgWr9bxwFHkXzyk7DnpUBMZzlVUUXVPuEpkVCqnWZTslMw/pgsyXPw1pmV76rVwhI0Ay4XohPW2QvDoPKHhuiQtcNrfL++iEFG8A9hh1K3QIDAQAB -quarkus.datasource.url=jdbc:postgresql://localhost:5432/vegetablesdb?currentSchema=inventory -quarkus.datasource.driver=org.postgresql.Driver +quarkus.datasource.db-kind=postgresql +quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/vegetablesdb?currentSchema=inventory +quarkus.datasource.jdbc.driver=org.postgresql.Driver quarkus.datasource.username=postgresuser quarkus.datasource.password=postgrespw -quarkus.datasource.max-size=8 -quarkus.datasource.min-size=2 quarkus.hibernate-orm.database.generation=drop-and-create quarkus.hibernate-orm.log.sql=true quarkus.hibernate-orm.jdbc.timezone=UTC diff --git a/debezium-examples-parent/pom.xml b/debezium-examples-parent/pom.xml index 43d1cdb3..96cbef01 100644 --- a/debezium-examples-parent/pom.xml +++ b/debezium-examples-parent/pom.xml @@ -98,9 +98,10 @@ 2.1.3.Final + + 1.9.2.Final + - - 1.4.2.Final 2.7.2.Final