DRYD-756: Update properties-maven-plugin plugin version and clean up related POM...

diff --git a/pom.xml b/pom.xml
index 1f23bd380bb982e8032b5e5b9103f85c53b8a33e..64f1b40ad112b6421d35dff5606413abbac71806 100644 (file)
--- 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 a2d0669208fdfde3c6b0ea7ac9a90a4024382a5c..5a891e309e106e139cf12c6e0e1749e2dad5d926 100644 (file)
--- 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 1f3ee11bf1fe0431362ac78880c5feb54702543b..ff9b8f050d363d7840d07e3ac9df315274e46f93 100644 (file)
--- 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 2ef51a2af016c35ecd50a8a21e5b76eb839725f1..f30e55036131b5dd30241591dc4335fbfac1d118 100644 (file)
--- 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 4ccdd8c9572542b3e375348c15df8d52903c4934..5a5c1f23d9651ccfa5e956fcabaa3be761e809d5 100644 (file)
--- 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 76ac6aafea0fa4a1c85fa66e218600d77d5fa4c9..5352562df098d2e35bf9bde494ca7a2e9a2944df 100644 (file)
--- 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>