From b48e7e4a293c3af90558a9888b684c94943c6a66 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Tue, 25 May 2021 12:05:17 +0200
Subject: [PATCH 1/2] Maven build - JPARS module Manifest generation (#1139)

Behind this fix is some issue with org.apache.felix:maven-bundle-plugin. This plugin inserts into generated MANIFEST.MF file Maven project properties, but only properties in capital characters. Maven properties in lowercase characters are ignored and not included into manifest. I tried to upgrade into latest version of org.apache.felix:maven-bundle-plugin:5.1.2, but without any change.

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
(cherry picked from commit 4708ec20a0fa2f4216c49dab9387bd6227227432)
---
 jpa/org.eclipse.persistence.jpars/pom.xml     |  8 +++----
 .../src/it/resources/META-INF/persistence.xml | 24 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/jpa/org.eclipse.persistence.jpars/pom.xml b/jpa/org.eclipse.persistence.jpars/pom.xml
index 0470199370c..d165996bae4 100644
--- a/jpa/org.eclipse.persistence.jpars/pom.xml
+++ b/jpa/org.eclipse.persistence.jpars/pom.xml
@@ -32,10 +32,10 @@
     <properties>
         <!--Properties used for test resources filtering/replacement-->
         <!--DB connection properties-->
-        <DB_USER>${db.user}</DB_USER>
-        <DB_PWD>${db.pwd}</DB_PWD>
-        <DB_DRIVER>${db.driver}</DB_DRIVER>
-        <DB_URL>${db.url}</DB_URL>
+        <db_user>${db.user}</db_user>
+        <db_pwd>${db.pwd}</db_pwd>
+        <db_driver>${db.driver}</db_driver>
+        <db_url>${db.url}</db_url>
 
         <test-skip-jpa-jpars>${skipTests}</test-skip-jpa-jpars>
     </properties>
diff --git a/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml b/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml
index 5533e451ba5..41b84edd409 100644
--- a/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml
+++ b/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml
@@ -43,10 +43,10 @@
             <property name="eclipselink.logging.level" value="INFO"/>
             <property name="eclipselink.logging.level.jpars" value="FINEST"/>
             <property name="eclipselink.logging.parameters" value="true"/>
-            <property name="jakarta.persistence.jdbc.url" value="@DB_URL@"/>
-            <property name="jakarta.persistence.jdbc.password" value="@DB_PWD@"/>
-            <property name="jakarta.persistence.jdbc.driver" value="@DB_DRIVER@"/>
-            <property name="jakarta.persistence.jdbc.user" value="@DB_USER@"/>
+            <property name="jakarta.persistence.jdbc.url" value="@db_url@"/>
+            <property name="jakarta.persistence.jdbc.password" value="@db_pwd@"/>
+            <property name="jakarta.persistence.jdbc.driver" value="@db_driver@"/>
+            <property name="jakarta.persistence.jdbc.user" value="@db_user@"/>
         </properties>
     </persistence-unit>
 
@@ -60,10 +60,10 @@
             <property name="eclipselink.metadata-source" value="XML"/>
             <property name="eclipselink.weaving" value="static"/>
             <property name="eclipselink.metadata-source.xml.file" value="META-INF/auction-orm.xml"/>
-            <property name="jakarta.persistence.jdbc.url" value="@DB_URL@"/>
-            <property name="jakarta.persistence.jdbc.password" value="@DB_PWD@"/>
-            <property name="jakarta.persistence.jdbc.driver" value="@DB_DRIVER@"/>
-            <property name="jakarta.persistence.jdbc.user" value="@DB_USER@"/>
+            <property name="jakarta.persistence.jdbc.url" value="@db_url@"/>
+            <property name="jakarta.persistence.jdbc.password" value="@db_pwd@"/>
+            <property name="jakarta.persistence.jdbc.driver" value="@db_driver@"/>
+            <property name="jakarta.persistence.jdbc.user" value="@db_user@"/>
         </properties>
     </persistence-unit>
 
@@ -75,10 +75,10 @@
             <property name="eclipselink.metadata-source" value="XML"/>
             <property name="eclipselink.weaving" value="static"/>
             <property name="eclipselink.metadata-source.xml.file" value="META-INF/phonebook-orm.xml"/>
-            <property name="jakarta.persistence.jdbc.url" value="@DB_URL@"/>
-            <property name="jakarta.persistence.jdbc.password" value="@DB_PWD@"/>
-            <property name="jakarta.persistence.jdbc.driver" value="@DB_DRIVER@"/>
-            <property name="jakarta.persistence.jdbc.user" value="@DB_USER@"/>
+            <property name="jakarta.persistence.jdbc.url" value="@db_url@"/>
+            <property name="jakarta.persistence.jdbc.password" value="@db_pwd@"/>
+            <property name="jakarta.persistence.jdbc.driver" value="@db_driver@"/>
+            <property name="jakarta.persistence.jdbc.user" value="@db_user@"/>
         </properties>
     </persistence-unit>
 

From fad29b7274351c983a4e2580e8083b846fa38eb7 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Tue, 25 May 2021 12:09:16 +0200
Subject: [PATCH 2/2] Maven build - JPARS module Manifest generation

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 jpa/org.eclipse.persistence.jpars/pom.xml                       | 2 +-
 .../src/it/resources/META-INF/persistence.xml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jpa/org.eclipse.persistence.jpars/pom.xml b/jpa/org.eclipse.persistence.jpars/pom.xml
index d165996bae4..1ad0579ddfd 100644
--- a/jpa/org.eclipse.persistence.jpars/pom.xml
+++ b/jpa/org.eclipse.persistence.jpars/pom.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
diff --git a/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml b/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml
index 41b84edd409..d1ba17b73d4 100644
--- a/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml
+++ b/jpa/org.eclipse.persistence.jpars/src/it/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 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