You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/04/25 09:09:01 UTC

[tomee-jakarta] branch master updated (c67ac7c -> f601170)

This is an automated email from the ASF dual-hosted git repository.

dblevins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git.


    from c67ac7c  Exclude CXF from patching of MicroProfile dist
     new c836ca0  Exclude CXF from patching of Plus dist.  We need to fix Plus.
     new f601170  Update javax packages to jakarta.  Re-add to Plus and MicroProfile

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tomee/tomee-microprofile-webapp/pom.xml            |  3 ---
 .../apache/cxf/jaxrs/provider/ProviderFactory.java | 26 +++++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

[tomee-jakarta] 01/02: Exclude CXF from patching of Plus dist. We need to fix Plus.

Posted by db...@apache.org.
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 c836ca0289057b6bf509d9ac408dda94c12dd193
Author: David Blevins <da...@gmail.com>
AuthorDate: Sun Apr 25 01:52:54 2021 -0700

    Exclude CXF from patching of Plus dist.  We need to fix Plus.
---
 tomee/tomee-plus-webapp/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 36f2284..dc94e2a 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -500,6 +500,9 @@
           <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>

[tomee-jakarta] 02/02: Update javax packages to jakarta. Re-add to Plus and MicroProfile

Posted by db...@apache.org.
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 <da...@gmail.com>
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;