Also consider XmlType as triggering the JAXB inclusion

XmlRootElement is optional so we need to trigger the JAXB inclusion with
XmlType too.

Author: gsmet

extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java

@@ -5,7 +5,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -61,6 +60,7 @@
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 
 class JaxbProcessor {
+
     private static final List<Class<?>> JAXB_REFLECTIVE_CLASSES = Arrays.asList(
             XmlAccessOrder.class,
             XmlAccessorType.class,
@@ -107,7 +107,7 @@ class JaxbProcessor {
     private static final DotName XML_SCHEMA = DotName.createSimple(XmlSchema.class.getName());
     private static final DotName XML_JAVA_TYPE_ADAPTER = DotName.createSimple(XmlJavaTypeAdapter.class.getName());
 
-    private static final List<DotName> REGISTER_TYPE_FOR_REFLECTION_ANNOTATIONS = Arrays.asList(XML_TYPE, XML_REGISTRY);
+    private static final List<DotName> JAXB_ROOT_ANNOTATIONS = Arrays.asList(XML_ROOT_ELEMENT, XML_TYPE, XML_REGISTRY);
 
     @Inject
     BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
@@ -128,26 +128,24 @@ void process(BuildProducer<NativeImageSystemPropertyBuildItem> nativeImageProps,
 
         IndexView index = combinedIndexBuildItem.getIndex();
 
-        Collection<AnnotationInstance> xmlRootElementInstances = index.getAnnotations(XML_ROOT_ELEMENT);
-        for (AnnotationInstance xmlRootElementInstance : xmlRootElementInstances) {
-            addReflectiveClass(true, true, xmlRootElementInstance.target().asClass().name().toString());
-        }
-        if (xmlRootElementInstances.isEmpty() &&
-                fileRoots.isEmpty()) {
-            return;
-        }
-
         // Register classes for reflection based on JAXB annotations
-        for (DotName registerTypeAnnotation : REGISTER_TYPE_FOR_REFLECTION_ANNOTATIONS) {
-            for (AnnotationInstance registerTypeForReflectionAnnotationInstance : index
-                    .getAnnotations(registerTypeAnnotation)) {
-                if (registerTypeForReflectionAnnotationInstance.target().kind() == Kind.CLASS) {
+        boolean jaxbRootAnnotationsDetected = false;
+
+        for (DotName jaxbRootAnnotation : JAXB_ROOT_ANNOTATIONS) {
+            for (AnnotationInstance jaxbRootAnnotationInstance : index
+                    .getAnnotations(jaxbRootAnnotation)) {
+                if (jaxbRootAnnotationInstance.target().kind() == Kind.CLASS) {
                     addReflectiveClass(true, true,
-                            registerTypeForReflectionAnnotationInstance.target().asClass().name().toString());
+                            jaxbRootAnnotationInstance.target().asClass().name().toString());
+                    jaxbRootAnnotationsDetected = true;
                 }
             }
         }
 
+        if (!jaxbRootAnnotationsDetected && fileRoots.isEmpty()) {
+            return;
+        }
+
         // Register package-infos for reflection
         for (AnnotationInstance xmlSchemaInstance : index.getAnnotations(XML_SCHEMA)) {
             if (xmlSchemaInstance.target().kind() == Kind.CLASS) {