You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/10/30 12:13:01 UTC
[camel-quarkus] 01/06: Update to quarkus 0.27.0
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7f25029c9dcccba786e1b3cd50d2bcd873469173
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Oct 29 15:03:11 2019 +0100
Update to quarkus 0.27.0
---
build/create-extension-templates/IT.java | 4 ++--
.../org/acme/observability/ObservabilityIT.java | 4 ++--
.../test/java/org/acme/rest/json/RestJsonIT.java | 4 ++--
.../aws/eks/deployment/AwsEKSProcessor.java | 14 ++++++-------
.../aws/s3/deployment/AwsS3Processor.java | 16 +++++++--------
.../aws/sns/deployment/AwsSNSProcessor.java | 14 ++++++-------
.../aws/sqs/deployment/AwsSQSProcessor.java | 14 ++++++-------
extensions/core-cloud/runtime/pom.xml | 6 ++++++
.../core/deployment/NativeImageProcessor.java | 11 +++++-----
.../component/fhir/deployment/FhirProcessor.java | 24 +++++++++++-----------
extensions/fhir/runtime/pom.xml | 4 ++++
extensions/http-common/runtime/pom.xml | 4 ++--
.../infinispan/deployment/InfinispanProcessor.java | 2 +-
extensions/infinispan/runtime/pom.xml | 6 ++++++
extensions/jdbc/runtime/pom.xml | 4 ++--
.../component/mail/deployment/MailProcessor.java | 10 ++++-----
.../deployment/OpenTracingProcessor.java | 7 +++----
.../component/paho/deployment/PahoProcessor.java | 16 +++++++--------
.../component/pdf/deployment/PdfProcessor.java | 6 +++---
.../salesforce/deployment/SalesforceProcessor.java | 2 +-
.../component/slack/deployment/SlackProcessor.java | 6 +++---
.../jetty/deployment/JettySupportProcessor.java | 2 +-
.../xml/deployment/XmlSupportProcessor.java | 2 +-
.../deployment/XStreamSupportProcessor.java | 2 +-
.../twitter/deployment/TwitterProcessor.java | 2 +-
.../camel/quarkus/component/bean/BeanITCase.java | 4 ++--
.../org/apache/camel/quarkus/core/CamelITCase.java | 4 ++--
.../org/apache/camel/quarkus/core/CamelITCase.java | 4 ++--
.../camel/quarkus/component/csv/it/CsvIT.java | 4 ++--
.../camel/quarkus/component/fhir/it/FhirIT.java | 5 ++---
integration-tests/infinispan/pom.xml | 6 ++++++
.../quarkus/component/infinispan/CamelTCase.java | 4 ++--
.../quarkus/component/jackson/JacksonITCase.java | 4 ++--
.../camel/quarkus/component/jdbc/CamelJdbcIT.java | 4 ++--
.../camel/quarkus/component/mail/MailITCase.java | 4 ++--
.../health/it/MicroprofileHealthIT.java | 4 ++--
.../metrics/it/MicroprofileMetricsIT.java | 4 ++--
.../quarkus/component/netty/http/CamelIT.java | 4 ++--
.../component/opentracing/it/OpenTracingIT.java | 4 ++--
.../camel/quarkus/component/paho/it/PahoIT.java | 4 ++--
.../camel/quarkus/component/pdf/it/PdfIT.java | 4 ++--
.../http/server/it/PlatformHttpEngineIT.java | 4 ++--
.../component/http/server/it/PlatformHttpIT.java | 4 ++--
.../quarkus/component/servlet/CamelServletIT.java | 4 ++--
.../camel/quarkus/component/slack/it/SlackIT.java | 4 ++--
.../quarkus/component/tarfile/it/TarfileIT.java | 4 ++--
.../quarkus/component/twitter/CamelTwitterIT.java | 4 ++--
.../quarkus/component/zipfile/it/ZipfileIT.java | 4 ++--
pom.xml | 6 +++---
poms/bom/pom.xml | 10 +++++++++
50 files changed, 162 insertions(+), 135 deletions(-)
diff --git a/build/create-extension-templates/IT.java b/build/create-extension-templates/IT.java
index 08def63..9012813 100644
--- a/build/create-extension-templates/IT.java
+++ b/build/create-extension-templates/IT.java
@@ -16,9 +16,9 @@
*/
package [=javaPackageBase].it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class [=artifactIdBaseCamelCase]IT extends [=artifactIdBaseCamelCase]Test {
}
diff --git a/examples/observability/src/test/java/org/acme/observability/ObservabilityIT.java b/examples/observability/src/test/java/org/acme/observability/ObservabilityIT.java
index 086e67e..3e4abda 100644
--- a/examples/observability/src/test/java/org/acme/observability/ObservabilityIT.java
+++ b/examples/observability/src/test/java/org/acme/observability/ObservabilityIT.java
@@ -1,7 +1,7 @@
package org.acme.observability;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class ObservabilityIT extends ObservabilityTest {
}
diff --git a/examples/rest-json/src/test/java/org/acme/rest/json/RestJsonIT.java b/examples/rest-json/src/test/java/org/acme/rest/json/RestJsonIT.java
index c32a4fb..f6595a0 100644
--- a/examples/rest-json/src/test/java/org/acme/rest/json/RestJsonIT.java
+++ b/examples/rest-json/src/test/java/org/acme/rest/json/RestJsonIT.java
@@ -16,12 +16,12 @@
*/
package org.acme.rest.json;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
/**
* Native mode tests. In the native mode, the same tests will be executed as in the JVM mode because this class extends
* {@link RestJsonTest}.
*/
-@SubstrateTest
+@NativeImageTest
public class RestJsonIT extends RestJsonTest {
}
\ No newline at end of file
diff --git a/extensions/aws-eks/deployment/src/main/java/org/apache/camel/quarkus/component/aws/eks/deployment/AwsEKSProcessor.java b/extensions/aws-eks/deployment/src/main/java/org/apache/camel/quarkus/component/aws/eks/deployment/AwsEKSProcessor.java
index 57990ac..e31b25f 100644
--- a/extensions/aws-eks/deployment/src/main/java/org/apache/camel/quarkus/component/aws/eks/deployment/AwsEKSProcessor.java
+++ b/extensions/aws-eks/deployment/src/main/java/org/apache/camel/quarkus/component/aws/eks/deployment/AwsEKSProcessor.java
@@ -32,9 +32,9 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.aws.eks.EKSConfiguration;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
@@ -57,19 +57,19 @@ class AwsEKSProcessor {
}
@BuildStep
- SubstrateProxyDefinitionBuildItem httpProxies() {
- return new SubstrateProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
+ NativeImageProxyDefinitionBuildItem httpProxies() {
+ return new NativeImageProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
"org.apache.http.pool.ConnPoolControl", "com.amazonaws.http.conn.Wrapped");
}
@BuildStep(applicationArchiveMarkers = { AWS_EKS_APPLICATION_ARCHIVE_MARKERS })
void process(CombinedIndexBuildItem combinedIndexBuildItem,
BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
- BuildProducer<SubstrateResourceBuildItem> resource) {
+ BuildProducer<NativeImageResourceBuildItem> resource) {
IndexView view = combinedIndexBuildItem.getIndex();
- resource.produce(new SubstrateResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
+ resource.produce(new NativeImageResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
for (String s : getImplementations(view, JsonDeserializer.class)) {
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, s));
}
diff --git a/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/AwsS3Processor.java b/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/AwsS3Processor.java
index 4e602e7..8abbef8 100644
--- a/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/AwsS3Processor.java
+++ b/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/AwsS3Processor.java
@@ -34,10 +34,10 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.apache.camel.component.aws.s3.S3Configuration;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
@@ -65,19 +65,19 @@ class AwsS3Processor {
}
@BuildStep
- SubstrateProxyDefinitionBuildItem httpProxies() {
- return new SubstrateProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
+ NativeImageProxyDefinitionBuildItem httpProxies() {
+ return new NativeImageProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
"org.apache.http.pool.ConnPoolControl", "com.amazonaws.http.conn.Wrapped");
}
@BuildStep(applicationArchiveMarkers = { AWS_S3_APPLICATION_ARCHIVE_MARKERS })
void process(CombinedIndexBuildItem combinedIndexBuildItem,
BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
- BuildProducer<SubstrateResourceBuildItem> resource) {
+ BuildProducer<NativeImageResourceBuildItem> resource) {
IndexView view = combinedIndexBuildItem.getIndex();
- resource.produce(new SubstrateResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
+ resource.produce(new NativeImageResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
for (String s : getImplementations(view, JsonDeserializer.class)) {
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, s));
}
diff --git a/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/AwsSNSProcessor.java b/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/AwsSNSProcessor.java
index f107fd4..cb586e9 100644
--- a/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/AwsSNSProcessor.java
+++ b/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/AwsSNSProcessor.java
@@ -33,9 +33,9 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.aws.sns.SnsConfiguration;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
@@ -58,19 +58,19 @@ class AwsSNSProcessor {
}
@BuildStep
- SubstrateProxyDefinitionBuildItem httpProxies() {
- return new SubstrateProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
+ NativeImageProxyDefinitionBuildItem httpProxies() {
+ return new NativeImageProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
"org.apache.http.pool.ConnPoolControl", "com.amazonaws.http.conn.Wrapped");
}
@BuildStep(applicationArchiveMarkers = { AWS_SNS_APPLICATION_ARCHIVE_MARKERS })
void process(CombinedIndexBuildItem combinedIndexBuildItem,
BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
- BuildProducer<SubstrateResourceBuildItem> resource) {
+ BuildProducer<NativeImageResourceBuildItem> resource) {
IndexView view = combinedIndexBuildItem.getIndex();
- resource.produce(new SubstrateResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
+ resource.produce(new NativeImageResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
for (String s : getImplementations(view, JsonDeserializer.class)) {
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, s));
}
diff --git a/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/AwsSQSProcessor.java b/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/AwsSQSProcessor.java
index 91b631c..fc0054e 100644
--- a/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/AwsSQSProcessor.java
+++ b/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/AwsSQSProcessor.java
@@ -33,9 +33,9 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.aws.sqs.SqsConfiguration;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
@@ -58,19 +58,19 @@ class AwsSQSProcessor {
}
@BuildStep
- SubstrateProxyDefinitionBuildItem httpProxies() {
- return new SubstrateProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
+ NativeImageProxyDefinitionBuildItem httpProxies() {
+ return new NativeImageProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
"org.apache.http.pool.ConnPoolControl", "com.amazonaws.http.conn.Wrapped");
}
@BuildStep(applicationArchiveMarkers = { AWS_SQS_APPLICATION_ARCHIVE_MARKERS })
void process(CombinedIndexBuildItem combinedIndexBuildItem,
BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
- BuildProducer<SubstrateResourceBuildItem> resource) {
+ BuildProducer<NativeImageResourceBuildItem> resource) {
IndexView view = combinedIndexBuildItem.getIndex();
- resource.produce(new SubstrateResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
+ resource.produce(new NativeImageResourceBuildItem("com/amazonaws/partitions/endpoints.json"));
for (String s : getImplementations(view, JsonDeserializer.class)) {
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, s));
}
diff --git a/extensions/core-cloud/runtime/pom.xml b/extensions/core-cloud/runtime/pom.xml
index 8000962..a6e4eda 100644
--- a/extensions/core-cloud/runtime/pom.xml
+++ b/extensions/core-cloud/runtime/pom.xml
@@ -68,6 +68,12 @@
<groupId>com.oracle.substratevm</groupId>
<artifactId>svm</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
+
</dependencies>
<build>
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
index e493b6f..e7bde64 100644
--- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
+++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -25,16 +25,15 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
-
import javax.inject.Inject;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveMethodBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -79,7 +78,7 @@ class NativeImageProcessor {
@Inject
BuildProducer<ReflectiveMethodBuildItem> reflectiveMethod;
@Inject
- BuildProducer<SubstrateResourceBuildItem> resource;
+ BuildProducer<NativeImageResourceBuildItem> resource;
@Inject
ApplicationArchivesBuildItem applicationArchivesBuildItem;
@@ -158,7 +157,7 @@ class NativeImageProcessor {
}
protected void addResource(String r) {
- resource.produce(new SubstrateResourceBuildItem(r));
+ resource.produce(new NativeImageResourceBuildItem(r));
}
protected void addReflectiveClass(boolean methods, String... className) {
diff --git a/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/FhirProcessor.java b/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/FhirProcessor.java
index 583e15e..238f25f 100644
--- a/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/FhirProcessor.java
+++ b/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/FhirProcessor.java
@@ -27,9 +27,9 @@ import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBundleBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.fhir.FhirCapabilitiesEndpointConfiguration;
import org.apache.camel.component.fhir.FhirConfiguration;
import org.apache.camel.component.fhir.FhirCreateEndpointConfiguration;
@@ -82,8 +82,8 @@ class FhirProcessor {
}
@BuildStep()
- SubstrateResourceBundleBuildItem hapiMessages() {
- return new SubstrateResourceBundleBuildItem("ca.uhn.fhir.i18n.hapi-messages");
+ NativeImageResourceBundleBuildItem hapiMessages() {
+ return new NativeImageResourceBundleBuildItem("ca.uhn.fhir.i18n.hapi-messages");
}
@BuildStep
@@ -93,7 +93,7 @@ class FhirProcessor {
}
@BuildStep(applicationArchiveMarkers = {"org/hl7/fhir", "ca/uhn/fhir"})
- void processFhir(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<SubstrateResourceBuildItem> resource) {
+ void processFhir(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<NativeImageResourceBundleBuildItem> resource) {
Set<String> classes = new HashSet<>();
classes.add("ca.uhn.fhir.rest.client.apache.ApacheRestfulClientFactory");
classes.add("ca.uhn.fhir.validation.schematron.SchematronBaseValidator");
@@ -104,35 +104,35 @@ class FhirProcessor {
}
@BuildStep(onlyIf = FhirFlags.Dstu2Enabled.class, applicationArchiveMarkers = {"org/hl7/fhir", "ca/uhn/fhir"})
- void processDstu2(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<SubstrateResourceBuildItem> resource) {
+ void processDstu2(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<NativeImageResourceBuildItem> resource) {
Set<String> classes = new HashSet<>();
classes.add(FhirDstu2.class.getCanonicalName());
classes.addAll(getModelClasses("/ca/uhn/fhir/model/dstu2/fhirversion.properties"));
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, true, classes.toArray(new String[0])));
- resource.produce(new SubstrateResourceBuildItem("ca/uhn/fhir/model/dstu2/fhirversion.properties"));
+ resource.produce(new NativeImageResourceBuildItem("ca/uhn/fhir/model/dstu2/fhirversion.properties"));
}
@BuildStep(onlyIf = FhirFlags.Dstu3Enabled.class, applicationArchiveMarkers = {"org/hl7/fhir", "ca/uhn/fhir"})
- void processDstu3(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<SubstrateResourceBuildItem> resource) {
+ void processDstu3(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<NativeImageResourceBuildItem> resource) {
Set<String> classes = new HashSet<>();
classes.add(FhirDstu3.class.getCanonicalName());
classes.addAll(getModelClasses("/org/hl7/fhir/dstu3/model/fhirversion.properties"));
classes.addAll(getInnerClasses(Enumerations.class.getCanonicalName()));
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, true, classes.toArray(new String[0])));
- resource.produce(new SubstrateResourceBuildItem("org/hl7/fhir/dstu3/model/fhirversion.properties"));
+ resource.produce(new NativeImageResourceBuildItem("org/hl7/fhir/dstu3/model/fhirversion.properties"));
}
@BuildStep(onlyIf = FhirFlags.R4Enabled.class, applicationArchiveMarkers = {"org/hl7/fhir", "ca/uhn/fhir"})
- void processR4(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<SubstrateResourceBuildItem> resource) {
+ void processR4(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<NativeImageResourceBuildItem> resource) {
Set<String> classes = new HashSet<>();
classes.add("org.hl7.fhir.r4.hapi.ctx.FhirR4");
classes.addAll(getModelClasses("/org/hl7/fhir/r4/model/fhirversion.properties"));
classes.addAll(getInnerClasses(org.hl7.fhir.r4.model.Enumerations.class.getCanonicalName()));
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, true, classes.toArray(new String[0])));
- resource.produce(new SubstrateResourceBuildItem("org/hl7/fhir/r4/model/fhirversion.properties"));
+ resource.produce(new NativeImageResourceBuildItem("org/hl7/fhir/r4/model/fhirversion.properties"));
}
private Collection<String> getModelClasses(String model) {
diff --git a/extensions/fhir/runtime/pom.xml b/extensions/fhir/runtime/pom.xml
index 5ed6c2c..42dbef6 100644
--- a/extensions/fhir/runtime/pom.xml
+++ b/extensions/fhir/runtime/pom.xml
@@ -41,6 +41,10 @@
<artifactId>hapi-fhir-structures-r4</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>commons-logging-jboss-logging</artifactId>
</dependency>
diff --git a/extensions/http-common/runtime/pom.xml b/extensions/http-common/runtime/pom.xml
index a52270f..fef656e 100644
--- a/extensions/http-common/runtime/pom.xml
+++ b/extensions/http-common/runtime/pom.xml
@@ -55,8 +55,8 @@
<!-- required for http-common type converters-->
<dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_4.0_spec</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java b/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
index 47f0584..b206edf 100644
--- a/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
+++ b/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.quarkus.component.infinispan.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.infinispan.InfinispanConfiguration;
class InfinispanProcessor {
diff --git a/extensions/infinispan/runtime/pom.xml b/extensions/infinispan/runtime/pom.xml
index 7a82a37..3944a5f 100644
--- a/extensions/infinispan/runtime/pom.xml
+++ b/extensions/infinispan/runtime/pom.xml
@@ -65,6 +65,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/jdbc/runtime/pom.xml b/extensions/jdbc/runtime/pom.xml
index b30022d..c52768b 100644
--- a/extensions/jdbc/runtime/pom.xml
+++ b/extensions/jdbc/runtime/pom.xml
@@ -58,8 +58,8 @@
<artifactId>quarkus-narayana-jta</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.5_spec</artifactId>
+ <groupId>jakarta.security.jacc</groupId>
+ <artifactId>jakarta.security.jacc-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/mail/deployment/src/main/java/org/apache/camel/quarkus/component/mail/deployment/MailProcessor.java b/extensions/mail/deployment/src/main/java/org/apache/camel/quarkus/component/mail/deployment/MailProcessor.java
index 29b829c..7bebc31 100644
--- a/extensions/mail/deployment/src/main/java/org/apache/camel/quarkus/component/mail/deployment/MailProcessor.java
+++ b/extensions/mail/deployment/src/main/java/org/apache/camel/quarkus/component/mail/deployment/MailProcessor.java
@@ -39,9 +39,9 @@ import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.ServiceProviderBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
class MailProcessor {
@@ -51,7 +51,7 @@ class MailProcessor {
BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
@Inject
- BuildProducer<SubstrateResourceBuildItem> resource;
+ BuildProducer<NativeImageResourceBuildItem> resource;
@Inject
BuildProducer<ServiceProviderBuildItem> services;
@@ -102,7 +102,7 @@ class MailProcessor {
.distinct()
.toArray(String[]::new)));
- resource.produce(new SubstrateResourceBuildItem(
+ resource.produce(new NativeImageResourceBuildItem(
"META-INF/services/javax.mail.Provider",
"META-INF/javamail.charset.map",
"META-INF/javamail.default.address.map",
diff --git a/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java b/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java
index ff68bd8..810f6bd 100644
--- a/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java
+++ b/extensions/opentracing/deployment/src/main/java/org/apache/camel/quarkus/component/opentracing/deployment/OpenTracingProcessor.java
@@ -23,8 +23,7 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
-
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import org.apache.camel.quarkus.component.opentracing.CamelOpenTracingConfig;
import org.apache.camel.quarkus.component.opentracing.CamelOpenTracingRecorder;
import org.apache.camel.quarkus.core.deployment.CamelBeanBuildItem;
@@ -39,8 +38,8 @@ class OpenTracingProcessor {
}
@BuildStep
- void process(BuildProducer<SubstrateResourceBuildItem> resource) {
- resource.produce(new SubstrateResourceBuildItem("META-INF/services/org.apache.camel.opentracing.SpanDecorator"));
+ void process(BuildProducer<NativeImageResourceBuildItem> resource) {
+ resource.produce(new NativeImageResourceBuildItem("META-INF/services/org.apache.camel.opentracing.SpanDecorator"));
}
@BuildStep
diff --git a/extensions/paho/deployment/src/main/java/org/apache/camel/quarkus/component/paho/deployment/PahoProcessor.java b/extensions/paho/deployment/src/main/java/org/apache/camel/quarkus/component/paho/deployment/PahoProcessor.java
index fde7858..3db8d94 100644
--- a/extensions/paho/deployment/src/main/java/org/apache/camel/quarkus/component/paho/deployment/PahoProcessor.java
+++ b/extensions/paho/deployment/src/main/java/org/apache/camel/quarkus/component/paho/deployment/PahoProcessor.java
@@ -18,16 +18,14 @@ package org.apache.camel.quarkus.component.paho.deployment;
import java.util.Arrays;
import java.util.List;
-
import javax.inject.Inject;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBundleBuildItem;
-
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.paho.PahoConfiguration;
import org.eclipse.paho.client.mqttv3.internal.SSLNetworkModuleFactory;
import org.eclipse.paho.client.mqttv3.internal.TCPNetworkModuleFactory;
@@ -46,10 +44,10 @@ class PahoProcessor {
);
@Inject
- BuildProducer<SubstrateResourceBuildItem> resource;
+ BuildProducer<NativeImageResourceBuildItem> resource;
@Inject
- BuildProducer<SubstrateResourceBundleBuildItem> resourceBundle;
+ BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle;
@BuildStep
FeatureBuildItem feature() {
@@ -67,8 +65,8 @@ class PahoProcessor {
@BuildStep
void registerBundleResource() {
- resource.produce(new SubstrateResourceBuildItem("META-INF/services/" + NetworkModuleFactory.class.getName()));
- resourceBundle.produce(new SubstrateResourceBundleBuildItem("org.eclipse.paho.client.mqttv3.internal.nls.logcat"));
+ resource.produce(new NativeImageResourceBuildItem("META-INF/services/" + NetworkModuleFactory.class.getName()));
+ resourceBundle.produce(new NativeImageResourceBundleBuildItem("org.eclipse.paho.client.mqttv3.internal.nls.logcat"));
}
}
diff --git a/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java b/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
index 500e362..05ccdeb 100644
--- a/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
+++ b/extensions/pdf/deployment/src/main/java/org/apache/camel/quarkus/component/pdf/deployment/PdfProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.quarkus.component.pdf.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
class PdfProcessor {
@@ -35,8 +35,8 @@ class PdfProcessor {
}
@BuildStep
- SubstrateResourceBuildItem initResources() {
- return new SubstrateResourceBuildItem(RUNTIME_RESOURCES);
+ NativeImageResourceBuildItem initResources() {
+ return new NativeImageResourceBuildItem(RUNTIME_RESOURCES);
}
}
diff --git a/extensions/salesforce/deployment/src/main/java/org/apache/camel/quarkus/component/salesforce/deployment/SalesforceProcessor.java b/extensions/salesforce/deployment/src/main/java/org/apache/camel/quarkus/component/salesforce/deployment/SalesforceProcessor.java
index b4ba773..cc50605 100644
--- a/extensions/salesforce/deployment/src/main/java/org/apache/camel/quarkus/component/salesforce/deployment/SalesforceProcessor.java
+++ b/extensions/salesforce/deployment/src/main/java/org/apache/camel/quarkus/component/salesforce/deployment/SalesforceProcessor.java
@@ -22,7 +22,7 @@ import java.util.List;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.ProtocolHandlers;
diff --git a/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java b/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java
index 6c83499..199bcdb 100644
--- a/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java
+++ b/extensions/slack/deployment/src/main/java/org/apache/camel/quarkus/component/slack/deployment/SlackProcessor.java
@@ -19,7 +19,7 @@ package org.apache.camel.quarkus.component.slack.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
class SlackProcessor {
@@ -36,9 +36,9 @@ class SlackProcessor {
}
@BuildStep
- SubstrateResourceBuildItem suffixListResource() {
+ NativeImageResourceBuildItem suffixListResource() {
// Required by org.apache.http.conn.util.PublicSuffixMatcher
- return new SubstrateResourceBuildItem("mozilla/public-suffix-list.txt");
+ return new NativeImageResourceBuildItem("mozilla/public-suffix-list.txt");
}
}
diff --git a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
index 434978d..dbba738 100644
--- a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
+++ b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
@@ -21,7 +21,7 @@ import java.util.List;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.ProtocolHandlers;
diff --git a/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java b/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
index 633c1fa..94fe0ae 100644
--- a/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
+++ b/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.quarkus.support.xml.deployment;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
public class XmlSupportProcessor {
@BuildStep
diff --git a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
index 08a9c9c..744538c 100644
--- a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
+++ b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
@@ -30,7 +30,7 @@ import com.thoughtworks.xstream.mapper.Mapper;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
diff --git a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java
index 9bc0552..68d3dff 100644
--- a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java
+++ b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java
@@ -19,7 +19,7 @@ package org.apache.camel.quarkus.component.twitter.deployment;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.twitter.AbstractTwitterComponent;
import org.apache.camel.component.twitter.TwitterConfiguration;
diff --git a/integration-tests/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanITCase.java b/integration-tests/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanITCase.java
index c068337..b863e89 100644
--- a/integration-tests/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanITCase.java
+++ b/integration-tests/bean/src/test/java/org/apache/camel/quarkus/component/bean/BeanITCase.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.quarkus.component.bean;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class BeanITCase extends BeanTest {
}
diff --git a/integration-tests/core-main/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java b/integration-tests/core-main/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java
index 6e466d3..d440574 100644
--- a/integration-tests/core-main/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java
+++ b/integration-tests/core-main/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.quarkus.core;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class CamelITCase extends CamelTest {
}
diff --git a/integration-tests/core/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java b/integration-tests/core/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java
index 6e466d3..d440574 100644
--- a/integration-tests/core/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java
+++ b/integration-tests/core/test/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.quarkus.core;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class CamelITCase extends CamelTest {
}
diff --git a/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvIT.java b/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvIT.java
index f7500cf..9bffa01 100644
--- a/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvIT.java
+++ b/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.csv.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class CsvIT extends CsvTest {
}
diff --git a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirIT.java b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirIT.java
index 102e635..cfdcd5e 100644
--- a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirIT.java
+++ b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirIT.java
@@ -16,9 +16,8 @@
*/
package org.apache.camel.quarkus.component.fhir.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class FhirIT extends FhirTest {
-
}
diff --git a/integration-tests/infinispan/pom.xml b/integration-tests/infinispan/pom.xml
index 2f5ca28..9df5df7 100644
--- a/integration-tests/infinispan/pom.xml
+++ b/integration-tests/infinispan/pom.xml
@@ -63,6 +63,12 @@
<artifactId>infinispan-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
diff --git a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelTCase.java b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelTCase.java
index f725603..13dc6d1 100644
--- a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelTCase.java
+++ b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelTCase.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.quarkus.component.infinispan;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class CamelTCase extends CamelTest {
}
diff --git a/integration-tests/jackson/src/test/java/org/apache/camel/quarkus/component/jackson/JacksonITCase.java b/integration-tests/jackson/src/test/java/org/apache/camel/quarkus/component/jackson/JacksonITCase.java
index c9ca04b..b5d50fc 100644
--- a/integration-tests/jackson/src/test/java/org/apache/camel/quarkus/component/jackson/JacksonITCase.java
+++ b/integration-tests/jackson/src/test/java/org/apache/camel/quarkus/component/jackson/JacksonITCase.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.quarkus.component.jackson;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class JacksonITCase extends JacksonTest {
}
diff --git a/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcIT.java b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcIT.java
index 97929b7..a622ae8 100644
--- a/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcIT.java
+++ b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.jdbc;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class CamelJdbcIT extends CamelJdbcTest {
}
diff --git a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailITCase.java b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailITCase.java
index 2f1e595..ee9f334 100644
--- a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailITCase.java
+++ b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailITCase.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.quarkus.component.mail;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class MailITCase extends MailTest {
}
diff --git a/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroprofileHealthIT.java b/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroprofileHealthIT.java
index 91c8f71..1f8f693 100644
--- a/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroprofileHealthIT.java
+++ b/integration-tests/microprofile-health/src/test/java/org/apache/camel/quarkus/component/microprofile/health/it/MicroprofileHealthIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.microprofile.health.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class MicroprofileHealthIT extends MicroProfileHealthTest {
}
diff --git a/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroprofileMetricsIT.java b/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroprofileMetricsIT.java
index a2c33fa..3b44a24 100644
--- a/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroprofileMetricsIT.java
+++ b/integration-tests/microprofile-metrics/src/test/java/org/apache/camel/quarkus/component/microprofile/metrics/it/MicroprofileMetricsIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.microprofile.metrics.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class MicroprofileMetricsIT extends MicroProfileMetricsTest {
}
diff --git a/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/CamelIT.java b/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/CamelIT.java
index 3580d21..8926e14 100644
--- a/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/CamelIT.java
+++ b/integration-tests/netty-http/src/test/java/org/apache/camel/quarkus/component/netty/http/CamelIT.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.quarkus.component.netty.http;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class CamelIT extends CamelTest {
}
diff --git a/integration-tests/opentracing/src/test/java/org/apache/camel/quarkus/component/opentracing/it/OpenTracingIT.java b/integration-tests/opentracing/src/test/java/org/apache/camel/quarkus/component/opentracing/it/OpenTracingIT.java
index 5e677d9..05e2bd4 100644
--- a/integration-tests/opentracing/src/test/java/org/apache/camel/quarkus/component/opentracing/it/OpenTracingIT.java
+++ b/integration-tests/opentracing/src/test/java/org/apache/camel/quarkus/component/opentracing/it/OpenTracingIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.opentracing.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class OpenTracingIT extends OpenTracingTest {
}
diff --git a/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoIT.java b/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoIT.java
index cd6eb49..87597c4 100644
--- a/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoIT.java
+++ b/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.paho.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class PahoIT extends PahoTest {
}
diff --git a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
index 1c9eac8..ac326a9 100644
--- a/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
+++ b/integration-tests/pdf/src/test/java/org/apache/camel/quarkus/component/pdf/it/PdfIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.pdf.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class PdfIT extends PdfTest {
}
diff --git a/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineIT.java b/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineIT.java
index 42f8cdb..0612638 100644
--- a/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineIT.java
+++ b/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.http.server.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class PlatformHttpEngineIT extends PlatformHttpEngineTest {
}
diff --git a/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpIT.java b/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpIT.java
index 8a5fa8c..73227f7 100644
--- a/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpIT.java
+++ b/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.http.server.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class PlatformHttpIT extends PlatformHttpTest {
}
diff --git a/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletIT.java b/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletIT.java
index 60e1b4f..8684abe 100644
--- a/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletIT.java
+++ b/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.servlet;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
public class CamelServletIT extends CamelServletTest {
}
diff --git a/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackIT.java b/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackIT.java
index 4f65122..0369cd9 100644
--- a/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackIT.java
+++ b/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.slack.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class SlackIT extends SlackTest {
}
diff --git a/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileIT.java b/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileIT.java
index b8ab463..d04986d 100644
--- a/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileIT.java
+++ b/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.tarfile.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class TarfileIT extends TarfileTest {
}
diff --git a/integration-tests/twitter/src/test/java/org/apache/camel/quarkus/component/twitter/CamelTwitterIT.java b/integration-tests/twitter/src/test/java/org/apache/camel/quarkus/component/twitter/CamelTwitterIT.java
index 27f24f8..c2ba4a3 100644
--- a/integration-tests/twitter/src/test/java/org/apache/camel/quarkus/component/twitter/CamelTwitterIT.java
+++ b/integration-tests/twitter/src/test/java/org/apache/camel/quarkus/component/twitter/CamelTwitterIT.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.quarkus.component.twitter;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
-@SubstrateTest
+@NativeImageTest
@EnabledIfEnvironmentVariable(named = "TWITTER_CONSUMER_KEY", matches = "[a-zA-Z0-9]+")
public class CamelTwitterIT extends CamelTwitterTest {
diff --git a/integration-tests/zipfile/src/test/java/org/apache/camel/quarkus/component/zipfile/it/ZipfileIT.java b/integration-tests/zipfile/src/test/java/org/apache/camel/quarkus/component/zipfile/it/ZipfileIT.java
index dcb7d30..8223cb6 100644
--- a/integration-tests/zipfile/src/test/java/org/apache/camel/quarkus/component/zipfile/it/ZipfileIT.java
+++ b/integration-tests/zipfile/src/test/java/org/apache/camel/quarkus/component/zipfile/it/ZipfileIT.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.zipfile.it;
-import io.quarkus.test.junit.SubstrateTest;
+import io.quarkus.test.junit.NativeImageTest;
-@SubstrateTest
+@NativeImageTest
class ZipfileIT extends ZipfileTest {
}
diff --git a/pom.xml b/pom.xml
index 47fcb01..a256df9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<camel.version>3.0.0-RC3</camel.version>
<hapi.version>3.7.0</hapi.version>
- <quarkus.version>0.26.1</quarkus.version>
+ <quarkus.version>0.27.0</quarkus.version>
<jetty.version>9.4.18.v20190429</jetty.version>
<xstream.version>1.4.11</xstream.version>
@@ -446,9 +446,9 @@
</profile>
<profile>
- <id>quarkus-snapshots</id>
+ <id>oss-snapshots</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index b8d9edf..3a4611d 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -200,6 +200,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-netty-http</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -483,6 +489,10 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>