diff --git a/smile/pom.xml b/smile/pom.xml index e35f72fd..78a6249f 100644 --- a/smile/pom.xml +++ b/smile/pom.xml @@ -87,11 +87,6 @@ - - org.moditect - moditect-maven-plugin - - diff --git a/smile/src/main/java/module-info.java b/smile/src/main/java/module-info.java new file mode 100644 index 00000000..983c770a --- /dev/null +++ b/smile/src/main/java/module-info.java @@ -0,0 +1,21 @@ +// JAX-RS Smile module-info for Main artifact +module tools.jackson.jaxrs.smile +{ + requires tools.jackson.core; + requires transitive tools.jackson.databind; + requires tools.jackson.dataformat.smile; + requires tools.jackson.module.jaxb; + + requires tools.jackson.jaxrs.base; + + requires java.ws.rs; + + exports tools.jackson.jaxrs.smile; + // [jaxrs-providers#119]: CXF, RESTEasy, OpenAPI require reflective access + opens tools.jackson.jaxrs.smile; + + provides javax.ws.rs.ext.MessageBodyReader with + tools.jackson.jaxrs.smile.JacksonSmileProvider; + provides javax.ws.rs.ext.MessageBodyWriter with + tools.jackson.jaxrs.smile.JacksonSmileProvider; +} diff --git a/smile/src/moditect/module-info.java b/smile/src/moditect/module-info.java deleted file mode 100644 index 60f2e2be..00000000 --- a/smile/src/moditect/module-info.java +++ /dev/null @@ -1,29 +0,0 @@ -module tools.jackson.jaxrs.smile { - exports tools.jackson.jaxrs.smile; - // [jaxrs-providers#119]: CXF, RESTEasy, OpenAPI require reflective access - opens tools.jackson.jaxrs.smile; - - requires tools.jackson.core; - requires tools.jackson.databind; - requires tools.jackson.dataformat.smile; - requires tools.jackson.module.jaxb; - - requires tools.jackson.jaxrs.base; - - //Allow multiple implementations of ws.rs - //oracle location - requires static javax.ws.rs.api; - //oracle location - requires static java.ws.rs; - //jakarta initial location - 2.x - requires static javax.ws.rs; - //jakarta 3.x final location - https://github.com/jboss/jboss-jakarta-jaxrs-api_spec - requires static jakarta.ws.rs; - //jakarta 3.x final location - https://github.com/eclipse-ee4j/jaxrs-api - requires static jakarta.ws.rs.api; - - provides javax.ws.rs.ext.MessageBodyReader with - tools.jackson.jaxrs.smile.JacksonSmileProvider; - provides javax.ws.rs.ext.MessageBodyWriter with - tools.jackson.jaxrs.smile.JacksonSmileProvider; -} diff --git a/smile/src/test/java/module-info.java b/smile/src/test/java/module-info.java new file mode 100644 index 00000000..817ebfe6 --- /dev/null +++ b/smile/src/test/java/module-info.java @@ -0,0 +1,24 @@ +// JAX-RS Smile module-info for (unit) Tests +module tools.jackson.jaxrs.smile +{ + // Since we are not split from Main artifact, will not + // need to depend on Main artifact -- but need its dependencies + + requires tools.jackson.core; + requires tools.jackson.databind; + requires tools.jackson.dataformat.smile; + requires tools.jackson.module.jaxb; + + requires tools.jackson.jaxrs.base; + + requires java.ws.rs; + + // Additional test lib/framework dependencies + requires junit; // JUnit 4 + + // Further, need to open up test packages for JUnit et al + + opens tools.jackson.jaxrs.smile; + opens tools.jackson.jaxrs.smile.dw; + opens tools.jackson.jaxrs.smile.jersey; +}