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 9577f25a64d03ab18007c4b921158c44f3a42453 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Sat Jul 20 15:21:04 2019 +0200 Move XStream processor from salesforce to a dedicated extension #34 --- bom/pom.xml | 5 + build-parent/pom.xml | 7 + extensions/jetty-common/runtime/pom.xml | 2 +- extensions/pom.xml | 1 + extensions/salesforce/deployment/pom.xml | 4 + .../salesforce/deployment/XStreamProcessor.java | 226 -------------------- extensions/salesforce/runtime/pom.xml | 4 + .../deployment/pom.xml | 12 +- .../common/deployment/XStreamProcessor.java | 232 +++++++++++++++++++++ extensions/{ => xstream-common}/pom.xml | 33 +-- .../runtime/pom.xml | 12 +- 11 files changed, 275 insertions(+), 263 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index df76d4b..2874f60 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -174,6 +174,11 @@ <artifactId>camel-quarkus-jetty-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-xstream-common</artifactId> + <version>${project.version}</version> + </dependency> <!-- Quarkus Camel --> <dependency> diff --git a/build-parent/pom.xml b/build-parent/pom.xml index a4b61e3..3bab360 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -37,6 +37,7 @@ <groovy.version>2.5.7</groovy.version> <jetty.version>9.4.18.v20190429</jetty.version> + <xstream.version>1.4.11</xstream.version> <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version> <maven-checkstyle.version>7.6.1</maven-checkstyle.version> @@ -78,6 +79,12 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-xstream-common-deployment</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </dependencyManagement> diff --git a/extensions/jetty-common/runtime/pom.xml b/extensions/jetty-common/runtime/pom.xml index b37a50e..f9483b7 100644 --- a/extensions/jetty-common/runtime/pom.xml +++ b/extensions/jetty-common/runtime/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>camel-quarkus-jetty-common</artifactId> - <name>Camel Quarkus :: Jetty :: Common</name> + <name>Camel Quarkus :: Jetty :: Common :: Runtime</name> <dependencies> <dependency> diff --git a/extensions/pom.xml b/extensions/pom.xml index ad3c3af..c90949a 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -34,6 +34,7 @@ <modules> <module>jetty-common</module> + <module>xstream-common</module> <module>netty4-http</module> <module>core</module> <module>infinispan</module> diff --git a/extensions/salesforce/deployment/pom.xml b/extensions/salesforce/deployment/pom.xml index e83f30f..ed4f8c1 100644 --- a/extensions/salesforce/deployment/pom.xml +++ b/extensions/salesforce/deployment/pom.xml @@ -41,6 +41,10 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-xstream-common-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-salesforce</artifactId> </dependency> </dependencies> diff --git a/extensions/salesforce/deployment/src/main/java/org/apache/camel/quarkus/component/salesforce/deployment/XStreamProcessor.java b/extensions/salesforce/deployment/src/main/java/org/apache/camel/quarkus/component/salesforce/deployment/XStreamProcessor.java deleted file mode 100644 index b2c0a44..0000000 --- a/extensions/salesforce/deployment/src/main/java/org/apache/camel/quarkus/component/salesforce/deployment/XStreamProcessor.java +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.salesforce.deployment; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; - -import com.thoughtworks.xstream.converters.Converter; -import com.thoughtworks.xstream.converters.ConverterLookup; -import com.thoughtworks.xstream.converters.ConverterRegistry; -import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; -import com.thoughtworks.xstream.core.ClassLoaderReference; -import com.thoughtworks.xstream.mapper.AnnotationConfiguration; -import com.thoughtworks.xstream.mapper.CGLIBMapper; -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; - -public class XStreamProcessor { - - private static final String[] INTERFACES_TO_REGISTER = { - Converter.class.getName(), - Mapper.class.getName() - }; - - private static final Set<String> EXCLUDED_CLASSES = new HashSet<>(Arrays.asList(CGLIBMapper.class.getName())); - - @BuildStep(applicationArchiveMarkers = "com/thoughtworks/xstream/XStream.class") - void process(CombinedIndexBuildItem indexBuildItem, - BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer) { - for (String className : INTERFACES_TO_REGISTER) { - for (ClassInfo i : indexBuildItem.getIndex().getAllKnownImplementors(DotName.createSimple(className))) { - String name = i.name().toString(); - if (!EXCLUDED_CLASSES.contains(name)) { - reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, name)); - } - } - } - reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, - Mapper.class, - Mapper.Null.class, - ConverterRegistry.class, - ConverterLookup.class, - ClassLoaderReference.class, - ReflectionProvider.class, - AnnotationConfiguration.class)); - - reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, - Boolean.class, - Byte.class, - Character.class, - Short.class, - Integer.class, - Long.class, - Float.class, - Double.class, - java.lang.Void.class, - java.lang.Object.class)); - - reflectiveClassBuildItemBuildProducer - .produce(new ReflectiveClassBuildItem(false, false, false, Class.class, ClassLoader.class)); - - reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, - "com.thoughtworks.xstream.core.JVM$Test", - "com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider", - "com.thoughtworks.xstream.core.JVM", - "com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider", - "com.thoughtworks.xstream.converters.reflection.FieldUtil15", - "java.lang.Void", - "java.lang.Object", - "com.thoughtworks.xstream.core.util.CustomObjectOutputStream", - "java.awt.Color", - "javax.swing.LookAndFeel", - "java.sql.Date", - "com.thoughtworks.xstream.core.util.Base64JavaUtilCodec", - "com.thoughtworks.xstream.security.AnyTypePermission", - "java.lang.Number", - "java.math.BigInteger", - "java.math.BigDecimal", - "java.lang.StringBuffer", - "java.lang.String", - "java.lang.reflect.Method", - "java.lang.reflect.Constructor", - "java.lang.reflect.Field", - "java.util.Date", - "java.net.URI", - "java.net.URL", - "java.util.BitSet", - "java.util.Map", - "java.util.Map$Entry", - "java.util.Properties", - "java.util.List", - "java.util.Set", - "java.util.SortedSet", - "java.util.LinkedList", - "java.util.Vector", - "java.util.TreeMap", - "java.util.TreeSet", - "java.util.Hashtable", - "java.awt.Font", - "java.awt.font.TextAttribute", - "javax.activation.ActivationDataFlavor", - "java.sql.Timestamp", - "java.sql.Time", - "java.io.File", - "java.util.Locale", - "java.util.Calendar", - "javax.security.auth.Subject", - "java.util.LinkedHashMap", - "java.util.LinkedHashSet", - "java.lang.StackTraceElement", - "java.util.Currency", - "java.nio.charset.Charset", - "javax.xml.datatype.Duration", - "java.util.concurrent.ConcurrentHashMap", - "java.util.EnumSet", - "java.util.EnumMap", - "java.lang.StringBuilder", - "java.util.UUID", - "java.nio.file.Path", - "java.time.Clock$FixedClock", - "java.time.Clock$OffsetClock", - "java.time.Clock$SystemClock", - "java.time.Clock$TickClock", - "java.time.DayOfWeek", - "java.time.Duration", - "java.time.Instant", - "java.time.LocalDate", - "java.time.LocalDateTime", - "java.time.LocalTime", - "java.time.Month", - "java.time.MonthDay", - "java.time.OffsetDateTime", - "java.time.OffsetTime", - "java.time.Period", - "java.time.Year", - "java.time.YearMonth", - "java.time.ZonedDateTime", - "java.time.ZoneId", - "java.time.chrono.Chronology", - "java.time.chrono.HijrahDate", - "java.time.chrono.HijrahEra", - "java.time.chrono.JapaneseDate", - "java.time.chrono.JapaneseEra", - "java.time.chrono.MinguoDate", - "java.time.chrono.MinguoEra", - "java.time.chrono.ThaiBuddhistDate", - "java.time.chrono.ThaiBuddhistEra", - "java.time.temporal.ChronoField", - "java.time.temporal.ChronoUnit", - "java.time.temporal.IsoFields$Field", - "java.time.temporal.IsoFields$Unit", - "java.time.temporal.JulianFields$Field", - "java.time.temporal.ValueRange", - "java.time.temporal.WeekFields", - "java.lang.invoke.SerializedLambda", - "java.util.HashMap", - "java.util.ArrayList", - "java.util.HashSet", - "java.util.GregorianCalendar", - "java.util.Comparator", - "java.util.SortedMap", - "java.util.Collection", - "java.lang.reflect.Proxy", - "java.lang.reflect.InvocationHandler", - "java.text.AttributedCharacterIterator$Attribute", - "com.thoughtworks.xstream.converters.extended.StackTraceElementConverter", - "com.thoughtworks.xstream.converters.extended.StackTraceElementFactory15", - "com.thoughtworks.xstream.converters.extended.CurrencyConverter", - "com.thoughtworks.xstream.converters.extended.CharsetConverter", - "com.thoughtworks.xstream.converters.extended.DurationConverter", - "com.thoughtworks.xstream.converters.basic.StringBuilderConverter", - "com.thoughtworks.xstream.converters.basic.UUIDConverter", - "com.thoughtworks.xstream.converters.extended.PathConverter", - "com.thoughtworks.xstream.converters.time.ChronologyConverter", - "com.thoughtworks.xstream.converters.time.DurationConverter", - "com.thoughtworks.xstream.converters.time.HijrahDateConverter", - "com.thoughtworks.xstream.converters.time.JapaneseDateConverter", - "com.thoughtworks.xstream.converters.time.JapaneseEraConverter", - "com.thoughtworks.xstream.converters.time.InstantConverter", - "com.thoughtworks.xstream.converters.time.LocalDateConverter", - "com.thoughtworks.xstream.converters.time.LocalDateTimeConverter", - "com.thoughtworks.xstream.converters.time.LocalTimeConverter", - "com.thoughtworks.xstream.converters.time.MinguoDateConverter", - "com.thoughtworks.xstream.converters.time.MonthDayConverter", - "com.thoughtworks.xstream.converters.time.OffsetDateTimeConverter", - "com.thoughtworks.xstream.converters.time.OffsetTimeConverter", - "com.thoughtworks.xstream.converters.time.PeriodConverter", - "com.thoughtworks.xstream.converters.time.ThaiBuddhistDateConverter", - "com.thoughtworks.xstream.converters.time.YearConverter", - "com.thoughtworks.xstream.converters.time.YearMonthConverter", - "com.thoughtworks.xstream.converters.time.ZonedDateTimeConverter", - "com.thoughtworks.xstream.converters.time.ZoneIdConverter", - "java.nio.file.Paths", - "[Ljava.lang.String;", - "java.time.ZoneOffset", - "java.time.ZoneRegion", - "java.time.chrono.HijrahChronology", - "java.time.chrono.IsoChronology", - "java.time.chrono.JapaneseChronology", - "java.time.chrono.MinguoChronology", - "java.time.chrono.ThaiBuddhistChronology")); - - } -} diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml index a8af007..7310976 100644 --- a/extensions/salesforce/runtime/pom.xml +++ b/extensions/salesforce/runtime/pom.xml @@ -40,6 +40,10 @@ <artifactId>camel-quarkus-jetty-common</artifactId> </dependency> <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-xstream-common</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-salesforce</artifactId> </dependency> diff --git a/extensions/salesforce/deployment/pom.xml b/extensions/xstream-common/deployment/pom.xml similarity index 85% copy from extensions/salesforce/deployment/pom.xml copy to extensions/xstream-common/deployment/pom.xml index e83f30f..212d891 100644 --- a/extensions/salesforce/deployment/pom.xml +++ b/extensions/xstream-common/deployment/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-salesforce-parent</artifactId> + <artifactId>camel-quarkus-xstream-common-parent</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-salesforce-deployment</artifactId> - <name>Camel Quarkus :: Salesforce :: Deployment</name> + <artifactId>camel-quarkus-xstream-common-deployment</artifactId> + <name>Camel Quarkus :: XStream :: Common :: Deployment</name> <dependencies> <dependency> @@ -37,11 +37,7 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-jetty-common-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-salesforce</artifactId> + <artifactId>camel-quarkus-xstream-common</artifactId> </dependency> </dependencies> diff --git a/extensions/xstream-common/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java b/extensions/xstream-common/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java new file mode 100644 index 0000000..434d6c4 --- /dev/null +++ b/extensions/xstream-common/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java @@ -0,0 +1,232 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.xstream.common.deployment; + +import java.util.Arrays; +import java.util.List; + +import com.thoughtworks.xstream.converters.Converter; +import com.thoughtworks.xstream.converters.ConverterLookup; +import com.thoughtworks.xstream.converters.ConverterRegistry; +import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; +import com.thoughtworks.xstream.core.ClassLoaderReference; +import com.thoughtworks.xstream.mapper.AnnotationConfiguration; +import com.thoughtworks.xstream.mapper.CGLIBMapper; +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 org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; + + +public class XStreamProcessor { + + private static final List<String> INTERFACES_TO_REGISTER = Arrays.asList( + Converter.class.getName(), + Mapper.class.getName() + ); + + private static final List<String> EXCLUDED_CLASSES = Arrays.asList( + CGLIBMapper.class.getName() + ); + + @BuildStep(applicationArchiveMarkers = "com/thoughtworks/xstream/XStream.class") + void process(CombinedIndexBuildItem indexBuildItem, + BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer) { + + for (String className : INTERFACES_TO_REGISTER) { + for (ClassInfo i : indexBuildItem.getIndex().getAllKnownImplementors(DotName.createSimple(className))) { + String name = i.name().toString(); + + if (!EXCLUDED_CLASSES.contains(name)) { + reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, name)); + } + } + } + + reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, + Mapper.class, + Mapper.Null.class, + ConverterRegistry.class, + ConverterLookup.class, + ClassLoaderReference.class, + ReflectionProvider.class, + AnnotationConfiguration.class) + ); + + reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, + Boolean.class, + Byte.class, + Character.class, + Short.class, + Integer.class, + Long.class, + Float.class, + Double.class, + Void.class, + Object.class) + ); + + reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, false, + Class.class, + ClassLoader.class) + ); + + reflectiveClassBuildItemBuildProducer.produce(new ReflectiveClassBuildItem(false, false, + "com.thoughtworks.xstream.core.JVM$Test", + "com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider", + "com.thoughtworks.xstream.core.JVM", + "com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider", + "com.thoughtworks.xstream.converters.reflection.FieldUtil15", + "com.thoughtworks.xstream.core.util.CustomObjectOutputStream", + "com.thoughtworks.xstream.core.util.Base64JavaUtilCodec", + "com.thoughtworks.xstream.security.AnyTypePermission", + "com.thoughtworks.xstream.converters.extended.StackTraceElementConverter", + "com.thoughtworks.xstream.converters.extended.StackTraceElementFactory15", + "com.thoughtworks.xstream.converters.extended.CurrencyConverter", + "com.thoughtworks.xstream.converters.extended.CharsetConverter", + "com.thoughtworks.xstream.converters.extended.DurationConverter", + "com.thoughtworks.xstream.converters.basic.StringBuilderConverter", + "com.thoughtworks.xstream.converters.basic.UUIDConverter", + "com.thoughtworks.xstream.converters.extended.PathConverter", + "com.thoughtworks.xstream.converters.time.ChronologyConverter", + "com.thoughtworks.xstream.converters.time.DurationConverter", + "com.thoughtworks.xstream.converters.time.HijrahDateConverter", + "com.thoughtworks.xstream.converters.time.JapaneseDateConverter", + "com.thoughtworks.xstream.converters.time.JapaneseEraConverter", + "com.thoughtworks.xstream.converters.time.InstantConverter", + "com.thoughtworks.xstream.converters.time.LocalDateConverter", + "com.thoughtworks.xstream.converters.time.LocalDateTimeConverter", + "com.thoughtworks.xstream.converters.time.LocalTimeConverter", + "com.thoughtworks.xstream.converters.time.MinguoDateConverter", + "com.thoughtworks.xstream.converters.time.MonthDayConverter", + "com.thoughtworks.xstream.converters.time.OffsetDateTimeConverter", + "com.thoughtworks.xstream.converters.time.OffsetTimeConverter", + "com.thoughtworks.xstream.converters.time.PeriodConverter", + "com.thoughtworks.xstream.converters.time.ThaiBuddhistDateConverter", + "com.thoughtworks.xstream.converters.time.YearConverter", + "com.thoughtworks.xstream.converters.time.YearMonthConverter", + "com.thoughtworks.xstream.converters.time.ZonedDateTimeConverter", + "com.thoughtworks.xstream.converters.time.ZoneIdConverter", + "java.lang.Void", + "java.lang.Object", + "java.awt.Color", + "javax.swing.LookAndFeel", + "java.sql.Date", + "java.lang.Number", + "java.math.BigInteger", + "java.math.BigDecimal", + "java.lang.StringBuffer", + "java.lang.String", + "java.lang.reflect.Method", + "java.lang.reflect.Constructor", + "java.lang.reflect.Field", + "java.util.Date", + "java.net.URI", + "java.net.URL", + "java.util.BitSet", + "java.util.Map", + "java.util.Map$Entry", + "java.util.Properties", + "java.util.List", + "java.util.Set", + "java.util.SortedSet", + "java.util.LinkedList", + "java.util.Vector", + "java.util.TreeMap", + "java.util.TreeSet", + "java.util.Hashtable", + "java.awt.Font", + "java.awt.font.TextAttribute", + "javax.activation.ActivationDataFlavor", + "java.sql.Timestamp", + "java.sql.Time", + "java.io.File", + "java.util.Locale", + "java.util.Calendar", + "javax.security.auth.Subject", + "java.util.LinkedHashMap", + "java.util.LinkedHashSet", + "java.lang.StackTraceElement", + "java.util.Currency", + "java.nio.charset.Charset", + "javax.xml.datatype.Duration", + "java.util.concurrent.ConcurrentHashMap", + "java.util.EnumSet", + "java.util.EnumMap", + "java.lang.StringBuilder", + "java.util.UUID", + "java.nio.file.Path", + "java.time.Clock$FixedClock", + "java.time.Clock$OffsetClock", + "java.time.Clock$SystemClock", + "java.time.Clock$TickClock", + "java.time.DayOfWeek", + "java.time.Duration", + "java.time.Instant", + "java.time.LocalDate", + "java.time.LocalDateTime", + "java.time.LocalTime", + "java.time.Month", + "java.time.MonthDay", + "java.time.OffsetDateTime", + "java.time.OffsetTime", + "java.time.Period", + "java.time.Year", + "java.time.YearMonth", + "java.time.ZonedDateTime", + "java.time.ZoneId", + "java.time.chrono.Chronology", + "java.time.chrono.HijrahDate", + "java.time.chrono.HijrahEra", + "java.time.chrono.JapaneseDate", + "java.time.chrono.JapaneseEra", + "java.time.chrono.MinguoDate", + "java.time.chrono.MinguoEra", + "java.time.chrono.ThaiBuddhistDate", + "java.time.chrono.ThaiBuddhistEra", + "java.time.temporal.ChronoField", + "java.time.temporal.ChronoUnit", + "java.time.temporal.IsoFields$Field", + "java.time.temporal.IsoFields$Unit", + "java.time.temporal.JulianFields$Field", + "java.time.temporal.ValueRange", + "java.time.temporal.WeekFields", + "java.lang.invoke.SerializedLambda", + "java.util.HashMap", + "java.util.ArrayList", + "java.util.HashSet", + "java.util.GregorianCalendar", + "java.util.Comparator", + "java.util.SortedMap", + "java.util.Collection", + "java.lang.reflect.Proxy", + "java.lang.reflect.InvocationHandler", + "java.text.AttributedCharacterIterator$Attribute", + "java.nio.file.Paths", + "[Ljava.lang.String;", + "java.time.ZoneOffset", + "java.time.ZoneRegion", + "java.time.chrono.HijrahChronology", + "java.time.chrono.IsoChronology", + "java.time.chrono.JapaneseChronology", + "java.time.chrono.MinguoChronology", + "java.time.chrono.ThaiBuddhistChronology")); + } +} diff --git a/extensions/pom.xml b/extensions/xstream-common/pom.xml similarity index 57% copy from extensions/pom.xml copy to extensions/xstream-common/pom.xml index ad3c3af..5e6fe21 100644 --- a/extensions/pom.xml +++ b/extensions/xstream-common/pom.xml @@ -17,36 +17,25 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-parent</artifactId> + <artifactId>camel-quarkus-build-parent</artifactId> <version>0.0.1-SNAPSHOT</version> + <relativePath>../../build-parent/pom.xml</relativePath> </parent> - <artifactId>camel-quarkus-extensions</artifactId> - <packaging>pom</packaging> - - <name>Camel Quarkus :: Extensions</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>camel-quarkus-xstream-common-parent</artifactId> + <name>Camel Quarkus :: XStream :: Common</name> + <packaging>pom</packaging> <modules> - <module>jetty-common</module> - <module>netty4-http</module> - <module>core</module> - <module>infinispan</module> - <module>aws-s3</module> - <module>aws-sns</module> - <module>aws-sqs</module> - <module>jdbc</module> - <module>salesforce</module> - <module>servlet</module> - <module>log</module> - <module>direct</module> - <module>rest</module> - <module>timer</module> + <module>deployment</module> + <module>runtime</module> </modules> </project> diff --git a/extensions/jetty-common/runtime/pom.xml b/extensions/xstream-common/runtime/pom.xml similarity index 88% copy from extensions/jetty-common/runtime/pom.xml copy to extensions/xstream-common/runtime/pom.xml index b37a50e..41bed0c 100644 --- a/extensions/jetty-common/runtime/pom.xml +++ b/extensions/xstream-common/runtime/pom.xml @@ -22,13 +22,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-jetty-common-parent</artifactId> + <artifactId>camel-quarkus-xstream-common-parent</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-jetty-common</artifactId> - <name>Camel Quarkus :: Jetty :: Common</name> + <artifactId>camel-quarkus-xstream-common</artifactId> + <name>Camel Quarkus :: XStream :: Common :: Runtime</name> <dependencies> <dependency> @@ -36,9 +36,9 @@ <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - <version>${jetty.version}</version> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>${xstream.version}</version> </dependency> </dependencies>