svn commit: r1693344 - in /maven/shared/trunk/maven-reporting-impl: pom.xml src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java

[rfscholte]

Author: rfscholte
Date: Wed Jul 29 20:55:58 2015
New Revision: 1693344

URL: http://svn.apache.org/r1693344
Log:
[MSHARED-430] Update JDK requirement to 1.6 / upgrade Maven Core dependencies 
to 3.0
Also remove MavenMultiPageReport, since it was a "Temporary copy of 
maven-reporting-api class to avoid Maven 3 prerequisite"

Removed:
    
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
Modified:
    maven/shared/trunk/maven-reporting-impl/pom.xml

Modified: maven/shared/trunk/maven-reporting-impl/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/pom.xml?rev=1693344&r1=1693343&r2=1693344&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-impl/pom.xml (original)
+++ maven/shared/trunk/maven-reporting-impl/pom.xml Wed Jul 29 20:55:58 2015
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.maven.reporting</groupId>
   <artifactId>maven-reporting-impl</artifactId>
-  <version>2.5-SNAPSHOT</version>
+  <version>3.0-SNAPSHOT</version>
 
   <name>Apache Maven Reporting Implementation</name>
   <description>Abstract classes to manage report generation.</description>
@@ -63,8 +63,10 @@
   </distributionManagement>
 
   <properties>
-    <mavenVersion>2.2.1</mavenVersion>
+    <mavenVersion>3.0</mavenVersion>
     <doxiaVersion>1.6</doxiaVersion>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -77,7 +79,7 @@
     <!-- Maven -->
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
+      <artifactId>maven-core</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
     <dependency>
@@ -98,6 +100,11 @@
       <version>${doxiaVersion}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-decoration-model</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-core</artifactId>
       <version>${doxiaVersion}</version>