From 6ef0632df28968c89276ff266c6aba5b11e001ba Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
Date: Wed, 24 Mar 2021 12:32:33 +0100
Subject: [PATCH] JAVA-3295: Fix pom properties in persistence-modules

---
 persistence-modules/apache-bookkeeper/pom.xml    |  3 ++-
 persistence-modules/java-jpa-3/pom.xml           |  7 ++++---
 persistence-modules/jooq/pom.xml                 | 16 +++++++++++-----
 persistence-modules/spring-data-geode/pom.xml    |  3 ++-
 .../spring-data-jpa-enterprise/pom.xml           |  5 ++---
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/persistence-modules/apache-bookkeeper/pom.xml b/persistence-modules/apache-bookkeeper/pom.xml
index 32467b9997..3ef1f50d63 100644
--- a/persistence-modules/apache-bookkeeper/pom.xml
+++ b/persistence-modules/apache-bookkeeper/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.14.3</version>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -39,6 +39,7 @@
 
     <properties>
         <org.apache.bookkeeper.version>4.10.0</org.apache.bookkeeper.version>
+        <testcontainers.version>1.14.3</testcontainers.version>
     </properties>
 
 
diff --git a/persistence-modules/java-jpa-3/pom.xml b/persistence-modules/java-jpa-3/pom.xml
index 7c02cc6c8e..f931cd90b8 100644
--- a/persistence-modules/java-jpa-3/pom.xml
+++ b/persistence-modules/java-jpa-3/pom.xml
@@ -30,17 +30,17 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.21</version>
+            <version>${mysql.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.11.3</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-hibernate5</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
         <!--Compile time JPA API -->
         <dependency>
@@ -87,6 +87,7 @@
         <hibernate.version>5.4.14.Final</hibernate.version>
         <eclipselink.version>2.7.4</eclipselink.version>
         <postgres.version>42.2.5</postgres.version>
+        <mysql.version>8.0.21</mysql.version>
         <javax.persistence-api.version>2.2</javax.persistence-api.version>
         <assertj.version>3.11.1</assertj.version>
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
diff --git a/persistence-modules/jooq/pom.xml b/persistence-modules/jooq/pom.xml
index f0c5a27a96..cdda860040 100644
--- a/persistence-modules/jooq/pom.xml
+++ b/persistence-modules/jooq/pom.xml
@@ -19,28 +19,34 @@
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
-            <version>3.13.4</version>
+            <version>${jooq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-meta</artifactId>
-            <version>3.13.4</version>
+            <version>${jooq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq-codegen</artifactId>
-            <version>3.13.4</version>
+            <version>${jooq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.16</version>
+            <version>${postgresql.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>${h2.version}</version>
         </dependency>
     </dependencies>
 
+    <properties>
+        <jooq.version>3.13.4</jooq.version>
+        <postgresql.version>42.2.16</postgresql.version>
+        <h2.version>1.4.200</h2.version>
+    </properties>
+
 </project>
diff --git a/persistence-modules/spring-data-geode/pom.xml b/persistence-modules/spring-data-geode/pom.xml
index 07aa65463c..ebdb37299e 100644
--- a/persistence-modules/spring-data-geode/pom.xml
+++ b/persistence-modules/spring-data-geode/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>com.mysema.maven</groupId>
                 <artifactId>maven-apt-plugin</artifactId>
-                <version>1.0</version>
+                <version>${maven-apt-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -88,6 +88,7 @@
         <start-class>com.baeldung.springdatageode.app.ClientCacheApp</start-class>
         <spring-geode-starter-version>1.1.1.RELEASE</spring-geode-starter-version>
         <spring.boot.starter.version>2.1.9.RELEASE</spring.boot.starter.version>
+        <maven-apt-plugin.version>1.0</maven-apt-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-enterprise/pom.xml b/persistence-modules/spring-data-jpa-enterprise/pom.xml
index 7ff2f00fdf..12ffeee7f0 100644
--- a/persistence-modules/spring-data-jpa-enterprise/pom.xml
+++ b/persistence-modules/spring-data-jpa-enterprise/pom.xml
@@ -78,7 +78,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -86,7 +86,7 @@
                         <path>
                             <groupId>org.mapstruct</groupId>
                             <artifactId>mapstruct-processor</artifactId>
-                            <version>1.3.1.Final</version>
+                            <version>${mapstruct.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
@@ -98,7 +98,6 @@
         <mapstruct.version>1.3.1.Final</mapstruct.version>
         <guava.version>21.0</guava.version>
         <testcontainers.version>1.12.2</testcontainers.version>
-
     </properties>
 
 </project>