Skip to content

Commit 3c13d9f

Browse files
committed
Updates from PR #81
1 parent 1e1351a commit 3c13d9f

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

jaxb/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,23 @@ data-binding.
4848
</dependency>
4949
<!-- 14-Mar-2019, tatu: Looks like this is needed for JDK11 and later
5050
-->
51+
<!-- 05-May-2019, tatu: Apparently this isn't as good as alternative
5152
<dependency>
5253
<groupId>javax.activation</groupId>
5354
<artifactId>javax.activation-api</artifactId>
5455
<version>1.2.0</version>
5556
<scope>provided</scope>
5657
</dependency>
58+
-->
59+
60+
<!-- ... and this is the real mccoy? -->
61+
<dependency>
62+
<groupId>com.jwebmp.thirdparty</groupId>
63+
<artifactId>javax.activation</artifactId>
64+
<version>0.67.0.5</version>
65+
<scope>provided</scope>
66+
</dependency>
67+
5768
</dependencies>
5869

5970
<build>

jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationModule.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.core.Version;
5-
import com.fasterxml.jackson.databind.Module;
65

76
/**
87
* Module that can be registered to add support for JAXB annotations.
@@ -15,7 +14,7 @@
1514
* (by default, JAXB annotations are used as {@link Priority#PRIMARY}
1615
* annotations).
1716
*/
18-
public class JaxbAnnotationModule extends Module
17+
public class JaxbAnnotationModule extends com.fasterxml.jackson.databind.Module
1918
{
2019
/**
2120
* Enumeration that defines how we use JAXB Annotations: either

jaxb/src/moditect/module-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
module com.fasterxml.jackson.module.jaxb {
44
requires java.logging;
5+
requires java.xml;
56
requires java.xml.bind;
67
// This is for `BeanIntrospector`... should do away with (only need "Introspector.decapitalize")
78
requires java.desktop;

0 commit comments

Comments
 (0)