Skip to content

Commit 7caed3e

Browse files
committed
Backport #127 into 2.12, some additional cleanup
1 parent 9fc12d8 commit 7caed3e

File tree

8 files changed

+38
-31
lines changed

8 files changed

+38
-31
lines changed

base/src/moditect/module-info.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// Generated 28-Mar-2019 using Moditect maven plugin
1+
// Originally generated using Moditect maven plugin, last mod 14-Oct-2020
22
module com.fasterxml.jackson.jaxrs.base {
3-
requires com.fasterxml.jackson.annotation;
4-
5-
requires com.fasterxml.jackson.core;
6-
requires com.fasterxml.jackson.databind;
7-
//Allow multiple implementations of ws.rs
8-
requires static javax.ws.rs.api;
9-
requires static java.ws.rs;
10-
requires static jakarta.ws.rs.api;
11-
123
exports com.fasterxml.jackson.jaxrs.annotation;
134
exports com.fasterxml.jackson.jaxrs.base;
145
exports com.fasterxml.jackson.jaxrs.base.nocontent;
156
exports com.fasterxml.jackson.jaxrs.cfg;
167
exports com.fasterxml.jackson.jaxrs.util;
8+
9+
requires com.fasterxml.jackson.annotation;
10+
requires com.fasterxml.jackson.core;
11+
requires com.fasterxml.jackson.databind;
12+
13+
//Allow multiple implementations of ws.rs
14+
requires static javax.ws.rs.api;
15+
requires static java.ws.rs;
16+
requires static jakarta.ws.rs.api;
1717
}

cbor/src/moditect/module-info.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
// Generated 02-Apr-2019 using Moditect maven plugin
1+
// Originally generated using Moditect maven plugin, last mod 14-Oct-2020
22
module com.fasterxml.jackson.jaxrs.cbor {
3-
requires com.fasterxml.jackson.dataformat.cbor;
4-
requires com.fasterxml.jackson.module.jaxb;
3+
exports com.fasterxml.jackson.jaxrs.cbor;
4+
// [jaxrs-providers#119]: CXF, RESTEasy, OpenAPI require reflective access
5+
opens com.fasterxml.jackson.jaxrs.cbor;
56

67
requires com.fasterxml.jackson.core;
78
requires com.fasterxml.jackson.databind;
9+
requires com.fasterxml.jackson.dataformat.cbor;
10+
requires com.fasterxml.jackson.module.jaxb;
11+
812
requires com.fasterxml.jackson.jaxrs.base;
913

1014
requires static javax.ws.rs.api;
1115
requires static java.ws.rs;
1216
requires static jakarta.ws.rs.api;
1317

14-
exports com.fasterxml.jackson.jaxrs.cbor;
15-
1618
provides javax.ws.rs.ext.MessageBodyReader with
1719
com.fasterxml.jackson.jaxrs.cbor.JacksonCBORProvider;
1820
provides javax.ws.rs.ext.MessageBodyWriter with
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// Generated 02-Apr-2019 using Moditect maven plugin
1+
// Originally generated using Moditect maven plugin, last mod 14-Oct-2020
22
module com.fasterxml.jackson.datatype.jaxrs {
3+
exports com.fasterxml.jackson.datatype.jaxrs;
4+
35
requires com.fasterxml.jackson.core;
46
requires com.fasterxml.jackson.databind;
57

68
requires static javax.ws.rs.api;
79
requires static java.ws.rs;
810
requires static jakarta.ws.rs.api;
911

10-
exports com.fasterxml.jackson.datatype.jaxrs;
11-
1212
provides com.fasterxml.jackson.databind.Module with
1313
com.fasterxml.jackson.datatype.jaxrs.Jaxrs2TypesModule;
1414
}

json/src/moditect/module-info.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
// Originally generated using Moditect maven plugin
1+
// Originally generated using Moditect maven plugin, last mod 14-Oct-2020
22
module com.fasterxml.jackson.jaxrs.json {
33
exports com.fasterxml.jackson.jaxrs.json;
44
exports com.fasterxml.jackson.jaxrs.json.annotation;
5-
65
// 13-Nov-2019: [jaxrs-providers#119]: CXF, RESTEasy, OpenAPI require reflective access
76
opens com.fasterxml.jackson.jaxrs.json;
87

release-notes/VERSION-2.x

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Sub-modules:
1212

1313
2.12.0 (not yet released)
1414

15+
#127: Allow multiple implementations of JAX-RS for all providers
16+
(requested by fenixcitizen@github)
1517
- Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
1618

1719
2.11.3 (02-Oct-2020)

smile/src/moditect/module-info.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
// Generated 02-Apr-2019 using Moditect maven plugin
1+
// Originally generated using Moditect maven plugin, last mod 14-Oct-2020
22
module com.fasterxml.jackson.jaxrs.smile {
3+
exports com.fasterxml.jackson.jaxrs.smile;
4+
// [jaxrs-providers#119]: CXF, RESTEasy, OpenAPI require reflective access
5+
opens com.fasterxml.jackson.jaxrs.smile;
6+
37
requires com.fasterxml.jackson.core;
48
requires com.fasterxml.jackson.databind;
59
requires com.fasterxml.jackson.dataformat.smile;
@@ -11,8 +15,6 @@
1115
requires static java.ws.rs;
1216
requires static jakarta.ws.rs.api;
1317

14-
exports com.fasterxml.jackson.jaxrs.smile;
15-
1618
provides javax.ws.rs.ext.MessageBodyReader with
1719
com.fasterxml.jackson.jaxrs.smile.JacksonSmileProvider;
1820
provides javax.ws.rs.ext.MessageBodyWriter with

xml/src/moditect/module-info.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
// Generated 02-Apr-2019 using Moditect maven plugin
1+
// Originally generated using Moditect maven plugin, last mod 14-Oct-2020
22
module com.fasterxml.jackson.jaxrs.xml {
3+
exports com.fasterxml.jackson.jaxrs.xml;
4+
// [jaxrs-providers#119]: CXF, RESTEasy, OpenAPI require reflective access
5+
opens com.fasterxml.jackson.jaxrs.xml;
6+
37
requires com.fasterxml.jackson.core;
48
requires com.fasterxml.jackson.databind;
59
requires com.fasterxml.jackson.dataformat.xml;
@@ -11,11 +15,8 @@
1115
requires static java.ws.rs;
1216
requires static jakarta.ws.rs.api;
1317

14-
exports com.fasterxml.jackson.jaxrs.xml;
15-
1618
provides javax.ws.rs.ext.MessageBodyReader with
1719
com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
1820
provides javax.ws.rs.ext.MessageBodyWriter with
1921
com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
20-
2122
}

yaml/src/moditect/module-info.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
// Generated 02-Apr-2019 using Moditect maven plugin
1+
// Originally generated using Moditect maven plugin, last mod 14-Oct-2020
22
module com.fasterxml.jackson.jaxrs.yaml {
3+
exports com.fasterxml.jackson.jaxrs.yaml;
4+
// [jaxrs-providers#119]: CXF, RESTEasy, OpenAPI require reflective access
5+
opens com.fasterxml.jackson.jaxrs.yaml;
6+
37
requires com.fasterxml.jackson.core;
48
requires com.fasterxml.jackson.databind;
59
requires com.fasterxml.jackson.dataformat.yaml;
@@ -11,11 +15,8 @@
1115
requires static java.ws.rs;
1216
requires static jakarta.ws.rs.api;
1317

14-
exports com.fasterxml.jackson.jaxrs.yaml;
15-
1618
provides javax.ws.rs.ext.MessageBodyReader with
1719
com.fasterxml.jackson.jaxrs.yaml.JacksonYAMLProvider;
1820
provides javax.ws.rs.ext.MessageBodyWriter with
1921
com.fasterxml.jackson.jaxrs.yaml.JacksonYAMLProvider;
20-
2122
}

0 commit comments

Comments
 (0)