You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2016/06/11 08:45:28 UTC
svn commit: r1747861 - in /poi/trunk/sonar: examples/pom.xml
excelant/pom.xml main/pom.xml ooxml-schema-encryption/pom.xml
ooxml-schema-security/pom.xml ooxml-schema/pom.xml ooxml/pom.xml pom.xml
scratchpad/pom.xml
Author: centic
Date: Sat Jun 11 08:45:28 2016
New Revision: 1747861
URL: http://svn.apache.org/viewvc?rev=1747861&view=rev
Log:
Update to latest versions of Maven plugins for Sonar-build and use properties for some third party libs and some Maven plugins
Modified:
poi/trunk/sonar/examples/pom.xml
poi/trunk/sonar/excelant/pom.xml
poi/trunk/sonar/main/pom.xml
poi/trunk/sonar/ooxml-schema-encryption/pom.xml
poi/trunk/sonar/ooxml-schema-security/pom.xml
poi/trunk/sonar/ooxml-schema/pom.xml
poi/trunk/sonar/ooxml/pom.xml
poi/trunk/sonar/pom.xml
poi/trunk/sonar/scratchpad/pom.xml
Modified: poi/trunk/sonar/examples/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/examples/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/examples/pom.xml (original)
+++ poi/trunk/sonar/examples/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/excelant/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/excelant/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/excelant/pom.xml (original)
+++ poi/trunk/sonar/excelant/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/main/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/main/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/main/pom.xml (original)
+++ poi/trunk/sonar/main/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/ooxml-schema-encryption/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-schema-encryption/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml-schema-encryption/pom.xml (original)
+++ poi/trunk/sonar/ooxml-schema-encryption/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/ooxml-schema-security/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-schema-security/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml-schema-security/pom.xml (original)
+++ poi/trunk/sonar/ooxml-schema-security/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/ooxml-schema/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-schema/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml-schema/pom.xml (original)
+++ poi/trunk/sonar/ooxml-schema/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/ooxml/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/pom.xml (original)
+++ poi/trunk/sonar/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
Modified: poi/trunk/sonar/scratchpad/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/scratchpad/pom.xml?rev=1747861&r1=1747860&r2=1747861&view=diff
==============================================================================
--- poi/trunk/sonar/scratchpad/pom.xml (original)
+++ poi/trunk/sonar/scratchpad/pom.xml Sat Jun 11 08:45:28 2016
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org