You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/21 04:20:28 UTC
svn commit: r219985 - in /maven/components/trunk: ./ maven-plugins/
maven-plugins/maven-checkstyle-plugin/ maven-plugins/maven-javadoc-plugin/
maven-plugins/maven-pmd-plugin/
maven-plugins/maven-project-info-reports-plugin/ maven-reports/
Author: brett
Date: Wed Jul 20 19:20:27 2005
New Revision: 219985
URL: http://svn.apache.org/viewcvs?rev=219985&view=rev
Log:
move reports into maven-plugins
Added:
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/
- copied from r219837, maven/components/trunk/maven-reports/maven-checkstyle-plugin/
maven/components/trunk/maven-plugins/maven-javadoc-plugin/
- copied from r219837, maven/components/trunk/maven-reports/maven-javadoc-plugin/
maven/components/trunk/maven-plugins/maven-pmd-plugin/
- copied from r219837, maven/components/trunk/maven-reports/maven-pmd-plugin/
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/
- copied from r219837, maven/components/trunk/maven-reports/maven-project-info-reports-plugin/
Removed:
maven/components/trunk/maven-reports/
Modified:
maven/components/trunk/m2-bootstrap-all.bat
maven/components/trunk/m2-bootstrap-all.sh
maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
maven/components/trunk/maven-plugins/pom.xml
Modified: maven/components/trunk/m2-bootstrap-all.bat
URL: http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.bat?rev=219985&r1=219984&r2=219985&view=diff
==============================================================================
--- maven/components/trunk/m2-bootstrap-all.bat (original)
+++ maven/components/trunk/m2-bootstrap-all.bat Wed Jul 20 19:20:27 2005
@@ -127,15 +127,6 @@
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
echo -----------------------------------------------------------------------
cd maven-core-it
Modified: maven/components/trunk/m2-bootstrap-all.sh
URL: http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.sh?rev=219985&r1=219984&r2=219985&view=diff
==============================================================================
--- maven/components/trunk/m2-bootstrap-all.sh (original)
+++ maven/components/trunk/m2-bootstrap-all.sh Wed Jul 20 19:20:27 2005
@@ -63,18 +63,6 @@
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
echo "Running maven-core integration tests ..."
Modified: maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml?rev=219985&r1=219837&r2=219985&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-checkstyle-plugin/pom.xml Wed Jul 20 19:20:27 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml?rev=219985&r1=219837&r2=219985&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml Wed Jul 20 19:20:27 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml?rev=219985&r1=219837&r2=219985&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-pmd-plugin/pom.xml Wed Jul 20 19:20:27 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml?rev=219985&r1=219837&r2=219985&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml Wed Jul 20 19:20:27 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/pom.xml?rev=219985&r1=219984&r2=219985&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/pom.xml (original)
+++ maven/components/trunk/maven-plugins/pom.xml Wed Jul 20 19:20:27 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org