From: Dominik Stadler <centic@apache.org>
Date: Sat, 11 Jun 2016 08:45:28 +0000 (+0000)
Subject: Update to latest versions of Maven plugins for Sonar-build and use properties for... 
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7efdb9330ef3565dd23c35c2f483eca8cf25aa5e;p=poi.git

Update to latest versions of Maven plugins for Sonar-build and use properties for some third party libs and some Maven plugins

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1747861 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index b54b008945..a6df70a861 100644
--- a/sonar/examples/pom.xml
+++ b/sonar/examples/pom.xml
@@ -18,7 +18,7 @@
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
+				<version>${maven.plugin.resources.version}</version>
 				<executions>
 					<execution>
 						<id>copy-sources</id>
@@ -41,7 +41,7 @@
 			<!-- clean copied sources afterwards -->
 			<plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>${maven.plugin.clean.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 2f8bf7e2f1..288e877071 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -18,7 +18,7 @@
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
+				<version>${maven.plugin.resources.version}</version>
 				<executions>
 					<execution>
 						<id>copy-sources</id>
@@ -73,7 +73,7 @@
 			<!-- clean copied sources afterwards -->
 			<plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>${maven.plugin.clean.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 94183174b3..35180aa55c 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -18,7 +18,7 @@
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
+				<version>${maven.plugin.resources.version}</version>
 				<executions>
 					<execution>
 						<id>copy-sources</id>
@@ -72,7 +72,7 @@
 			<!-- clean copied sources afterwards -->
 			<plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>${maven.plugin.clean.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -87,7 +87,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
+				<version>${maven.plugin.jar.version}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>${maven.plugin.surefire.version}</version>
                 <configuration>
                     <argLine>-Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml
index 8d95d7cba9..bbeba00aae 100644
--- a/sonar/ooxml-schema-encryption/pom.xml
+++ b/sonar/ooxml-schema-encryption/pom.xml
@@ -24,7 +24,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
+				<version>${maven.plugin.antrun.version}</version>
 				<executions>
 					<execution>
 						<id>unzip-schema</id>
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.apache.xmlbeans</groupId>
 			<artifactId>xmlbeans</artifactId>
-			<version>2.6.0</version>
+			<version>${xmlbeans.version}</version>
 		</dependency>
     </dependencies>
 </project>
diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml
index 14a8ac759e..cade8c30fe 100644
--- a/sonar/ooxml-schema-security/pom.xml
+++ b/sonar/ooxml-schema-security/pom.xml
@@ -28,7 +28,7 @@
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>maven-download-plugin</artifactId>
-				<version>1.1.0</version>
+				<version>${maven.plugin.download.version}</version>
 				<executions>
 					<execution>
 						<id>install-xsds-part-1</id>
@@ -101,7 +101,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
+				<version>${maven.plugin.antrun.version}</version>
 				<executions>
 					<execution>
 						<id>unzip-schema</id>
@@ -128,7 +128,7 @@
 		<dependency>
 			<groupId>org.apache.xmlbeans</groupId>
 			<artifactId>xmlbeans</artifactId>
-			<version>2.6.0</version>
+			<version>${xmlbeans.version}</version>
 		</dependency>    	
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index 57f072ead8..cad8912c3a 100644
--- a/sonar/ooxml-schema/pom.xml
+++ b/sonar/ooxml-schema/pom.xml
@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>maven-download-plugin</artifactId>
-				<version>1.1.0</version>
+				<version>${maven.plugin.download.version}</version>
 				<executions>
 					<execution>
 						<id>download-xsds</id>
@@ -47,7 +47,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
+				<version>${maven.plugin.antrun.version}</version>
 				<executions>
 					<execution>
 						<id>unzip-schema</id>
@@ -83,7 +83,7 @@
         <dependency>
           <groupId>org.apache.xmlbeans</groupId>
           <artifactId>xmlbeans</artifactId>
-          <version>2.6.0</version>
+          <version>${xmlbeans.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 269d1dd467..9d1e40ce6a 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -18,7 +18,7 @@
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
+				<version>${maven.plugin.resources.version}</version>
 				<executions>
 					<execution>
 						<id>copy-sources</id>
@@ -71,7 +71,7 @@
 			<!-- clean copied sources afterwards -->
 			<plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>${maven.plugin.clean.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -91,7 +91,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>${maven.plugin.surefire.version}</version>
                 <configuration>
                     <argLine>-Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
@@ -131,7 +131,7 @@
 		<dependency>
 		  <groupId>org.apache.xmlbeans</groupId>
 		  <artifactId>xmlbeans</artifactId>
-		  <version>2.6.0</version>
+		  <version>${xmlbeans.version}</version>
 		</dependency>
 		
 		<dependency>
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 0ad1edd20c..0eeae42abd 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -61,6 +61,16 @@
 		<project.build.sourceEncoding>ASCII</project.build.sourceEncoding>
 		<!-- Try to disable running SVN blame as it causes errors here because the source is copied from the actual SVN location here! -->
 		<sonar.scm.disabled>true</sonar.scm.disabled>
+
+		<!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
+		<xmlbeans.version>2.6.0</xmlbeans.version>
+		<junit.version>4.12</junit.version>
+		<maven.plugin.resources.version>3.0.1</maven.plugin.resources.version>
+		<maven.plugin.jar.version>3.0.1</maven.plugin.jar.version>
+		<maven.plugin.clean.version>3.0.0</maven.plugin.clean.version>
+		<maven.plugin.download.version>1.3.0</maven.plugin.download.version>
+		<maven.plugin.antrun.version>1.8</maven.plugin.antrun.version>
+		<maven.plugin.surefire.version>2.19.1</maven.plugin.surefire.version>
 	</properties>
 	
 	<build>
@@ -69,7 +79,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.3</version>
+					<version>3.5.1</version>
 					<configuration>
 						<source>1.6</source>
 						<target>1.6</target>
@@ -81,12 +91,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19</version>
+				<version>${maven.plugin.surefire.version}</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.apache.maven.surefire</groupId>
 						<artifactId>surefire-junit47</artifactId>
-						<version>2.19</version>
+						<version>${maven.plugin.surefire.version}</version>
 					</dependency>
 				</dependencies>
 				<configuration>
@@ -118,7 +128,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -195,7 +205,7 @@
 
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
+            <version>${maven.plugin.antrun.version}</version>
             <executions>
               <execution>
                 <id>copy-xmltype-and-xsdconfig</id>
@@ -254,7 +264,7 @@
         <dependency>
           <groupId>org.apache.xmlbeans</groupId>
           <artifactId>xmlbeans</artifactId>
-          <version>2.6.0</version>
+          <version>${xmlbeans.version}</version>
         </dependency>
       </dependencies>
 		</profile>
diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index 104a8f3d8e..f476313bd0 100644
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -24,7 +24,7 @@
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
+				<version>${maven.plugin.resources.version}</version>
 				<executions>
 					<execution>
 						<id>copy-sources</id>
@@ -79,7 +79,7 @@
 			<!-- clean copied sources afterwards -->
 			<plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>${maven.plugin.clean.version}</version>
                 <configuration>
                     <filesets>
                         <fileset>