From 93714619756c4d2efff02f48018ffff9f393c55c Mon Sep 17 00:00:00 2001
From: Roy Wetherall <rwetherall@gmail.com>
Date: Wed, 2 Mar 2016 10:38:33 +1100
Subject: [PATCH] update POM config to fix issues on Bamboo

---
 rm-automation/pom.xml                  |  94 ++++++++++----------
 rm-community/rm-community-repo/pom.xml | 115 ++++++++++++-------------
 2 files changed, 104 insertions(+), 105 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index b63a36d28e..440f3928ac 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -65,54 +65,54 @@
                </execution>
             </executions>
          </plugin>
-         
-         <!--  License header generation -->
+      
+         <!-- License header generation -->
          <plugin>
-	        <groupId>org.codehaus.mojo</groupId>
-	        <artifactId>license-maven-plugin</artifactId>
-	        <version>1.8</version>
-	        <configuration>
-	          
-	          <verbose>${license.verbose}</verbose>
-	          <addSvnKeyWords>false</addSvnKeyWords> 
-		      
-	          <!-- header configuration -->            
-              <organizationName>${license.org.name}</organizationName>
-	          <descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate>
-              <canUpdateCopyright>true</canUpdateCopyright>
-              <canUpdateDescription>true</canUpdateDescription>
-	          
-	          <!--  licence configuration -->
-	          <addJavaLicenseAfterPackage>true</addJavaLicenseAfterPackage>
-              <licenseName>alfresco_community</licenseName>
-              <licenseResolver>file:/${project.parent.basedir}/license</licenseResolver>
-              
-              <!-- dry run options -->
-              <dryRun>${license.update.dryrun}</dryRun>
-              <failOnMissingHeader>true</failOnMissingHeader>
-              <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
-
-			  <!-- exculsions -->
-			  <excludes>			    
-            	<exclude>**/package-info.java</exclude>
-			  	<exclude>**/*.properties</exclude>
-			  	<exclude>**/*.css</exclude>
-			  	<exclude>**/*.xml</exclude>
-			  	<exclude>**/*.json</exclude>
-			  	<exclude>**/*.txt</exclude>
-			  </excludes>
-			  
-	        </configuration>
-	        <executions>
-	          <execution>
-	            <id>first</id>
-	            <goals>
-	              <goal>update-file-header</goal>
-	            </goals>
-	            <phase>process-sources</phase>
-	          </execution>
-	        </executions>
-	      </plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>license-maven-plugin</artifactId>
+            <version>1.8</version>
+            <configuration>
+      
+               <verbose>${license.verbose}</verbose>
+               <addSvnKeyWords>false</addSvnKeyWords>
+      
+               <!-- header configuration -->
+               <organizationName>${license.org.name}</organizationName>
+               <descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate>
+               <canUpdateCopyright>true</canUpdateCopyright>
+               <canUpdateDescription>true</canUpdateDescription>
+      
+               <!-- licence configuration -->
+               <addJavaLicenseAfterPackage>true</addJavaLicenseAfterPackage>
+               <licenseName>alfresco_community</licenseName>
+               <licenseResolver>file:${project.parent.basedir}/license</licenseResolver>
+      
+               <!-- dry run options -->
+               <dryRun>${license.update.dryrun}</dryRun>
+               <failOnMissingHeader>true</failOnMissingHeader>
+               <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
+      
+               <!-- exculsions -->
+               <excludes>
+                  <exclude>**/package-info.java</exclude>
+                  <exclude>**/*.properties</exclude>
+                  <exclude>**/*.css</exclude>
+                  <exclude>**/*.xml</exclude>
+                  <exclude>**/*.json</exclude>
+                  <exclude>**/*.txt</exclude>
+               </excludes>
+      
+            </configuration>
+            <executions>
+               <execution>
+                  <id>first</id>
+                  <goals>
+                     <goal>update-file-header</goal>
+                  </goals>
+                  <phase>process-sources</phase>
+               </execution>
+            </executions>
+         </plugin>
 	      
       </plugins>
       <pluginManagement>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index c8acc4652e..54cbc0fbb4 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -224,65 +224,64 @@
                   </goals>
                </execution>
             </executions>
-         </plugin>
+            </plugin>
          
-         <!--  License header generation -->
-         <plugin>
-	        <groupId>org.codehaus.mojo</groupId>
-	        <artifactId>license-maven-plugin</artifactId>
-	        <version>1.8</version>
-	        <configuration>
-	          
-	          <verbose>${license.verbose}</verbose>
-	          <addSvnKeyWords>false</addSvnKeyWords> 
-		      
-	          <!-- header configuration -->            
-              <organizationName>${license.org.name}</organizationName>
-	          <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
-              <canUpdateCopyright>true</canUpdateCopyright>
-              <canUpdateDescription>true</canUpdateDescription>
-	          
-	          <!--  licence configuration -->
-	          <addJavaLicenseAfterPackage>true</addJavaLicenseAfterPackage>
-              <licenseName>alfresco_community</licenseName>
-              <licenseResolver>file:/${project.parent.parent.basedir}/license</licenseResolver>
-              
-              <!-- dry run options -->
-              <dryRun>${license.update.dryrun}</dryRun>
-              <failOnMissingHeader>true</failOnMissingHeader>
-              <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
-              
-              <!--  source roots to check -->
-              <roots>
-				<root>source/java</root>
-				<root>unit-test/java</root>
-				<root>source/compatibility</root>
-				<root>config</root>
-				<root>test/java</root>
-				<root>test/resources</root>
-			  </roots>
-
-			  <!-- exculsions -->
-			  <excludes>			    
-            	<exclude>**/package-info.java</exclude>
-			  	<exclude>**/*.properties</exclude>
-			  	<exclude>**/*.css</exclude>
-			  	<exclude>**/*.xml</exclude>
-			  	<exclude>**/*.json</exclude>
-			  	<exclude>**/*.txt</exclude>
-			  </excludes>
-			  
-	        </configuration>
-	        <executions>
-	          <execution>
-	            <id>first</id>
-	            <goals>
-	              <goal>update-file-header</goal>
-	            </goals>
-	            <phase>process-sources</phase>
-	          </execution>
-	        </executions>
-	      </plugin>
+            <!-- License header generation -->
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>license-maven-plugin</artifactId>
+               <version>1.8</version>
+               <configuration>
+      
+               <verbose>${license.verbose}</verbose>
+               <addSvnKeyWords>false</addSvnKeyWords>
+               <!-- header configuration -->
+               <organizationName>${license.org.name}</organizationName>
+               <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
+               <canUpdateCopyright>true</canUpdateCopyright>
+               <canUpdateDescription>true</canUpdateDescription>
+      
+               <!-- licence configuration -->
+               <addJavaLicenseAfterPackage>true</addJavaLicenseAfterPackage>
+               <licenseName>alfresco_community</licenseName>
+               <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
+      
+               <!-- dry run options -->
+               <dryRun>${license.update.dryrun}</dryRun>
+               <failOnMissingHeader>true</failOnMissingHeader>
+               <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
+      
+               <!-- source roots to check -->
+               <roots>
+                  <root>source/java</root>
+                  <root>unit-test/java</root>
+                  <root>source/compatibility</root>
+                  <root>config</root>
+                  <root>test/java</root>
+                  <root>test/resources</root>
+               </roots>
+      
+               <!-- exculsions -->
+               <excludes>
+                  <exclude>**/package-info.java</exclude>
+                  <exclude>**/*.properties</exclude>
+                  <exclude>**/*.css</exclude>
+                  <exclude>**/*.xml</exclude>
+                  <exclude>**/*.json</exclude>
+                  <exclude>**/*.txt</exclude>
+               </excludes>
+      
+            </configuration>
+            <executions>
+               <execution>
+                  <id>first</id>
+                  <goals>
+                     <goal>update-file-header</goal>
+                  </goals>
+                  <phase>process-sources</phase>
+               </execution>
+            </executions>
+         </plugin>
          
       </plugins>
       <pluginManagement>