require javax.xml as static/optional dependency and fix copyright

Signed-off-by: Tom Schindl <[email protected]>
eclipse-ee4j · Jun 9, 2021 · 6a502e8 · 6a502e8
1 parent 989c017
commit 6a502e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,7 +14,7 @@
     requires jakarta.json;
     requires jakarta.json.bind;
     requires java.logging;
-    requires java.xml;
+    requires static java.xml;
     requires static java.naming;
     requires static java.sql;
     requires static java.desktop;

diff --git a/src/main/java/org/eclipse/yasson/internal/serializer/DefaultSerializers.java b/src/main/java/org/eclipse/yasson/internal/serializer/DefaultSerializers.java
@@ -142,9 +142,11 @@ private static Map<Class<?>, SerializerProviderWrapper> initSerializers() {
                         new SerializerProviderWrapper(BigDecimalTypeSerializer::new, BigDecimalTypeDeserializer::new));
         serializers.put(ZoneOffset.class,
                         new SerializerProviderWrapper(ZoneOffsetTypeSerializer::new, ZoneOffsetTypeDeserializer::new));
-        serializers.put(XMLGregorianCalendar.class,
-                        new SerializerProviderWrapper(XMLGregorianCalendarTypeSerializer::new,
-                                                      XMLGregorianCalendarTypeDeserializer::new));
+        if(isClassAvailable("javax.xml.datatype.XMLGregorianCalendar")) {
+            serializers.put(XMLGregorianCalendar.class,
+                    new SerializerProviderWrapper(XMLGregorianCalendarTypeSerializer::new,
+                                                  XMLGregorianCalendarTypeDeserializer::new));        	
+        }
         serializers.put(YearMonth.class,
                         new SerializerProviderWrapper(YearMonthTypeSerializer::new, YearMonthTypeDeserializer::new));
         serializers.put(MonthDay.class,