diff --git a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceProcessor.java b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceProcessor.java index d1675686da..e3c42c326c 100644 --- a/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceProcessor.java +++ b/integration/quarkus/deployment/src/main/java/com/blazebit/persistence/integration/quarkus/deployment/BlazePersistenceProcessor.java @@ -26,12 +26,10 @@ import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.spi.EntityViewMapping; -import io.quarkus.builder.Version; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem; import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem; -import io.quarkus.deployment.builditem.CapabilityBuildItem; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; @@ -67,7 +65,6 @@ */ class BlazePersistenceProcessor { - static final String CAPABILITY = "com.blazebit.persistence.integration.quarkus"; static final String FEATURE = "blaze-persistence"; private static final Logger LOG = Logger.getLogger(BlazePersistenceProcessor.class); @@ -76,17 +73,6 @@ class BlazePersistenceProcessor { private static final DotName BLAZE_PERSISTENCE_INSTANCE_REPEATABLE_CONTAINER = DotName .createSimple(BlazePersistenceInstance.List.class.getName()); - @BuildStep - CapabilityBuildItem capability() { - String version = Version.getVersion(); - int dotIndex = version.indexOf('.'); - // As of version Quarkus 2, the capabilities are read from the extension descriptor - if (dotIndex == -1 || Integer.parseInt(version.substring(0, dotIndex)) >= 2) { - return null; - } - return new CapabilityBuildItem(CAPABILITY); - } - @BuildStep FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); diff --git a/integration/quarkus/runtime/pom.xml b/integration/quarkus/runtime/pom.xml index 238fdb6c96..2efcd059a4 100644 --- a/integration/quarkus/runtime/pom.xml +++ b/integration/quarkus/runtime/pom.xml @@ -78,6 +78,25 @@ + + io.quarkus + quarkus-bootstrap-maven-plugin + ${version.quarkus} + + + compile + + extension-descriptor + + + ${project.groupId}:${project.artifactId}-deployment:${project.version} + + com.blazebit.persistence.integration.quarkus + + + + + org.bsc.maven maven-processor-plugin @@ -100,4 +119,4 @@ - \ No newline at end of file + diff --git a/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.properties b/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.properties deleted file mode 100644 index b2388826d4..0000000000 --- a/integration/quarkus/runtime/src/main/resources/META-INF/quarkus-extension.properties +++ /dev/null @@ -1,2 +0,0 @@ -provides-capabilities=com.blazebit.persistence.integration.quarkus -deployment-artifact=${project.groupId}\:blaze-persistence-integration-quarkus-deployment\:${project.version} diff --git a/parent/pom.xml b/parent/pom.xml index 8561f0e454..64e68c147b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -122,7 +122,7 @@ 3.0.0 3.1.5.Final - 1.11.0.Final + 2.6.1.Final 2.0.4.Final 4.8.89