From dc8a8e9d2f77cf81531af78ec5a07bdc6ab7f324 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Mon, 16 Aug 2021 18:03:48 +0200
Subject: [PATCH 1/5] Maven build issue with Maven 3.8.2

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 pom.xml | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index bdf17d63cee..a16e39b3afb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1126,11 +1126,6 @@
                     <artifactId>xml-maven-plugin</artifactId>
                     <version>1.0.2</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.commonjava.maven.plugins</groupId>
-                    <artifactId>directory-maven-plugin</artifactId>
-                    <version>0.3.1</version>
-                </plugin>
                 <!--This plugin (g:org.kuali.maven.plugins) is used instead typical org.codehaus.mojo:properties-maven-plugin:1.0.0
                     due bug: "Circular property definition" if expression like this is used in the Maven pom
                     "<server.testrunner.prefix>${modelname}/${modelname}_ejb/</server.testrunner.prefix>"
@@ -1211,21 +1206,39 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.commonjava.maven.plugins</groupId>
-                <artifactId>directory-maven-plugin</artifactId>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>find-project-root</id>
                         <phase>validate</phase>
                         <goals>
-                            <goal>highest-basedir</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <property>project.root.location</property>
+                            <source>
+                                <![CDATA[
+                                def rootPom = project;
+                                log.info("Current project parent [rootPom.parent]:  " + rootPom.parent);
+                                log.info("Current project parent basedir [rootPom.parent.basedir]:  " + rootPom.parent.basedir);
+                                while (rootPom.parent.basedir != null) {
+                                    log.info("Current project [rootPom]:  " + rootPom);
+                                    log.info("Current project basedir [rootPom.basedir]:  " + rootPom.basedir);
+                                    log.info("parent project [rootPom.parent]:  " + rootPom.parent);
+                                    log.info("parent project basedir [rootPom.parent.basedir]:  " + rootPom.parent.basedir);
+                                    rootPom = rootPom.parent;
+                                }
+                                project.properties.setProperty("project.root.location", rootPom.basedir.toString());
+                                log.info("EclipseLink Parent project directory [project.root.location]:  " + project.properties['project.root.location']);
+                                log.info("Topmost parent directory [rootPom.basedir]:  " + rootPom.basedir);
+                                ]]>
+                            </source>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

From efef38a68c189e462bab57616ee3e4c7da495fae Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Mon, 16 Aug 2021 18:18:15 +0200
Subject: [PATCH 2/5] Maven build issue with Maven 3.8.2 fix

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 pom.xml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index a16e39b3afb..60ccb49b6c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1205,6 +1205,7 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <!--Resolve EclipseLink Parent project root directory-->
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
@@ -1218,27 +1219,18 @@
                         <configuration>
                             <source>
                                 <![CDATA[
-                                def rootPom = project;
-                                log.info("Current project parent [rootPom.parent]:  " + rootPom.parent);
-                                log.info("Current project parent basedir [rootPom.parent.basedir]:  " + rootPom.parent.basedir);
-                                while (rootPom.parent.basedir != null) {
-                                    log.info("Current project [rootPom]:  " + rootPom);
-                                    log.info("Current project basedir [rootPom.basedir]:  " + rootPom.basedir);
-                                    log.info("parent project [rootPom.parent]:  " + rootPom.parent);
-                                    log.info("parent project basedir [rootPom.parent.basedir]:  " + rootPom.parent.basedir);
-                                    rootPom = rootPom.parent;
-                                }
-                                project.properties.setProperty("project.root.location", rootPom.basedir.toString());
-                                log.info("EclipseLink Parent project directory [project.root.location]:  " + project.properties['project.root.location']);
-                                log.info("Topmost parent directory [rootPom.basedir]:  " + rootPom.basedir);
+                                    def rootPom = project;
+                                    while (rootPom.parent.groupId != "org.eclipse.ee4j") {
+                                        rootPom = rootPom.parent;
+                                    }
+                                    project.properties.setProperty("project.root.location", rootPom.basedir.toString());
+                                    log.info("EclipseLink Parent project directory [project.root.location]:  " + project.properties['project.root.location']);
                                 ]]>
                             </source>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

From 6cfcd524426d172eda79a38635aa574aeca54ab7 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Thu, 2 Sep 2021 10:53:56 +0200
Subject: [PATCH 3/5] Common resources (license files, test properties)
 assembly in Parent project

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 pom.xml                              | 32 ++++++++++++++++++++++++++
 src/main/assembly/common-license.xml | 34 ++++++++++++++++++++++++++++
 src/main/assembly/test-defaults.xml  | 33 +++++++++++++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 src/main/assembly/common-license.xml
 create mode 100644 src/main/assembly/test-defaults.xml

diff --git a/pom.xml b/pom.xml
index 60ccb49b6c1..c2d674211f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1231,6 +1231,38 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>license.jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/common-license.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-defaults.jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/test-defaults.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/src/main/assembly/common-license.xml b/src/main/assembly/common-license.xml
new file mode 100644
index 00000000000..04077ea109b
--- /dev/null
+++ b/src/main/assembly/common-license.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0 which is available at
+    http://www.eclipse.org/legal/epl-2.0,
+    or the Eclipse Distribution License v. 1.0 which is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>common-license.jar</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>LICENSE.md</include>
+                <include>NOTICE.md</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/assembly/test-defaults.xml b/src/main/assembly/test-defaults.xml
new file mode 100644
index 00000000000..9916c22f714
--- /dev/null
+++ b/src/main/assembly/test-defaults.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0 which is available at
+    http://www.eclipse.org/legal/epl-2.0,
+    or the Eclipse Distribution License v. 1.0 which is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>test-defaults.jar</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/etc</directory>
+            <outputDirectory>etc</outputDirectory>
+            <includes>
+                <include>*.properties</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file

From 36cd1236fe9a6186a8f64088a03fb57d880f388c Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Thu, 2 Sep 2021 21:46:28 +0200
Subject: [PATCH 4/5] Use/consume common resources (license files, test
 properties) assembly in sub-projects

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 bundles/eclipselink/pom.xml                   |  8 ++
 .../src/main/assembly/eclipselink.zip.xml     | 29 ++++---
 bundles/moxy-standalone/pom.xml               |  8 ++
 .../src/main/assembly/moxy.xml                | 29 ++++---
 bundles/others/pom.xml                        |  8 ++
 .../src/main/assembly/common-license.xml      | 29 -------
 .../eclipselink-plugins-nosql.zip.xml         | 20 ++++-
 .../main/assembly/eclipselink-plugins.zip.xml | 20 ++++-
 .../assembly/eclipselink-test-src.zip.xml     | 24 +++++-
 pom.xml                                       | 83 ++++++++++++-------
 src/main/assembly/common-license.xml          | 13 ++-
 src/main/assembly/test-defaults.xml           |  6 +-
 12 files changed, 179 insertions(+), 98 deletions(-)
 delete mode 100644 bundles/others/src/main/assembly/common-license.xml

diff --git a/bundles/eclipselink/pom.xml b/bundles/eclipselink/pom.xml
index 8e30726c632..dd00db8cfcc 100644
--- a/bundles/eclipselink/pom.xml
+++ b/bundles/eclipselink/pom.xml
@@ -185,6 +185,14 @@
         </dependency>
 
         <!-- included artifacts -->
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.parent</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+            <classifier>common-license.zip</classifier>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.asm</artifactId>
diff --git a/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml b/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml
index 6bea3bf79a5..72e1a718c98 100644
--- a/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml
+++ b/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,23 @@
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
+        <!--License files-->
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>provided</scope>
+            <outputDirectory>eclipselink/</outputDirectory>
+            <includes>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+            </includes>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <includes>
+                    <include>about.html</include>
+                    <include>license.html</include>
+                    <include>readme.html</include>
+                </includes>
+            </unpackOptions>
+        </dependencySet>
         <dependencySet>
             <useProjectAttachments>true</useProjectAttachments>
             <outputDirectory>eclipselink/jlib/</outputDirectory>
@@ -113,16 +130,6 @@
         </dependencySet>
     </dependencySets>
     <fileSets>
-        <!--License files-->
-        <fileSet>
-            <directory>${project.root.location}</directory>
-            <outputDirectory>eclipselink/</outputDirectory>
-            <includes>
-                <include>about.html</include>
-                <include>license.html</include>
-                <include>readme.html</include>
-            </includes>
-        </fileSet>
         <!--Scripts to bin directory-->
         <fileSet>
             <directory>${project.build.scriptSourceDirectory}</directory>
diff --git a/bundles/moxy-standalone/pom.xml b/bundles/moxy-standalone/pom.xml
index 1017e5c0a8d..1d91285f800 100644
--- a/bundles/moxy-standalone/pom.xml
+++ b/bundles/moxy-standalone/pom.xml
@@ -35,6 +35,14 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.parent</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+            <classifier>common-license.zip</classifier>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.moxy</artifactId>
diff --git a/bundles/moxy-standalone/src/main/assembly/moxy.xml b/bundles/moxy-standalone/src/main/assembly/moxy.xml
index ecc1893720d..b500bfc3c33 100644
--- a/bundles/moxy-standalone/src/main/assembly/moxy.xml
+++ b/bundles/moxy-standalone/src/main/assembly/moxy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,23 @@
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
+        <!--License files-->
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>provided</scope>
+            <outputDirectory>moxy</outputDirectory>
+            <includes>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+            </includes>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <includes>
+                    <include>about.html</include>
+                    <include>license.html</include>
+                    <include>readme.html</include>
+                </includes>
+            </unpackOptions>
+        </dependencySet>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>moxy/jlib/</outputDirectory>
@@ -29,16 +46,6 @@
         </dependencySet>
     </dependencySets>
     <fileSets>
-        <!--License files-->
-        <fileSet>
-            <directory>${project.root.location}</directory>
-            <outputDirectory>moxy/</outputDirectory>
-            <includes>
-                <include>about.html</include>
-                <include>license.html</include>
-                <include>readme.html</include>
-            </includes>
-        </fileSet>
         <!--Scripts to bin directory-->
         <fileSet>
             <directory>${generated.res.dir}/xsds</directory>
diff --git a/bundles/others/pom.xml b/bundles/others/pom.xml
index 9cfafc8ae99..315370eb0e6 100644
--- a/bundles/others/pom.xml
+++ b/bundles/others/pom.xml
@@ -50,6 +50,14 @@
     <dependencies>
         <!--Binary dependencies-->
         <!--Other modules-->
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.parent</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+            <classifier>common-license.zip</classifier>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
diff --git a/bundles/others/src/main/assembly/common-license.xml b/bundles/others/src/main/assembly/common-license.xml
deleted file mode 100644
index 7fafd61dc8c..00000000000
--- a/bundles/others/src/main/assembly/common-license.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0 which is available at
-    http://www.eclipse.org/legal/epl-2.0,
-    or the Eclipse Distribution License v. 1.0 which is available at
-    http://www.eclipse.org/org/documents/edl-v10.php.
-
-    SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
-
--->
-
-<component xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0 http://maven.apache.org/xsd/assembly-component-2.0.0.xsd">
-    <fileSets>
-        <fileSet>
-            <directory>${project.root.location}</directory>
-            <outputDirectory>.</outputDirectory>
-            <includes>
-                <include>about.html</include>
-                <include>license.html</include>
-                <include>readme.html</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</component>
\ No newline at end of file
diff --git a/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml b/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml
index d6e1ee22b05..b37af235e61 100644
--- a/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml
+++ b/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml
@@ -21,10 +21,24 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
-    <componentDescriptors>
-        <componentDescriptor>src/main/assembly/common-license.xml</componentDescriptor>
-    </componentDescriptors>
     <dependencySets>
+        <!--License files-->
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>provided</scope>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+            </includes>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <includes>
+                    <include>about.html</include>
+                    <include>license.html</include>
+                    <include>readme.html</include>
+                </includes>
+            </unpackOptions>
+        </dependencySet>
         <dependencySet>
             <includes>
                 <include>org.eclipse.persistence:org.eclipse.persistence.nosql</include>
diff --git a/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml b/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml
index 0999d05f25e..3faa3f17fb7 100644
--- a/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml
+++ b/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml
@@ -21,10 +21,24 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
-    <componentDescriptors>
-        <componentDescriptor>src/main/assembly/common-license.xml</componentDescriptor>
-    </componentDescriptors>
     <dependencySets>
+        <!--License files-->
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>provided</scope>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+            </includes>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <includes>
+                    <include>about.html</include>
+                    <include>license.html</include>
+                    <include>readme.html</include>
+                </includes>
+            </unpackOptions>
+        </dependencySet>
         <dependencySet>
             <outputFileNameMapping>${artifact.artifactId}_${release.version}.${build.qualifier}.${artifact.extension}</outputFileNameMapping>
             <includes>
diff --git a/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml b/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml
index c5309d9fc35..70727e26ae3 100644
--- a/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml
+++ b/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,9 +21,25 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
-    <componentDescriptors>
-        <componentDescriptor>src/main/assembly/common-license.xml</componentDescriptor>
-    </componentDescriptors>
+    <dependencySets>
+        <!--License files-->
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>provided</scope>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+            </includes>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <includes>
+                    <include>about.html</include>
+                    <include>license.html</include>
+                    <include>readme.html</include>
+                </includes>
+            </unpackOptions>
+        </dependencySet>
+    </dependencySets>
     <fileSets>
         <!--Ant build files from resources-->
         <fileSet>
diff --git a/pom.xml b/pom.xml
index c2d674211f5..29a5d85d4b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
         <bundle.version>${project.version}.${build.qualifier}</bundle.version>
         <project.build.testReports.subdirectory>test-reports</project.build.testReports.subdirectory>
         <project.build.testReports.summaryFile>test-summary</project.build.testReports.summaryFile>
+        <project.build.licenceResourceDirectory>${project.build.directory}/license</project.build.licenceResourceDirectory>
 
         <!--Common properties-->
         <common.licenceFiles>LICENSE.md, NOTICE.md</common.licenceFiles>
@@ -137,7 +138,7 @@
         <!--Default test DB is Derby-->
         <test.properties.file>${user.home}/${test.derby.properties.file}</test.properties.file>
         <test.properties.fileName>${test.derby.properties.file}</test.properties.fileName>
-        <test.properties.default.directory>${project.root.location}/etc</test.properties.default.directory>
+        <test.properties.default.directory>${project.build.directory}/test-default-properties</test.properties.default.directory>
         <test.database>derby</test.database>
         <!--false: to start In-Memory database, true: not start (MySQL, Oracle)-->
         <test.skip.in-memory.db>false</test.skip.in-memory.db>
@@ -1205,39 +1206,13 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-            <!--Resolve EclipseLink Parent project root directory-->
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>find-project-root</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                <![CDATA[
-                                    def rootPom = project;
-                                    while (rootPom.parent.groupId != "org.eclipse.ee4j") {
-                                        rootPom = rootPom.parent;
-                                    }
-                                    project.properties.setProperty("project.root.location", rootPom.basedir.toString());
-                                    log.info("EclipseLink Parent project directory [project.root.location]:  " + project.properties['project.root.location']);
-                                ]]>
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>license.jar</id>
-                        <phase>package</phase>
+                        <id>common-license.zip</id>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -1249,8 +1224,8 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>test-defaults.jar</id>
-                        <phase>package</phase>
+                        <id>test-defaults.zip</id>
+                        <phase>initialize</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -1263,6 +1238,50 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-legal-resource</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>org.eclipse.persistence.parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <classifier>common-license.zip</classifier>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.licenceResourceDirectory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack-test-properties</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>org.eclipse.persistence.parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <classifier>test-defaults.zip</classifier>
+                                    <type>zip</type>
+                                    <outputDirectory>${test.properties.default.directory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -1315,7 +1334,7 @@
                         <configuration>
                             <resources>
                                 <resource>
-                                    <directory>${project.root.location}</directory>
+                                    <directory>${project.build.licenceResourceDirectory}</directory>
                                     <includes>${common.licenceFiles}</includes>
                                     <targetPath>META-INF</targetPath>
                                 </resource>
diff --git a/src/main/assembly/common-license.xml b/src/main/assembly/common-license.xml
index 04077ea109b..bbd4bb09c48 100644
--- a/src/main/assembly/common-license.xml
+++ b/src/main/assembly/common-license.xml
@@ -16,9 +16,9 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>common-license.jar</id>
+    <id>common-license.zip</id>
     <formats>
-        <format>jar</format>
+        <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
@@ -30,5 +30,14 @@
                 <include>NOTICE.md</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/features</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>about.html</include>
+                <include>license.html</include>
+                <include>readme.html</include>
+            </includes>
+        </fileSet>
     </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/src/main/assembly/test-defaults.xml b/src/main/assembly/test-defaults.xml
index 9916c22f714..8d4899e4f30 100644
--- a/src/main/assembly/test-defaults.xml
+++ b/src/main/assembly/test-defaults.xml
@@ -16,15 +16,15 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>test-defaults.jar</id>
+    <id>test-defaults.zip</id>
     <formats>
-        <format>jar</format>
+        <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
             <directory>${project.basedir}/etc</directory>
-            <outputDirectory>etc</outputDirectory>
+            <outputDirectory>.</outputDirectory>
             <includes>
                 <include>*.properties</include>
             </includes>

From 5e41851b7c0e82666afa00ba09fe5c39d3fb988d Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Fri, 3 Sep 2021 11:48:21 +0200
Subject: [PATCH 5/5] Reflect PR comments - there are stil SDO test errors

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 bundles/eclipselink/pom.xml                        |  2 +-
 .../src/main/assembly/eclipselink.zip.xml          |  6 ++----
 bundles/moxy-standalone/pom.xml                    |  2 +-
 bundles/moxy-standalone/src/main/assembly/moxy.xml |  6 ++----
 bundles/others/pom.xml                             |  2 +-
 .../assembly/eclipselink-plugins-nosql.zip.xml     |  6 ++----
 .../src/main/assembly/eclipselink-plugins.zip.xml  |  6 ++----
 .../src/main/assembly/eclipselink-test-src.zip.xml |  6 ++----
 pom.xml                                            | 14 ++++++--------
 src/main/assembly/common-license.xml               |  4 ++--
 src/main/assembly/test-defaults.xml                |  2 +-
 11 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/bundles/eclipselink/pom.xml b/bundles/eclipselink/pom.xml
index dd00db8cfcc..5320168d23d 100644
--- a/bundles/eclipselink/pom.xml
+++ b/bundles/eclipselink/pom.xml
@@ -190,7 +190,7 @@
             <artifactId>org.eclipse.persistence.parent</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
-            <classifier>common-license.zip</classifier>
+            <classifier>common-license</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml b/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml
index 72e1a718c98..a1469b17812 100644
--- a/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml
+++ b/bundles/eclipselink/src/main/assembly/eclipselink.zip.xml
@@ -28,14 +28,12 @@
             <scope>provided</scope>
             <outputDirectory>eclipselink/</outputDirectory>
             <includes>
-                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license</include>
             </includes>
             <unpack>true</unpack>
             <unpackOptions>
                 <includes>
-                    <include>about.html</include>
-                    <include>license.html</include>
-                    <include>readme.html</include>
+                    <include>*.html</include>
                 </includes>
             </unpackOptions>
         </dependencySet>
diff --git a/bundles/moxy-standalone/pom.xml b/bundles/moxy-standalone/pom.xml
index 1d91285f800..968332f1121 100644
--- a/bundles/moxy-standalone/pom.xml
+++ b/bundles/moxy-standalone/pom.xml
@@ -40,7 +40,7 @@
             <artifactId>org.eclipse.persistence.parent</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
-            <classifier>common-license.zip</classifier>
+            <classifier>common-license</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/bundles/moxy-standalone/src/main/assembly/moxy.xml b/bundles/moxy-standalone/src/main/assembly/moxy.xml
index b500bfc3c33..67768b1f864 100644
--- a/bundles/moxy-standalone/src/main/assembly/moxy.xml
+++ b/bundles/moxy-standalone/src/main/assembly/moxy.xml
@@ -28,14 +28,12 @@
             <scope>provided</scope>
             <outputDirectory>moxy</outputDirectory>
             <includes>
-                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license</include>
             </includes>
             <unpack>true</unpack>
             <unpackOptions>
                 <includes>
-                    <include>about.html</include>
-                    <include>license.html</include>
-                    <include>readme.html</include>
+                    <include>*.html</include>
                 </includes>
             </unpackOptions>
         </dependencySet>
diff --git a/bundles/others/pom.xml b/bundles/others/pom.xml
index 315370eb0e6..a27aead21c8 100644
--- a/bundles/others/pom.xml
+++ b/bundles/others/pom.xml
@@ -55,7 +55,7 @@
             <artifactId>org.eclipse.persistence.parent</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
-            <classifier>common-license.zip</classifier>
+            <classifier>common-license</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml b/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml
index b37af235e61..34946e753a9 100644
--- a/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml
+++ b/bundles/others/src/main/assembly/eclipselink-plugins-nosql.zip.xml
@@ -28,14 +28,12 @@
             <scope>provided</scope>
             <outputDirectory>.</outputDirectory>
             <includes>
-                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license</include>
             </includes>
             <unpack>true</unpack>
             <unpackOptions>
                 <includes>
-                    <include>about.html</include>
-                    <include>license.html</include>
-                    <include>readme.html</include>
+                    <include>*.html</include>
                 </includes>
             </unpackOptions>
         </dependencySet>
diff --git a/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml b/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml
index 3faa3f17fb7..c0f3f8a0900 100644
--- a/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml
+++ b/bundles/others/src/main/assembly/eclipselink-plugins.zip.xml
@@ -28,14 +28,12 @@
             <scope>provided</scope>
             <outputDirectory>.</outputDirectory>
             <includes>
-                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license</include>
             </includes>
             <unpack>true</unpack>
             <unpackOptions>
                 <includes>
-                    <include>about.html</include>
-                    <include>license.html</include>
-                    <include>readme.html</include>
+                    <include>*.html</include>
                 </includes>
             </unpackOptions>
         </dependencySet>
diff --git a/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml b/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml
index 70727e26ae3..fea18895dd1 100644
--- a/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml
+++ b/bundles/others/src/main/assembly/eclipselink-test-src.zip.xml
@@ -28,14 +28,12 @@
             <scope>provided</scope>
             <outputDirectory>.</outputDirectory>
             <includes>
-                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license.zip</include>
+                <include>${project.groupId}:org.eclipse.persistence.parent:zip:common-license</include>
             </includes>
             <unpack>true</unpack>
             <unpackOptions>
                 <includes>
-                    <include>about.html</include>
-                    <include>license.html</include>
-                    <include>readme.html</include>
+                    <include>*.html</include>
                 </includes>
             </unpackOptions>
         </dependencySet>
diff --git a/pom.xml b/pom.xml
index 29a5d85d4b1..7d9207b99b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,8 +113,6 @@
         <project.build.testReports.summaryFile>test-summary</project.build.testReports.summaryFile>
         <project.build.licenceResourceDirectory>${project.build.directory}/license</project.build.licenceResourceDirectory>
 
-        <!--Common properties-->
-        <common.licenceFiles>LICENSE.md, NOTICE.md</common.licenceFiles>
         <!--Integration test sources/resources directory. Relative directory to ${project.basedir}
         !!!Can't start with / character!!!-->
         <integration.test.directory>src/it/</integration.test.directory>
@@ -1211,7 +1209,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>common-license.zip</id>
+                        <id>common-license</id>
                         <phase>generate-resources</phase>
                         <goals>
                             <goal>single</goal>
@@ -1224,7 +1222,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>test-defaults.zip</id>
+                        <id>test-defaults</id>
                         <phase>initialize</phase>
                         <goals>
                             <goal>single</goal>
@@ -1254,7 +1252,7 @@
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>org.eclipse.persistence.parent</artifactId>
                                     <version>${project.version}</version>
-                                    <classifier>common-license.zip</classifier>
+                                    <classifier>common-license</classifier>
                                     <type>zip</type>
                                     <outputDirectory>${project.build.licenceResourceDirectory}</outputDirectory>
                                 </artifactItem>
@@ -1273,7 +1271,7 @@
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>org.eclipse.persistence.parent</artifactId>
                                     <version>${project.version}</version>
-                                    <classifier>test-defaults.zip</classifier>
+                                    <classifier>test-defaults</classifier>
                                     <type>zip</type>
                                     <outputDirectory>${test.properties.default.directory}</outputDirectory>
                                 </artifactItem>
@@ -1334,8 +1332,8 @@
                         <configuration>
                             <resources>
                                 <resource>
-                                    <directory>${project.build.licenceResourceDirectory}</directory>
-                                    <includes>${common.licenceFiles}</includes>
+                                    <directory>${project.build.licenceResourceDirectory}/md</directory>
+                                    <includes>*</includes>
                                     <targetPath>META-INF</targetPath>
                                 </resource>
                             </resources>
diff --git a/src/main/assembly/common-license.xml b/src/main/assembly/common-license.xml
index bbd4bb09c48..8208489bee7 100644
--- a/src/main/assembly/common-license.xml
+++ b/src/main/assembly/common-license.xml
@@ -16,7 +16,7 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>common-license.zip</id>
+    <id>common-license</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -24,7 +24,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}</directory>
-            <outputDirectory>.</outputDirectory>
+            <outputDirectory>md</outputDirectory>
             <includes>
                 <include>LICENSE.md</include>
                 <include>NOTICE.md</include>
diff --git a/src/main/assembly/test-defaults.xml b/src/main/assembly/test-defaults.xml
index 8d4899e4f30..f2af1515f7a 100644
--- a/src/main/assembly/test-defaults.xml
+++ b/src/main/assembly/test-defaults.xml
@@ -16,7 +16,7 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>test-defaults.zip</id>
+    <id>test-defaults</id>
     <formats>
         <format>zip</format>
     </formats>