Skip to content

Commit 14480be

Browse files
adutramsmygit
andauthored
Adapt to Quarkus 3 (#222)
* Set version to 1.2.0-alpha1-SNAPSHOT * Upgrade to Quarkus 3.0.0.Alpha4 * Bulk replace javax.* with jakarta.* * Update Mutiny code for Quarkus 3 * Add missing Override annotations * Update to Quarkus 3.0.0.Beta1 (#1) Co-authored-by: Madhavan Sridharan <[email protected]> --------- Co-authored-by: Madhavan <[email protected]> Co-authored-by: Madhavan Sridharan <[email protected]>
1 parent 0ac4fea commit 14480be

File tree

75 files changed

+378
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+378
-204
lines changed

bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.datastax.oss.quarkus</groupId>
2323
<artifactId>cassandra-quarkus-parent</artifactId>
24-
<version>1.1.4-SNAPSHOT</version>
24+
<version>1.2.0-alpha1-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>cassandra-quarkus-bom</artifactId>
2727
<packaging>pom</packaging>

deployment/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.datastax.oss.quarkus</groupId>
2323
<artifactId>cassandra-quarkus-parent</artifactId>
24-
<version>1.1.4-SNAPSHOT</version>
24+
<version>1.2.0-alpha1-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>cassandra-quarkus-client-deployment</artifactId>
2727
<name>Cassandra Quarkus :: Client :: Deployment</name>

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/driver/QuarkusNettyEventLoopTooSmallTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import com.datastax.oss.quarkus.test.CassandraTestResource;
2525
import io.quarkus.test.QuarkusUnitTest;
2626
import io.vertx.core.impl.VertxThread;
27+
import jakarta.inject.Inject;
2728
import java.util.concurrent.CompletionStage;
2829
import java.util.concurrent.ExecutionException;
2930
import java.util.concurrent.atomic.AtomicReference;
30-
import javax.inject.Inject;
3131
import org.jboss.shrinkwrap.api.ShrinkWrap;
3232
import org.jboss.shrinkwrap.api.spec.JavaArchive;
3333
import org.junit.jupiter.api.Test;

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/driver/UseQuarkusNettyEventLoopDisabledTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import com.datastax.oss.quarkus.runtime.internal.context.QuarkusDriverContext;
2525
import com.datastax.oss.quarkus.test.CassandraTestResource;
2626
import io.quarkus.test.QuarkusUnitTest;
27+
import jakarta.inject.Inject;
2728
import java.util.concurrent.CompletionStage;
2829
import java.util.concurrent.ExecutionException;
2930
import java.util.concurrent.atomic.AtomicReference;
30-
import javax.inject.Inject;
3131
import org.jboss.shrinkwrap.api.ShrinkWrap;
3232
import org.jboss.shrinkwrap.api.spec.JavaArchive;
3333
import org.junit.jupiter.api.Test;

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/driver/UseQuarkusNettyEventLoopEnabledTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import com.datastax.oss.quarkus.test.CassandraTestResource;
2525
import io.quarkus.test.QuarkusUnitTest;
2626
import io.vertx.core.impl.VertxThread;
27+
import jakarta.inject.Inject;
2728
import java.util.concurrent.CompletionStage;
2829
import java.util.concurrent.ExecutionException;
2930
import java.util.concurrent.atomic.AtomicReference;
30-
import javax.inject.Inject;
3131
import org.jboss.shrinkwrap.api.ShrinkWrap;
3232
import org.jboss.shrinkwrap.api.spec.JavaArchive;
3333
import org.junit.jupiter.api.Test;

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/health/CassandraHealthCheckBuildItemDisabledTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import com.datastax.oss.quarkus.runtime.internal.health.CassandraAsyncHealthCheck;
2222
import com.datastax.oss.quarkus.test.CassandraTestResource;
2323
import io.quarkus.test.QuarkusUnitTest;
24-
import javax.enterprise.inject.UnsatisfiedResolutionException;
25-
import javax.inject.Inject;
26-
import javax.inject.Provider;
24+
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
25+
import jakarta.inject.Inject;
26+
import jakarta.inject.Provider;
2727
import org.eclipse.microprofile.health.Readiness;
2828
import org.jboss.shrinkwrap.api.ShrinkWrap;
2929
import org.jboss.shrinkwrap.api.spec.JavaArchive;

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/health/CassandraHealthCheckBuildItemEnabledTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import com.datastax.oss.quarkus.runtime.internal.health.CassandraAsyncHealthCheck;
2121
import com.datastax.oss.quarkus.test.CassandraTestResource;
2222
import io.quarkus.test.QuarkusUnitTest;
23+
import jakarta.inject.Inject;
2324
import java.util.concurrent.ExecutionException;
24-
import javax.inject.Inject;
2525
import org.eclipse.microprofile.health.HealthCheckResponse;
2626
import org.eclipse.microprofile.health.Readiness;
2727
import org.jboss.shrinkwrap.api.ShrinkWrap;

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/metrics/CassandraMetricsDisabledTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import io.quarkus.builder.Version;
2929
import io.quarkus.test.QuarkusUnitTest;
3030
import io.quarkus.test.common.QuarkusTestResource;
31+
import jakarta.inject.Inject;
3132
import java.util.Arrays;
32-
import javax.inject.Inject;
3333
import org.jboss.shrinkwrap.api.ShrinkWrap;
3434
import org.jboss.shrinkwrap.api.spec.JavaArchive;
3535
import org.junit.jupiter.api.Test;

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/metrics/CassandraMetricsMicroProfileTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import io.quarkus.builder.Version;
2626
import io.quarkus.test.QuarkusUnitTest;
2727
import io.quarkus.test.common.QuarkusTestResource;
28+
import jakarta.inject.Inject;
2829
import java.util.Collections;
29-
import javax.inject.Inject;
3030
import org.eclipse.microprofile.metrics.Counter;
3131
import org.eclipse.microprofile.metrics.Gauge;
3232
import org.eclipse.microprofile.metrics.Metered;

deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/metrics/CassandraMetricsMicrometerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import io.quarkus.builder.Version;
3131
import io.quarkus.test.QuarkusUnitTest;
3232
import io.quarkus.test.common.QuarkusTestResource;
33+
import jakarta.inject.Inject;
3334
import java.util.Arrays;
34-
import javax.inject.Inject;
3535
import org.jboss.shrinkwrap.api.ShrinkWrap;
3636
import org.jboss.shrinkwrap.api.spec.JavaArchive;
3737
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)