Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

require java.xml directly so that java.desktop must not be available #491

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,6 +14,7 @@
requires jakarta.json;
requires jakarta.json.bind;
requires java.logging;
requires static java.xml;
requires static java.naming;
requires static java.sql;
requires static java.desktop;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,13 @@ 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,
Expand Down