This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit f601170acf17c861321a1633d0b2abd1aaafe716 Author: David Blevins <[email protected]> AuthorDate: Sun Apr 25 02:08:42 2021 -0700 Update javax packages to jakarta. Re-add to Plus and MicroProfile --- tomee/tomee-microprofile-webapp/pom.xml | 3 --- tomee/tomee-plus-webapp/pom.xml | 3 --- .../apache/cxf/jaxrs/provider/ProviderFactory.java | 26 +++++++++++----------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml index 1077256..346a751 100644 --- a/tomee/tomee-microprofile-webapp/pom.xml +++ b/tomee/tomee-microprofile-webapp/pom.xml @@ -470,9 +470,6 @@ <patchSources> <source>${project.basedir}/../../transform/src/patch/java/</source> </patchSources> - <sourceExcludes> - <exclude>org/apache/cxf</exclude> - </sourceExcludes> <replacements> <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties> </replacements> diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml index dc94e2a..36f2284 100644 --- a/tomee/tomee-plus-webapp/pom.xml +++ b/tomee/tomee-plus-webapp/pom.xml @@ -500,9 +500,6 @@ <patchSources> <source>${project.basedir}/../../transform/src/patch/java/</source> </patchSources> - <sourceExcludes> - <exclude>org/apache/cxf</exclude> - </sourceExcludes> <replacements> <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties> </replacements> diff --git a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java index ffd8083..3963b5b 100644 --- a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java +++ b/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java @@ -39,19 +39,19 @@ import java.util.Set; import java.util.TreeMap; import java.util.logging.Logger; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.apache.cxf.Bus; import org.apache.cxf.common.classloader.ClassLoaderUtils;
