From 40fdeb3227af204029ba69802ca3ff71921d05f7 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@gmail.com>
Date: Fri, 28 Feb 2020 15:58:44 -0800
Subject: [PATCH] DRYD-756: Update properties-maven-plugin plugin version and
 clean up related POM configuration.

---
 pom.xml                                | 38 +++++++++++++++++++++
 services/JaxRsServiceProvider/pom.xml  | 47 --------------------------
 services/account/pstore/pom.xml        | 19 +++--------
 services/authentication/pstore/pom.xml | 27 +++++----------
 services/authorization/pstore/pom.xml  | 19 +++--------
 services/pom.xml                       |  5 ---
 6 files changed, 57 insertions(+), 98 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f23bd380..64f1b40ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,21 @@
 					<configuration>
 						<lifecycleMappingMetadata>
 							<pluginExecutions>
+								<pluginExecution>
+        							<pluginExecutionFilter>
+        								<groupId>org.codehaus.mojo</groupId>
+        								<artifactId>properties-maven-plugin</artifactId>
+        								<versionRange>[1.0.0,)</versionRange>
+        								<goals>
+        									<goal>
+        										read-project-properties
+        									</goal>
+        								</goals>
+        							</pluginExecutionFilter>
+        							<action>
+        								<ignore></ignore>
+        							</action>
+        						</pluginExecution>
 								<pluginExecution>
 									<pluginExecutionFilter>
 										<groupId>
@@ -239,6 +254,19 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>properties-maven-plugin</artifactId>
+					<version>1.0.0</version>
+	                <executions>
+						<execution>
+							<phase>initialize</phase>
+							<goals>
+								<goal>read-project-properties</goal>
+							</goals>
+						</execution>
+                	</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 
@@ -314,6 +342,16 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <files>
+                        <file>build.properties</file>
+                    </files>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index a2d066920..5a891e309 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -766,14 +766,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>read-project-properties</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <files>
                         <file>../../build.properties</file>
@@ -825,7 +817,6 @@
                 </configuration>
 
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
@@ -849,44 +840,6 @@
                     </archive>
                 </configuration>
             </plugin>
-
         </plugins>
-        <pluginManagement>
-        	<plugins>
-        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        		<plugin>
-        			<groupId>org.eclipse.m2e</groupId>
-        			<artifactId>lifecycle-mapping</artifactId>
-        			<version>1.0.0</version>
-        			<configuration>
-        				<lifecycleMappingMetadata>
-        					<pluginExecutions>
-        						<pluginExecution>
-        							<pluginExecutionFilter>
-        								<groupId>
-        									org.codehaus.mojo
-        								</groupId>
-        								<artifactId>
-        									properties-maven-plugin
-        								</artifactId>
-        								<versionRange>
-        									[1.0-alpha-2,)
-        								</versionRange>
-        								<goals>
-        									<goal>
-        										read-project-properties
-        									</goal>
-        								</goals>
-        							</pluginExecutionFilter>
-        							<action>
-        								<ignore></ignore>
-        							</action>
-        						</pluginExecution>
-        					</pluginExecutions>
-        				</lifecycleMappingMetadata>
-        			</configuration>
-        		</plugin>
-        	</plugins>
-        </pluginManagement>
     </build>
 </project>
diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 1f3ee11bf..ff9b8f050 100644
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -72,20 +72,11 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0-alpha-2</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<goals>
-									<goal>read-project-properties</goal>
-								</goals>
-								<configuration>
-									<files>
-										<file>${basedir}/../../../build.properties</file>
-									</files>
-								</configuration>
-							</execution>
-						</executions>
+						<configuration>
+							<files>
+								<file>../../../build.properties</file>
+							</files>
+						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml
index 2ef51a2af..f30e55036 100644
--- a/services/authentication/pstore/pom.xml
+++ b/services/authentication/pstore/pom.xml
@@ -64,24 +64,15 @@
             <id>ddl</id>
             <build>
                 <plugins>
-										<plugin>
-											<groupId>org.codehaus.mojo</groupId>
-											<artifactId>properties-maven-plugin</artifactId>
-											<version>1.0-alpha-2</version>
-											<executions>
-												<execution>
-													<phase>initialize</phase>
-													<goals>
-														<goal>read-project-properties</goal>
-													</goals>
-													<configuration>
-														<files>
-															<file>${basedir}/../../../build.properties</file>
-														</files>
-													</configuration>
-												</execution>
-											</executions>
-										</plugin>
+                     <plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>properties-maven-plugin</artifactId>
+						<configuration>
+							<files>
+								<file>../../../build.properties</file>
+							</files>
+						</configuration>
+					</plugin>
                      <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>hibernate3-maven-plugin</artifactId>
diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml
index 4ccdd8c95..5a5c1f23d 100644
--- a/services/authorization/pstore/pom.xml
+++ b/services/authorization/pstore/pom.xml
@@ -62,20 +62,11 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0-alpha-2</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<goals>
-									<goal>read-project-properties</goal>
-								</goals>
-								<configuration>
-									<files>
-										<file>${basedir}/../../../build.properties</file>
-									</files>
-								</configuration>
-							</execution>
-						</executions>
+						<configuration>
+							<files>
+								<file>../../../build.properties</file>
+							</files>
+						</configuration>
 					</plugin>
                      <plugin>
                         <groupId>org.codehaus.mojo</groupId>
diff --git a/services/pom.xml b/services/pom.xml
index 76ac6aafe..5352562df 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -137,11 +137,6 @@
 						</systemPropertyVariables>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>properties-maven-plugin</artifactId>
-					<version>1.0-alpha-2</version>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-- 
2.47.3