From 4f161927eb0ae02222e8c39044cb3e0bdc6c42ed Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 10 Jun 2021 14:00:23 -0700 Subject: [PATCH] Wrt #146: remove "jakarta" classifier production from 2.13 build --- base/pom.xml | 66 +------------------------------------ cbor/pom.xml | 69 +-------------------------------------- datatypes/pom.xml | 66 +------------------------------------ json/pom.xml | 69 +-------------------------------------- pom.xml | 2 +- release-notes/VERSION-2.x | 4 ++- smile/pom.xml | 69 +-------------------------------------- xml/pom.xml | 66 +------------------------------------ yaml/pom.xml | 69 +-------------------------------------- 9 files changed, 11 insertions(+), 469 deletions(-) diff --git a/base/pom.xml b/base/pom.xml index c5c19e3f..dc466e51 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -12,7 +12,7 @@ 2.13.0-SNAPSHOT jackson-jaxrs-base - Jackson-JAXRS-base + Jackson-JAXRS: base bundle Pile of code that is shared by all Jackson-based JAX-RS providers. @@ -52,70 +52,6 @@ ${project.groupId}.annotation.*;version=${project.version} moditect-maven-plugin - - org.apache.maven.plugins - maven-shade-plugin - - - jakarta - package - - shade - - - true - jakarta - false - - - ${project.groupId}:${project.artifactId} - - - - - ${project.groupId}:${project.artifactId} - - META-INF/MANIFEST.MF - - - - - - javax.xml.bind - jakarta.xml.bind - - - javax.ws.rs - jakarta.ws.rs - - - javax.annotation - jakarta.annotation - - - javax.validation - jakarta.validation - - - - - - META-INF/MANIFEST.MF - ${build.directory}/jakarta/MANIFEST.MF - - - - - - - - io.yupiik.maven - maven-shade-transformers - 0.0.1 - - - - diff --git a/cbor/pom.xml b/cbor/pom.xml index baa1b0be..6c46ee4f 100644 --- a/cbor/pom.xml +++ b/cbor/pom.xml @@ -12,7 +12,7 @@ 2.13.0-SNAPSHOT jackson-jaxrs-cbor-provider - Jackson-JAXRS-CBOR + Jackson-JAXRS: CBOR bundle Functionality to handle CBOR encoded input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. @@ -90,73 +90,6 @@ moditect-maven-plugin - - - org.apache.maven.plugins - maven-shade-plugin - - - jakarta - package - - shade - - - true - jakarta - false - - - ${project.groupId}:${project.artifactId} - - - - - ${project.groupId}:${project.artifactId} - - META-INF/MANIFEST.MF - - - - - - javax.xml.bind - jakarta.xml.bind - - - javax.ws.rs - jakarta.ws.rs - - - javax.annotation - jakarta.annotation - - - javax.validation - jakarta.validation - - - - - - META-INF/MANIFEST.MF - ${build.directory}/jakarta/MANIFEST.MF - - - - - - - - io.yupiik.maven - maven-shade-transformers - 0.0.1 - - - - diff --git a/datatypes/pom.xml b/datatypes/pom.xml index 6560d4df..c31b2389 100644 --- a/datatypes/pom.xml +++ b/datatypes/pom.xml @@ -14,7 +14,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jaxrs - Jackson-JAXRS-Datatypes + Jackson-JAXRS: Datatypes bundle Functionality for reading/writing core JAX-RS helper types @@ -77,70 +77,6 @@ moditect-maven-plugin - - org.apache.maven.plugins - maven-shade-plugin - - - jakarta - package - - shade - - - true - jakarta - false - - - ${project.groupId}:${project.artifactId} - - - - - ${project.groupId}:${project.artifactId} - - META-INF/MANIFEST.MF - - - - - - javax.xml.bind - jakarta.xml.bind - - - javax.ws.rs - jakarta.ws.rs - - - javax.annotation - jakarta.annotation - - - javax.validation - jakarta.validation - - - - - - META-INF/MANIFEST.MF - ${build.directory}/jakarta/MANIFEST.MF - - - - - - - - io.yupiik.maven - maven-shade-transformers - 0.0.1 - - - - diff --git a/json/pom.xml b/json/pom.xml index 3dd37d1c..29841a9a 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -12,7 +12,7 @@ 2.13.0-SNAPSHOT jackson-jaxrs-json-provider - Jackson-JAXRS-JSON + Jackson-JAXRS: JSON bundle Functionality to handle JSON input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. @@ -112,73 +112,6 @@ moditect-maven-plugin - - - org.apache.maven.plugins - maven-shade-plugin - - - jakarta - package - - shade - - - true - jakarta - false - - - ${project.groupId}:${project.artifactId} - - - - - ${project.groupId}:${project.artifactId} - - META-INF/MANIFEST.MF - - - - - - javax.xml.bind - jakarta.xml.bind - - - javax.ws.rs - jakarta.ws.rs - - - javax.annotation - jakarta.annotation - - - javax.validation - jakarta.validation - - - - - - META-INF/MANIFEST.MF - ${build.directory}/jakarta/MANIFEST.MF - - - - - - - - io.yupiik.maven - maven-shade-transformers - 0.0.1 - - - - diff --git a/pom.xml b/pom.xml index 837add43..4a51b058 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-providers - Jackson JAX-RS + Jackson: JAX-RS (parent) 2.13.0-SNAPSHOT pom Parent for Jackson JAX-RS providers diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 88650bf0..470c299e 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -14,7 +14,9 @@ Sub-modules: #134: Remove work-around for JAX-RS 1.x wrt JAX-RS 2 type `NoContentException` #146: Create new alternate jackson-jakarta-rs-providers repo for Jakarta - (not Javax) RS implementation + (not Javax) RS implementation -- also remove "jakarta" classifier variants + from this project + - Update `jakarta.xml.bind-api` dep (2.3.2 -> 2.3.3) 2.12.3 (12-Apr-2021) diff --git a/smile/pom.xml b/smile/pom.xml index 958b3a6e..125d765f 100644 --- a/smile/pom.xml +++ b/smile/pom.xml @@ -12,7 +12,7 @@ 2.13.0-SNAPSHOT jackson-jaxrs-smile-provider - Jackson-JAXRS-Smile + Jackson-JAXRS: Smile bundle Functionality to handle Smile (binary JSON) input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. @@ -89,73 +89,6 @@ org.moditect moditect-maven-plugin - - - - org.apache.maven.plugins - maven-shade-plugin - - - jakarta - package - - shade - - - true - jakarta - false - - - ${project.groupId}:${project.artifactId} - - - - - ${project.groupId}:${project.artifactId} - - META-INF/MANIFEST.MF - - - - - - javax.xml.bind - jakarta.xml.bind - - - javax.ws.rs - jakarta.ws.rs - - - javax.annotation - jakarta.annotation - - - javax.validation - jakarta.validation - - - - - - META-INF/MANIFEST.MF - ${build.directory}/jakarta/MANIFEST.MF - - - - - - - - io.yupiik.maven - maven-shade-transformers - 0.0.1 - - - diff --git a/xml/pom.xml b/xml/pom.xml index 7ce39c34..e472fb55 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -12,7 +12,7 @@ 2.13.0-SNAPSHOT jackson-jaxrs-xml-provider - Jackson-JAXRS-XML + Jackson-JAXRS: XML bundle Functionality to handle XML input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. @@ -114,70 +114,6 @@ moditect-maven-plugin - - org.apache.maven.plugins - maven-shade-plugin - - - jakarta - package - - shade - - - true - jakarta - false - - - ${project.groupId}:${project.artifactId} - - - - - ${project.groupId}:${project.artifactId} - - META-INF/MANIFEST.MF - - - - - - javax.xml.bind - jakarta.xml.bind - - - javax.ws.rs - jakarta.ws.rs - - - javax.annotation - jakarta.annotation - - - javax.validation - jakarta.validation - - - - - - META-INF/MANIFEST.MF - ${build.directory}/jakarta/MANIFEST.MF - - - - - - - - io.yupiik.maven - maven-shade-transformers - 0.0.1 - - - - diff --git a/yaml/pom.xml b/yaml/pom.xml index a9b4986d..a28e0e6b 100644 --- a/yaml/pom.xml +++ b/yaml/pom.xml @@ -12,7 +12,7 @@ 2.13.0-SNAPSHOT jackson-jaxrs-yaml-provider - Jackson-JAXRS-YAML + Jackson-JAXRS: YAML bundle Functionality to handle YAML input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. @@ -105,73 +105,6 @@ using standard Jackson data binding. moditect-maven-plugin - - - org.apache.maven.plugins - maven-shade-plugin - - - jakarta - package - - shade - - - true - jakarta - false - - - ${project.groupId}:${project.artifactId} - - - - - ${project.groupId}:${project.artifactId} - - META-INF/MANIFEST.MF - - - - - - javax.xml.bind - jakarta.xml.bind - - - javax.ws.rs - jakarta.ws.rs - - - javax.annotation - jakarta.annotation - - - javax.validation - jakarta.validation - - - - - - META-INF/MANIFEST.MF - ${build.directory}/jakarta/MANIFEST.MF - - - - - - - - io.yupiik.maven - maven-shade-transformers - 0.0.1 - - - -