move reports into maven-plugins

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

m2-bootstrap-all.bat

@@ -125,15 +125,6 @@ cd maven-plugins
 call m2 --no-plugin-registry --check-plugin-latest --batch-mode -DupdateReleaseInfo=true -e %MAVEN_CMD_LINE_ARGS% clean:clean install
 cd ..
 
-echo
-echo -----------------------------------------------------------------------
-echo Rebuilding maven2 reports
-echo -----------------------------------------------------------------------
-cd maven-reports
-@REM update the release info to ensure these versions get used in the integration tests
-call m2 --no-plugin-registry --check-plugin-latest --batch-mode -DupdateReleaseInfo=true -e %MAVEN_CMD_LINE_ARGS% clean:clean install
-cd ..
-
 echo
 echo -----------------------------------------------------------------------
 echo Running integration tests

m2-bootstrap-all.sh

@@ -62,18 +62,6 @@ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 )
 ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
-(
-  echo "-----------------------------------------------------------------------"
-  echo " Rebuilding maven2 reports ... "
-  echo "-----------------------------------------------------------------------"  
-
-  cd maven-reports
-  # update the release info to ensure these versions get used in the integration tests
-  m2 --no-plugin-registry --check-plugin-latest --batch-mode -DupdateReleaseInfo=true -e $ARGS clean:clean install
-  ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-)
-ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-
 (
   cd ./maven-core-it
   echo

maven-plugins/maven-checkstyle-plugin/pom.xml

@@ -1,7 +1,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>maven-report-parent</artifactId>
+    <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
     <version>2.0-beta-1-SNAPSHOT</version>
   </parent>
@@ -11,6 +11,11 @@
   <name>Maven Checkstyle Plugin</name>
   <inceptionYear>2005</inceptionYear>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>2.0-beta-1-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>checkstyle</groupId>
       <artifactId>checkstyle</artifactId>

maven-plugins/maven-javadoc-plugin/pom.xml

@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-report-parent</artifactId>
+    <artifactId>maven-plugin-parent</artifactId>
     <version>2.0-beta-1-SNAPSHOT</version>
   </parent>
   <artifactId>maven-javadoc-plugin</artifactId>
@@ -30,6 +30,11 @@
   <packaging>maven-plugin</packaging>
   <name>Maven Javadoc Plugin</name>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>2.0-beta-1-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

maven-plugins/maven-pmd-plugin/pom.xml

@@ -1,7 +1,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>maven-report-parent</artifactId>
+    <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
     <version>2.0-beta-1-SNAPSHOT</version>
   </parent>
@@ -11,6 +11,11 @@
   <name>Maven PMD Plugin</name>
   <inceptionYear>2005</inceptionYear>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>2.0-beta-1-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>pmd</groupId>
       <artifactId>pmd</artifactId>

maven-plugins/maven-project-info-reports-plugin/pom.xml

@@ -21,7 +21,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>maven-report-parent</artifactId>
+    <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
     <version>2.0-beta-1-SNAPSHOT</version>
   </parent>
@@ -31,6 +31,11 @@
   <name>Maven Project Info Reports Plugin</name>
   <inceptionYear>2005</inceptionYear>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>2.0-beta-1-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>commons-validator</groupId>
       <artifactId>commons-validator</artifactId>

maven-plugins/pom.xml

@@ -90,6 +90,7 @@
   <modules>
     <module>maven-ant-plugin</module>
     <module>maven-assembly-plugin</module>
+    <module>maven-checkstyle-plugin</module>
     <module>maven-clean-plugin</module>
     <module>maven-clover-plugin</module>
     <module>maven-compiler-plugin</module>
@@ -100,8 +101,11 @@
     <module>maven-idea-plugin</module>
     <module>maven-install-plugin</module>
     <module>maven-jar-plugin</module>
+    <module>maven-javadoc-plugin</module>
     <module>maven-plugin-plugin</module>
+    <module>maven-pmd-plugin</module>
     <module>maven-projecthelp-plugin</module>
+    <module>maven-project-info-reports-plugin</module>
     <module>maven-release-plugin</module>
     <module>maven-resources-plugin</module>
     <module>maven-site-plugin</module>

maven-reports/pom.xml

@@ -1,31 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>maven-plugin-parent</artifactId>
-    <groupId>org.apache.maven.plugins</groupId>
-    <version>2.0-beta-1-SNAPSHOT</version>
-  </parent>
-  <artifactId>maven-report-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>2.0-beta-1-SNAPSHOT</version>
-  <name>Maven Reports</name>
-  <description>Maven report parent</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>2.0-beta-1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <modules>
-    <module>maven-checkstyle-plugin</module>
-    <module>maven-javadoc-plugin</module>
-    <module>maven-pmd-plugin</module>
-    <module>maven-project-info-reports-plugin</module>
-  </modules>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk/maven-reports/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk/maven-reports/</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/components/maven-reports/</url>
-  </scm>
-</project>