Merge branch 'master' into BAEL-2804

Conflicts:
	persistence-modules/java-jpa-2/README.md
	persistence-modules/java-jpa-2/pom.xml
	persistence-modules/java-jpa/pom.xml
	persistence-modules/pom.xml

persistence-modules/java-jpa-2/README.md

@@ -1,3 +1,6 @@
 # Relevant Articles
+<<<<<<< HEAD
 
 - [JPA Query Parameters Usage](http://www.baeldung.com/jpa-query-parameters-usage)
+=======
+>>>>>>> refs/heads/master

persistence-modules/java-jpa-2/pom.xml

@@ -6,8 +6,9 @@
   <name>java-jpa-2</name>
   <parent>
     <groupId>com.baeldung</groupId>
-    <artifactId>persistence-modules</artifactId>
+    <artifactId>parent-modules</artifactId>
     <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
@@ -30,9 +31,22 @@
     <dependency>
       <groupId>javax.persistence</groupId>
       <artifactId>javax.persistence-api</artifactId>
-      <version>2.2</version>
+      <version>${javax.persistence-api.version}</version>
     </dependency>
 
+    <!--Runtime JPA implementation-->
+    <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>eclipselink</artifactId>
+        <version>${eclipselink.version}</version>
+        <scope>runtime</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>${postgres.version}</version>
+        <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -89,6 +103,9 @@
   </build>
   <properties>
     <hibernate.version>5.4.0.Final</hibernate.version>
+    <eclipselink.version>2.7.4-RC1</eclipselink.version>
+    <postgres.version>42.2.5</postgres.version>
+    <javax.persistence-api.version>2.2</javax.persistence-api.version>
   </properties>
 
 </project>

persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java

@@ -0,0 +1,12 @@
+package com.baeldung.jpa.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity(name = "MyArticle")
+@Table(name = Article.TABLE_NAME)
+public class Article {
+
+    public static final String TABLE_NAME = "ARTICLES";
+
+}