This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch 4527/make-twilio-compatible in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d39af5e649c842f3a6ed2d451d5521c9c820706a Author: Nicolas Filotto <[email protected]> AuthorDate: Fri Feb 10 10:52:34 2023 +0100 Ref #4527: Make twilio extension Jakarta compatible --- .../component/twilio/deployment/TwilioProcessor.java | 19 +------------------ poms/bom/pom.xml | 8 -------- poms/bom/src/main/generated/flattened-full-pom.xml | 8 -------- poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 -------- .../main/generated/flattened-reduced-verbose-pom.xml | 8 -------- 5 files changed, 1 insertion(+), 50 deletions(-) diff --git a/extensions/twilio/deployment/src/main/java/org/apache/camel/quarkus/component/twilio/deployment/TwilioProcessor.java b/extensions/twilio/deployment/src/main/java/org/apache/camel/quarkus/component/twilio/deployment/TwilioProcessor.java index 51a5c2dd1d..8df56cd00f 100644 --- a/extensions/twilio/deployment/src/main/java/org/apache/camel/quarkus/component/twilio/deployment/TwilioProcessor.java +++ b/extensions/twilio/deployment/src/main/java/org/apache/camel/quarkus/component/twilio/deployment/TwilioProcessor.java @@ -16,8 +16,6 @@ */ package org.apache.camel.quarkus.component.twilio.deployment; -import java.util.ArrayList; -import java.util.List; import java.util.stream.Stream; import com.twilio.base.Creator; @@ -32,11 +30,9 @@ import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildIt import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; -import org.joda.time.DateTimeZone; class TwilioProcessor { @@ -63,7 +59,7 @@ class TwilioProcessor { // Register Twilio API CRUD generator classes for reflection String[] reflectiveClasses = Stream.of(Creator.class, Deleter.class, Fetcher.class, Reader.class, Updater.class) - .map(aClass -> aClass.getName()) + .map(Class::getName) .map(DotName::createSimple) .flatMap(dotName -> index.getAllKnownSubclasses(dotName).stream()) .map(classInfo -> classInfo.name().toString()) @@ -79,17 +75,4 @@ class TwilioProcessor { reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, endpointImplementors)); } - - @BuildStep - NativeImageResourceBuildItem nativeImageResources() { - // Add Joda timezone resources into the native image as it is required by com.twilio.converter.DateConverter - List<String> timezones = new ArrayList<>(); - for (String timezone : DateTimeZone.getAvailableIDs()) { - String[] zoneParts = timezone.split("/"); - if (zoneParts.length == 2) { - timezones.add(String.format("org/joda/time/tz/data/%s/%s", zoneParts[0], zoneParts[1])); - } - } - return new NativeImageResourceBuildItem(timezones); - } } diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3d51b66433..8747c68878 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2438,14 +2438,6 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> <exclusion> <groupId>org.checkerframework</groupId> <artifactId>checker-qual</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index c1410ef040..4c2b047166 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2342,14 +2342,6 @@ <groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>commons-logging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> - <exclusion> - <groupId>javax.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>javax.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>jaxb-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </exclusion> <exclusion> <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7662c29ab6..6126da82e8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2342,14 +2342,6 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>javax.activation-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> <exclusion> <groupId>org.checkerframework</groupId> <artifactId>checker-qual</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 37c4042e6f..5b6654def0 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -2342,14 +2342,6 @@ <groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>commons-logging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> - <exclusion> - <groupId>javax.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>javax.activation-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>jaxb-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </exclusion> <exclusion> <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
