Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate from javax to jakarta namespace with Quarkus v3 #123

Merged
merged 3 commits into from
Nov 17, 2022
Merged

Migrate from javax to jakarta namespace with Quarkus v3 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a13fc2b
Migrate from javax to jakarta with Quarkus v3
JohT Nov 9, 2022
4afd3dc
Use org.axonframework jakarta modules
JohT Nov 11, 2022
2d75d1a
Remove unused dependencies
JohT Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions showcase-quarkus-eventsourcing/native-image-caller-filter-rules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{"excludeClasses": "org.locationtech.**"},
{"excludeClasses": "org.eclipse.yasson.**"},
{"excludeClasses": "javax.**"},
{"excludeClasses": "jakarta.**"},
{"excludeClasses": "com.sun.**"},
{"excludeClasses": "sun.misc.**"},
{"excludeClasses": "sun.reflect.**"},
Expand Down
23 changes: 8 additions & 15 deletions showcase-quarkus-eventsourcing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@

<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>2.14.1.Final</quarkus.platform.version>
<quarkus.plugin.version>2.14.1.Final</quarkus.plugin.version>
<quarkus.platform.version>3.0.0.Alpha1</quarkus.platform.version>
<quarkus.plugin.version>3.0.0.Alpha1</quarkus.plugin.version>
<jacc-api.version>1.6.1</jacc-api.version>

<axon.version>4.6.2</axon.version>
<dom4j.version>2.1.3</dom4j.version>
<xom.version>1.2.10</xom.version>
<reactor-core.version>3.5.0</reactor-core.version>
<xstream.version>1.4.19</xstream.version>

<archunit.version>1.0.0</archunit.version>
<equalsverifier.version>3.11</equalsverifier.version>
Expand Down Expand Up @@ -61,26 +63,22 @@
<!-- Axon - CQRS and EventSourcing Framework -->
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-configuration</artifactId>
<artifactId>axon-configuration-jakarta</artifactId>
<version>${axon.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-modelling</artifactId>
<artifactId>axon-modelling-jakarta</artifactId>
<version>${axon.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-messaging</artifactId>
<artifactId>axon-messaging-jakarta</artifactId>
<version>${axon.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>

<!-- Axon - Optional dependencies for CQRS and EventSourcing Framework (only needed for native compile) -->
<dependency>
Expand All @@ -94,12 +92,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.projectreactor</groupId>
Expand All @@ -113,6 +105,7 @@
<dependency>
<groupId>jakarta.security.jacc</groupId>
<artifactId>jakarta.security.jacc-api</artifactId>
<version>${jacc-api.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ht/showcase/quarkuseventsourcing/messaging/command/axon/AggregateEventEmitterAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.command.axon;

import javax.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ApplicationScoped;

import org.axonframework.modelling.command.AggregateLifecycle;

Expand Down
4 changes: 2 additions & 2 deletions ...thub/joht/showcase/quarkuseventsourcing/messaging/command/axon/CommandEmitterAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.command.axon;

import static javax.transaction.Transactional.TxType.REQUIRED;
import static jakarta.transaction.Transactional.TxType.REQUIRED;

import javax.transaction.Transactional;
import jakarta.transaction.Transactional;

import org.axonframework.commandhandling.CommandExecutionException;
import org.axonframework.commandhandling.gateway.CommandGateway;
Expand Down
4 changes: 2 additions & 2 deletions .../joht/showcase/quarkuseventsourcing/messaging/command/boundary/CommandModelAggregate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Stereotype;
import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.inject.Stereotype;

import org.axonframework.modelling.command.AggregateRoot;

Expand Down
18 changes: 9 additions & 9 deletions ...b/joht/showcase/quarkuseventsourcing/messaging/infrastructure/axon/AxonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
import java.util.function.Consumer;
import java.util.logging.Logger;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Typed;
import javax.inject.Inject;
import javax.inject.Named;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import jakarta.enterprise.inject.Typed;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import javax.sql.DataSource;
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.UserTransaction;
import jakarta.transaction.TransactionSynchronizationRegistry;
import jakarta.transaction.UserTransaction;

import org.axonframework.common.Priority;
import org.axonframework.common.transaction.TransactionManager;
Expand Down
16 changes: 8 additions & 8 deletions ...quarkuseventsourcing/messaging/infrastructure/axon/inject/cdi/AxonComponentDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import java.util.Set;
import java.util.function.Function;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.Any;
import jakarta.enterprise.inject.Typed;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.inject.Inject;

import org.axonframework.commandhandling.CommandHandler;
import org.axonframework.config.AggregateConfigurer;
Expand Down
6 changes: 3 additions & 3 deletions ...useventsourcing/messaging/infrastructure/axon/inject/cdi/CdiParameterResolverFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.enterprise.inject.Instance;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.CDI;
import jakarta.enterprise.inject.Instance;
import jakarta.enterprise.inject.Typed;
import jakarta.enterprise.inject.spi.CDI;

import org.axonframework.messaging.Message;
import org.axonframework.messaging.annotation.ParameterResolver;
Expand Down
12 changes: 6 additions & 6 deletions ...se/quarkuseventsourcing/messaging/infrastructure/axon/inject/cdi/CdiResourceInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import java.util.function.Function;

import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.CDI;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.InjectionTargetFactory;
import jakarta.enterprise.context.spi.CreationalContext;
import jakarta.enterprise.inject.spi.AnnotatedType;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.CDI;
import jakarta.enterprise.inject.spi.InjectionTarget;
import jakarta.enterprise.inject.spi.InjectionTargetFactory;

import org.axonframework.modelling.saga.ResourceInjector;

Expand Down
8 changes: 4 additions & 4 deletions ...useventsourcing/messaging/infrastructure/axon/serializer/jsonb/JsonbStringSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import java.util.function.Consumer;

import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import javax.json.bind.config.PropertyVisibilityStrategy;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import jakarta.json.bind.config.PropertyVisibilityStrategy;

import io.github.joht.showcase.quarkuseventsourcing.messaging.infrastructure.axon.serializer.StringSerializer;

Expand Down
2 changes: 1 addition & 1 deletion ...kuseventsourcing/messaging/infrastructure/axon/serializer/jsonb/VisibilityStrategies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;

import javax.json.bind.config.PropertyVisibilityStrategy;
import jakarta.json.bind.config.PropertyVisibilityStrategy;

enum VisibilityStrategies implements PropertyVisibilityStrategy {
FIELD_VISIBILITY {
Expand Down
6 changes: 3 additions & 3 deletions ...kuseventsourcing/messaging/infrastructure/axon/serializer/jsonb/axon/JsonbSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import java.util.logging.Logger;
import java.util.stream.Stream;

import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import javax.json.bind.JsonbException;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import jakarta.json.bind.JsonbException;

import org.axonframework.common.ObjectUtils;
import org.axonframework.serialization.AnnotationRevisionResolver;
Expand Down
2 changes: 1 addition & 1 deletion ...messaging/infrastructure/axon/serializer/jsonb/axon/adapter/JsonbAxonAdapterRegister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.infrastructure.axon.serializer.jsonb.axon.adapter;

import javax.json.bind.JsonbConfig;
import jakarta.json.bind.JsonbConfig;

public class JsonbAxonAdapterRegister {

Expand Down
10 changes: 5 additions & 5 deletions .../infrastructure/axon/serializer/jsonb/axon/adapter/JsonbGapAwareTrackingTokenAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import java.util.Collection;
import java.util.stream.Collectors;

import javax.json.Json;
import javax.json.JsonArrayBuilder;
import javax.json.JsonNumber;
import javax.json.JsonObject;
import javax.json.bind.adapter.JsonbAdapter;
import jakarta.json.Json;
import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonNumber;
import jakarta.json.JsonObject;
import jakarta.json.bind.adapter.JsonbAdapter;

import org.axonframework.eventhandling.GapAwareTrackingToken;

Expand Down
6 changes: 3 additions & 3 deletions ...structure/axon/serializer/jsonb/axon/adapter/JsonbGlobalSequenceTrackingTokenAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.infrastructure.axon.serializer.jsonb.axon.adapter;

import javax.json.Json;
import javax.json.JsonObject;
import javax.json.bind.adapter.JsonbAdapter;
import jakarta.json.Json;
import jakarta.json.JsonObject;
import jakarta.json.bind.adapter.JsonbAdapter;

import org.axonframework.eventhandling.GlobalSequenceTrackingToken;

Expand Down
2 changes: 1 addition & 1 deletion ...ing/messaging/infrastructure/axon/serializer/jsonb/axon/adapter/JsonbMetaDataAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.Map;

import javax.json.bind.adapter.JsonbAdapter;
import jakarta.json.bind.adapter.JsonbAdapter;

import org.axonframework.messaging.MetaData;

Expand Down
14 changes: 7 additions & 7 deletions .../messaging/infrastructure/axon/serializer/jsonb/axon/adapter/JsonbReplayTokenAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import javax.json.bind.adapter.JsonbAdapter;
import jakarta.json.Json;
import jakarta.json.JsonObject;
import jakarta.json.JsonObjectBuilder;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import jakarta.json.bind.adapter.JsonbAdapter;

import org.axonframework.eventhandling.ReplayToken;
import org.axonframework.eventhandling.TrackingToken;
Expand Down
2 changes: 1 addition & 1 deletion ...aging/infrastructure/axon/serializer/jsonb/axon/converter/JsonObject2StringConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.infrastructure.axon.serializer.jsonb.axon.converter;

import javax.json.JsonObject;
import jakarta.json.JsonObject;

import org.axonframework.serialization.ContentTypeConverter;

Expand Down
6 changes: 3 additions & 3 deletions ...aging/infrastructure/axon/serializer/jsonb/axon/converter/String2JsonObjectConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import java.io.StringReader;

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.axonframework.serialization.ContentTypeConverter;

Expand Down
8 changes: 4 additions & 4 deletions ...kuseventsourcing/messaging/infrastructure/axon/transaction/jta/JtaTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import java.util.logging.Logger;

import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.UserTransaction;
import jakarta.transaction.Status;
import jakarta.transaction.SystemException;
import jakarta.transaction.TransactionSynchronizationRegistry;
import jakarta.transaction.UserTransaction;

import org.axonframework.common.transaction.Transaction;
import org.axonframework.common.transaction.TransactionManager;
Expand Down
2 changes: 1 addition & 1 deletion ...useventsourcing/messaging/infrastructure/axon/transaction/jta/LeadingUserTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.transaction.UserTransaction;
import jakarta.transaction.UserTransaction;

import org.axonframework.common.transaction.Transaction;
import org.axonframework.eventhandling.TransactionMethodExecutionException;
Expand Down
4 changes: 2 additions & 2 deletions ...ing/messaging/infrastructure/axon/transaction/jta/ParticipatingRegisteredTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.logging.Logger;

import javax.transaction.Status;
import javax.transaction.TransactionSynchronizationRegistry;
import jakarta.transaction.Status;
import jakarta.transaction.TransactionSynchronizationRegistry;

import org.axonframework.common.transaction.Transaction;

Expand Down
4 changes: 2 additions & 2 deletions ...tsourcing/messaging/infrastructure/axon/transaction/jta/ParticipatingUserTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.logging.Logger;

import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
import jakarta.transaction.SystemException;
import jakarta.transaction.UserTransaction;

import org.axonframework.common.transaction.Transaction;

Expand Down
6 changes: 3 additions & 3 deletions ...seventsourcing/messaging/infrastructure/axon/upcaster/NicknameChangedEventV1Upcaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.infrastructure.axon.upcaster;

import javax.enterprise.context.Dependent;
import javax.json.Json;
import javax.json.JsonObject;
import jakarta.enterprise.context.Dependent;
import jakarta.json.Json;
import jakarta.json.JsonObject;

import org.axonframework.serialization.SerializedType;
import org.axonframework.serialization.SimpleSerializedType;
Expand Down
4 changes: 2 additions & 2 deletions ...ithub/joht/showcase/quarkuseventsourcing/messaging/query/axon/EventPublishingAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.query.axon;

import static javax.transaction.Transactional.TxType.REQUIRED;
import static jakarta.transaction.Transactional.TxType.REQUIRED;

import javax.transaction.Transactional;
import jakarta.transaction.Transactional;

import org.axonframework.eventhandling.gateway.EventGateway;

Expand Down
4 changes: 2 additions & 2 deletions ...io/github/joht/showcase/quarkuseventsourcing/messaging/query/axon/QueryReplayAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.joht.showcase.quarkuseventsourcing.messaging.query.axon;

import static javax.transaction.Transactional.TxType.REQUIRED;
import static jakarta.transaction.Transactional.TxType.REQUIRED;

import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -11,7 +11,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.transaction.Transactional;
import jakarta.transaction.Transactional;

import org.axonframework.config.EventProcessingConfiguration;
import org.axonframework.eventhandling.EventTrackerStatus;
Expand Down
Loading