[tomee-jakarta] branch master updated: Instead of rewriting namespace in the byte code, let's try to hot swap implementations for Eclipselink and Mojora and use a Jakarta compatible version

[jl...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 91ec1c3  Instead of rewriting namespace in the byte code, let's try to hot swap implementations for Eclipselink and Mojora and use a Jakarta compatible version
91ec1c3 is described below

commit 91ec1c3df30c3ea953082b60e2676c7ce71475a1
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Wed Jan 27 00:30:26 2021 +0100

    Instead of rewriting namespace in the byte code, let's try to hot swap implementations for Eclipselink and Mojora and use a Jakarta compatible version
---
 pom.xml                           | 36 +++++++++++++++++++++++++++++++++++-
 src/main/assembly/tomee-plume.xml | 12 ++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index efa0ee6..fda5c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,9 @@
     <plus.work-dir>${project.build.directory}/plus-work-dir</plus.work-dir>
     <plume.work-dir>${project.build.directory}/plume-work-dir</plume.work-dir>
     <microprofile.work-dir>${project.build.directory}/microprofile-work-dir</microprofile.work-dir>
+
+    <mojarra.version>3.0.0</mojarra.version>
+    <version.eclipselink>3.0.0</version.eclipselink>
   </properties>
 
   <dependencies>
@@ -147,6 +150,37 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>jakarta.faces</artifactId>
+      <version>${mojarra.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>eclipselink</artifactId>
+      <version>${version.eclipselink}</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.persistence</groupId>
+          <artifactId>javax.persistence</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.persistence</groupId>
+          <artifactId>jakarta.persistence</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.validation</groupId>
+          <artifactId>validation-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.glassfish</groupId>
+          <artifactId>javax.json</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <build>
@@ -324,7 +358,7 @@
               <goal>attach-artifact</goal>
             </goals>
             <configuration>
-              <artifacts>
+            <artifacts>
                 <artifact>
                   <file>${project.build.directory}/apache-tomee-webprofile-${project.version}.zip</file>
                   <type>zip</type>
diff --git a/src/main/assembly/tomee-plume.xml b/src/main/assembly/tomee-plume.xml
index bb71e05..e8b2966 100644
--- a/src/main/assembly/tomee-plume.xml
+++ b/src/main/assembly/tomee-plume.xml
@@ -32,7 +32,19 @@
       <includes>
         <include>**/*</include>
       </includes>
+      <excludes>
+        <exclude>%regex[lib/jakarta.faces(-api|-impl)?-.*.jar]</exclude>
+        <exclude>%regex[lib/eclipselink(-api|-impl)?-.*.jar]</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/apache-tomee-plume-${project.version}/lib</outputDirectory>
+      <scope>runtime</scope>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+    </dependencySet>
+  </dependencySets>
 </assembly>