[MSHADE-451] Upgrade Maven 3.0 + JDK 6
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1710881 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 1420af2..a734447 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
<artifactId>maven-filtering</artifactId>
<version>1.4-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Apache Maven Filtering</name>
<description>A component to assist in filtering of resource files with properties from a Maven project.</description>
@@ -55,7 +54,9 @@
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
</properties>
<contributors>
@@ -67,36 +68,10 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>${mavenVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>0.7</version>
@@ -104,7 +79,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.18</version>
+ <version>3.0.22</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -114,7 +89,7 @@
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
- <version>0.0.4</version>
+ <version>0.0.7</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -125,6 +100,7 @@
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
+ <!-- FIXME: Upgrade from 0.0.4 to 0.0.7 will fail some tests -->
<version>0.0.4</version>
<scope>test</scope>
<classifier>tests</classifier>
@@ -139,7 +115,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>