Author: khmarbaise
Date: Wed Sep 30 09:02:55 2015
New Revision: 1705988
URL: http://svn.apache.org/viewvc?rev=1705988&view=rev
Log:
[MSHARED-439] Upgrade to Maven 3.0 dependencies and JDK6
- Upgraded commons-io to 2.4
- Upgraded commons-lang3 to 3.4
- Upgraded maven-plugin-testing-harness to 2.1
- Upgraded maven-shade-plugin explicitly to 2.4.1
- Upgraded maven-checkstyle-plugin explicitly to 2.15
Modified:
maven/shared/trunk/maven-shared-utils/pom.xml
Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1705988&r1=1705987&r2=1705988&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Wed Sep 30 09:02:55 2015
@@ -34,7 +34,7 @@
<description>Shared utils without any further dependencies</description>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>${mavenVersion}</maven>
</prerequisites>
<scm>
@@ -56,6 +56,10 @@
<properties>
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder</checkstyle.violation.ignore>
+
+ <mavenVersion>3.0</mavenVersion>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
</properties>
<dependencies>
@@ -74,15 +78,13 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.2</version>
- <!-- attention: this is the last version supporting java-1.5 -->
+ <version>2.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- <!-- attention: this is the last version supporting java-1.5 -->
+ <version>3.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -98,9 +100,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.1</version>
+ <version>2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -110,7 +112,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
+ <!--
+ ! After a new parent has been released this version can be removed.
+ -->
+ <version>2.4.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -141,6 +146,14 @@
<version>2.5.5</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <!--
+ ! After a new parent has been released this version can be removed.
+ -->
+ <version>2.15</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
@@ -177,7 +190,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.13</version>
+ <!--
+ ! After a new parent has been released this version can be
removed.
+ -->
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>
