From c6356a41057b5cee33901eaa08e29b74e0cccfea Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Fri, 5 Feb 2016 22:21:36 +0000
Subject: [PATCH] Tided up the pom files (Defined the versions for plugins so
 that we don't need to specify them in every pom file and we can use the same
 version in all submodules)

Conflicts:
	rm-enterprise/rm-enterprise-automation/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
---
 pom.xml                                | 35 ++++++++++++++++++--
 rm-community/rm-community-repo/pom.xml | 46 ++++----------------------
 2 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c2dd694da..bdfb84fbf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
          <url>https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA</url>
       </repository>
    </repositories>
+
    <pluginRepositories>
       <pluginRepository>
          <id>alfresco-public</id>
@@ -100,7 +101,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
-            <version>1.3.1</version>
             <executions>
                <execution>
                   <id>enforce-java</id>
@@ -120,7 +120,6 @@
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
-            <version>${maven.buildhelper.version}</version>
             <executions>
                <execution>
                   <id>regex-properties</id>
@@ -173,7 +172,7 @@
          <plugins>
             <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
-               <version>3.2</version>
+               <version>${maven.compiler.version}</version>
                <configuration>
                   <source>${maven.build.sourceVersion}</source>
                   <target>${maven.build.sourceVersion}</target>
@@ -216,6 +215,36 @@
                   </lifecycleMappingMetadata>
                </configuration>
             </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-enforcer-plugin</artifactId>
+               <version>${maven.enforcer.plugin}</version>
+            </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-failsafe-plugin</artifactId>
+               <version>2.19</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-source-plugin</artifactId>
+               <version>2.4</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>build-helper-maven-plugin</artifactId>
+               <version>${maven.buildhelper.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>sql-maven-plugin</artifactId>
+               <version>1.5</version>
+            </plugin>
          </plugins>
       </pluginManagement>
    </build>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index a1c88ad2f7..d781638518 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -26,6 +26,7 @@
       <skip.integrationtests>true</skip.integrationtests>
       <alfresco.solr.home>${project.build.directory}/solr/home</alfresco.solr.home>
    </properties>
+
    <build>
       <sourceDirectory>source/java</sourceDirectory>
       <testSourceDirectory>test/java</testSourceDirectory>
@@ -95,7 +96,6 @@
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>properties-maven-plugin</artifactId>
-            <version>1.0-alpha-2</version>
             <executions>
                <execution>
                   <phase>initialize</phase>
@@ -112,18 +112,17 @@
             </executions>
          </plugin>
         <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-                <includes>
-                    <include>**/AllUnitTestSuite.class</include>
-                </includes>
+               <includes>
+                  <include>**/AllUnitTestSuite.class</include>
+               </includes>
             </configuration>
-        </plugin>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.19</version>
             <executions>
                <execution>
                   <id>integration-tests</id>
@@ -140,7 +139,6 @@
                </execution>
             </executions>
          </plugin>
-         <!-- Fetch and unpack Alfresco Repository/Share WAR (alfresco.war or share.war) -->
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
@@ -165,8 +163,6 @@
                </execution>
             </executions>
          </plugin>
-         <!-- The current AMP artifact is installed into the Alfresco.war or share.war
-            using alfresco-maven-plugin -->
          <plugin>
             <groupId>org.alfresco.maven.plugin</groupId>
             <artifactId>alfresco-maven-plugin</artifactId>
@@ -200,11 +196,6 @@
                   </goals>
                </execution>
             </executions>
-            <configuration>
-               <!-- We need to selectively not install web resources (i.e. /web folder in AMP),
-                  so these files can be picked up directly from the build project instead,
-                  enabling rapid application dev -->
-            </configuration>
          </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -225,7 +216,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.4</version>
             <executions>
                <execution>
                   <id>attach-sources</id>
@@ -238,11 +228,9 @@
       </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>
@@ -273,12 +261,10 @@
          <artifactId>gson</artifactId>
          <version>2.3.1</version>
       </dependency>
-      <!-- Alfresco dependencies -->
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-remote-api</artifactId>
       </dependency>
-      <!-- Test dependencies -->
       <dependency>
          <groupId>io.takari.junit</groupId>
          <artifactId>takari-cpsuite</artifactId>
@@ -321,7 +307,6 @@
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
-      <!-- Database drivers -->
       <dependency>
          <groupId>postgresql</groupId>
          <artifactId>postgresql</artifactId>
@@ -374,7 +359,6 @@
          <id>start-repo</id>
          <build>
             <plugins>
-               <!-- Fetch and unpack Alfresco Repository / Share / Solr in the target / folder -->
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-dependency-plugin</artifactId>
@@ -397,7 +381,6 @@
                            </artifactItems>
                         </configuration>
                      </execution>
-                     <!-- Extract Solr config -->
                      <execution>
                         <id>unpack-alfresco-config</id>
                         <goals>
@@ -419,7 +402,6 @@
                      </execution>
                   </executions>
                </plugin>
-               <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
                <plugin>
                   <groupId>org.alfresco.maven.plugin</groupId>
                   <artifactId>alfresco-maven-plugin</artifactId>
@@ -433,15 +415,12 @@
                      </execution>
                   </executions>
                   <configuration>
-                     <!-- We need to selectively not install web resources so to enable rapid dev -->
                      <includeWebResources>false</includeWebResources>
                   </configuration>
                </plugin>
-               <!-- Fix the path when we are running on WINDOWS -->
                <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>build-helper-maven-plugin</artifactId>
-                  <version>1.8</version>
                   <executions>
                      <execution>
                         <id>regex-property</id>
@@ -459,7 +438,6 @@
                      </execution>
                   </executions>
                </plugin>
-               <!-- Replaces values in Solr config -->
                <plugin>
                   <groupId>com.google.code.maven-replacer-plugin</groupId>
                   <artifactId>replacer</artifactId>
@@ -544,26 +522,15 @@
                </plugin>
             </plugins>
          </build>
-         <!--
-         <dependencies>
-            <dependency>
-               <groupId>org.alfresco.maven</groupId>
-               <artifactId>alfresco-rad</artifactId>
-               <version>${maven.alfresco.version}</version>
-            </dependency>
-         </dependencies>
-         -->
       </profile>
 
       <profile>
          <id>wipeDB</id>
          <build>
             <plugins>
-               <!-- Wipe the database before starting tests -->
                <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>sql-maven-plugin</artifactId>
-                  <version>1.5</version>
                   <configuration>
                      <autocommit>true</autocommit>
                      <driver>${alfresco.db.datasource.class}</driver>
@@ -609,6 +576,5 @@
             </plugins>
          </build>
       </profile>
-
    </profiles>
 </project>
\ No newline at end of file