Author: aheritier
Date: Sat Feb 4 15:21:07 2006
New Revision: 374945
URL: http://svn.apache.org/viewcvs?rev=374945&view=rev
Log:
Synchronize with bundled plugins settings :
- Remove unused files
- cleanup properties and projects descriptions
Added:
maven/maven-1/plugins-sandbox/trunk/plugin-parent/LICENSE.txt
- copied unchanged from r374896,
maven/maven-1/plugins-sandbox/trunk/LICENSE.txt
maven/maven-1/plugins-sandbox/trunk/plugin-parent/NOTICE.txt
- copied unchanged from r374896,
maven/maven-1/plugins-sandbox/trunk/NOTICE.txt
maven/maven-1/plugins-sandbox/trunk/plugin-parent/checkstyle-license.txt
- copied unchanged from r374896,
maven/maven-1/plugins-sandbox/trunk/checkstyle-license.txt
maven/maven-1/plugins-sandbox/trunk/plugin-parent/checkstyle.xml
- copied unchanged from r374896,
maven/maven-1/plugins-sandbox/trunk/checkstyle.xml
Removed:
maven/maven-1/plugins-sandbox/trunk/LICENSE.txt
maven/maven-1/plugins-sandbox/trunk/NOTICE.txt
maven/maven-1/plugins-sandbox/trunk/checkstyle-license.txt
maven/maven-1/plugins-sandbox/trunk/checkstyle.xml
Modified:
maven/maven-1/plugins-sandbox/trunk/maven.xml
maven/maven-1/plugins-sandbox/trunk/plugin-parent/maven.xml
maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.properties
maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.xml
maven/maven-1/plugins-sandbox/trunk/project.properties
maven/maven-1/plugins-sandbox/trunk/project.xml
Modified: maven/maven-1/plugins-sandbox/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/maven.xml?rev=374945&r1=374944&r2=374945&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/maven.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/maven.xml Sat Feb 4 15:21:07 2006
@@ -1,6 +1,6 @@
<!--
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,12 @@
*/
-->
<project xmlns:ant="jelly:ant" xmlns:i="jelly:interaction"
xmlns:j="jelly:core" xmlns:maven="jelly:maven">
+ <goal name="plugins:install-all" description="Install all plugins">
+ <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}" goals="clean,plugin:install"
banner="Install" ignoreFailures="false"/>
+ </goal>
+ <goal name="plugins:repository-deploy-all" description="Deploy all plugins
in a remote repository">
+ <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}"
goals="clean,plugin:repository-deploy" banner="Deploy" ignoreFailures="false"/>
+ </goal>
<goal name="plugins:test-all" description="Test all plugins">
<maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}" goals="plugin:test" banner="Test"
ignoreFailures="false"/>
</goal>
@@ -24,15 +30,14 @@
</goal>
<goal name="plugins:deploy-all-sites" description="Create and deploy the web
site for all plugins">
<!-- We don't want to have the question about to deploy the root site
after each plugin -->
- <ant:property name="skip.main.site" value="true"/>
- <ant:property name="goal" value="site:deploy"/>
+ <j:set var="skipQuestion" value="true" scope="parent"/>
+ <j:set var="goal" value="site:deploy"/>
<attainGoal name="multiproject:goal"/>
<attainGoal name="multiproject:site"/>
<attainGoal name="site:deploy"/>
</goal>
<goal name="confirm-and-deploy-site">
- <j:set var="skipQuestion" value="${skip.main.site}"/>
- <j:if test="${!empty(skipQuestion) and skipQuestion==true}">
+ <j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
<i:ask question="Would you like to regenerate and deploy the main
plugins site (y/n)?" answer="ok" default="y"/>
<j:if test="${ok == 'y'}">
<attainGoal name="multiproject:site"/>
Modified: maven/maven-1/plugins-sandbox/trunk/plugin-parent/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugin-parent/maven.xml?rev=374945&r1=374944&r2=374945&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugin-parent/maven.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/plugin-parent/maven.xml Sat Feb 4
15:21:07 2006
@@ -1,6 +1,6 @@
<!--
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,10 +30,21 @@
<ant:copy todir="${dir}/../plugin-parent">
<ant:fileset dir="${pom.parent.file.parent}" />
</ant:copy>
- <ant:copy todir="${dir}/.."
file="${pom.parent.file.parent}/../LICENSE.txt" />
- <ant:copy todir="${dir}/.." file="${pom.parent.file.parent}/../NOTICE.txt"
/>
- <ant:copy todir="${dir}/.."
file="${pom.parent.file.parent}/../checkstyle.xml" />
- <ant:copy todir="${dir}/.."
file="${pom.parent.file.parent}/../checkstyle-license.txt" />
+ <ant:copy todir="${dir}/.." file="${pom.parent.file.parent}/LICENSE.txt" />
+ <ant:copy todir="${dir}/.." file="${pom.parent.file.parent}/NOTICE.txt" />
+ <ant:copy todir="${dir}/.."
file="${pom.parent.file.parent}/checkstyle.xml" />
+ <ant:copy todir="${dir}/.."
file="${pom.parent.file.parent}/checkstyle-license.txt" />
<j:set var="executionDir" value="${basedir}" scope="parent" />
+ </postGoal>
+
+ <postGoal name="site:deploy">
+ <j:if test="${empty(executionDir)}">
+ <j:set var="executionDir" value="${basedir}" />
+ </j:if>
+ <maven:maven
+ descriptor="${executionDir}/../project.xml"
+ goals="confirm-and-deploy-site"
+ ignoreFailures="false"
+ />
</postGoal>
</project>
Modified: maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.properties?rev=374945&r1=374944&r2=374945&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.properties
(original)
+++ maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.properties Sat
Feb 4 15:21:07 2006
@@ -119,13 +119,13 @@
#=====
# Checkstyle plugin settings
#=====
-maven.checkstyle.header.file = ${basedir}/../checkstyle-license.txt
-maven.checkstyle.properties = ${basedir}/../checkstyle.xml
+maven.checkstyle.header.file =
${basedir}/../plugin-parent/checkstyle-license.txt
+maven.checkstyle.properties = ${basedir}/../plugin-parent/checkstyle.xml
#=====
# License plugin settings
#=====
-maven.license.licenseFile=${basedir}/../LICENSE.txt
+maven.license.licenseFile=${basedir}/../plugin-parent/LICENSE.txt
#=====
# LinkCheck plugin settings
Modified: maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.xml?rev=374945&r1=374944&r2=374945&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/plugin-parent/project.xml Sat Feb 4
15:21:07 2006
@@ -2,7 +2,7 @@
<!--
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,10 +18,11 @@
*/
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0
http://maven.apache.org/maven-v3_0_0.xsd";>
<pomVersion>3</pomVersion>
- <artifactId>plugin-sandbox-parent</artifactId>
+ <id>plugin-sandbox-parent</id>
<name>Maven Plugins Sandbox</name>
<groupId>maven</groupId>
<currentVersion>1.0</currentVersion>
@@ -36,9 +37,9 @@
<issueTrackingUrl>http://jira.codehaus.org/browse/MAVEN</issueTrackingUrl>
<siteAddress>people.apache.org</siteAddress>
-
<siteDirectory>/www/maven.apache.org/maven-1.x/plugins-sandbox/</siteDirectory>
- <distributionSite>cvs.apache.org</distributionSite>
-
<distributionDirectory>/www/cvs.apache.org/repository/</distributionDirectory>
+
<siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins-sandbox/</siteDirectory>
+ <distributionSite>people.apache.org</distributionSite>
+
<distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>
<mailingLists>
<mailingList>
@@ -85,6 +86,7 @@
</developers>
<build>
+ <defaultGoal>plugin:plugin</defaultGoal>
<sourceDirectory>src/main</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<nagEmailAddress>dev@maven.apache.org</nagEmailAddress>
@@ -97,7 +99,7 @@
<resources>
<resource>
- <directory>..</directory>
+ <directory>../plugin-parent/</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
@@ -128,12 +130,14 @@
<report>maven-tasklist-plugin</report>
<report>maven-javadoc-plugin</report>
<report>maven-jxr-plugin</report>
+ <report>maven-jira-plugin</report>
<report>maven-jdepend-plugin</report>
<report>maven-checkstyle-plugin</report>
<report>maven-junit-report-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
<report>maven-faq-plugin</report>
+ <report>maven-linkcheck-plugin</report>
</reports>
</project>
Modified: maven/maven-1/plugins-sandbox/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/project.properties?rev=374945&r1=374944&r2=374945&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/project.properties (original)
+++ maven/maven-1/plugins-sandbox/trunk/project.properties Sat Feb 4 15:21:07
2006
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
+# Copyright 2001-2006 The Apache Software Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,30 +20,71 @@
# must now inherit from /plugin-parent/project.xml.
#====================================================================
-# Enable HTML to xdoc transformation
-maven.html2xdoc.enabled=true
-
-# Choose aggregators to use for the dashboard plugin report
-maven.dashboard.aggregators =
csall,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl
+#=====
+# Changelog plugin properties
+#=====
+maven.changelog.svn.baseurl=http://svn.apache.org/viewcvs.cgi
+maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+#=====
+# Changes plugin settings
+#=====
+# Changes issue template
+maven.changes.issue.template = %URL%/%ISSUE%
+
+#=====
+# Checkstyle plugin settings
+#=====
+maven.checkstyle.header.file = ${basedir}/plugin-parent/checkstyle-license.txt
+maven.checkstyle.properties = ${basedir}/plugin-parent/checkstyle.xml
+
+#=====
+# Clover plugin settings
+#=====
# Make sure we generate a Clover XML report so that the dashboard
# Clover aggregator can extract Clover data
maven.clover.report.xml=true
+#=====
+# Dashboard plugin properties
+#=====
+# Choose aggregators to use for the dashboard plugin report
+maven.dashboard.aggregators =
csall,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,simiantdl,tasklist,jiraopen,jirascheduled
+
+#=====
+# License plugin settings
+#=====
+maven.license.licenseFile=${basedir}/plugin-parent/LICENSE.txt
+
+#=====
+# LinkCheck plugin settings
+#=====
+maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl}
+
+#=====
+# Multichanges plugin settings
+#=====
+maven.multichanges.excludes=${maven.multiproject.excludes}
+
+#=====
# Multiproject plugin settings
+#=====
maven.multiproject.navigation=independent
maven.multiproject.overviewPage.title=Maven Plugins in the Sandbox
maven.multiproject.overviewPage.text=The following Maven plugins are available
in the sandbox, some of them because they are still in early development and
others because they are no longer mantained:
maven.multiproject.excludes=plugin-parent/project.xml
-maven.xdoc.date = left
-maven.xdoc.date.format = dd MMMM yyyy HH:mm z
-maven.xdoc.version =
-
-
-maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+#=====
+# Site plugin settings
+#=====
maven.site.stage.address=people.apache.org
maven.site.stage.directory=/home/brett/public_html/maven-stage-site/${pom.siteDirectory.substring(22)}
maven.site.deploy.method=rsync
-maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css
\ No newline at end of file
+#=====
+# XDOC plugin settings
+#=====
+maven.xdoc.date = left
+maven.xdoc.date.format = dd MMMM yyyy HH:mm z
+maven.xdoc.version =
+maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css
Modified: maven/maven-1/plugins-sandbox/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/project.xml?rev=374945&r1=374944&r2=374945&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/project.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/project.xml Sat Feb 4 15:21:07 2006
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-->
-<project>
- <!-- TODO make it extend the main plugins project -->
+<project xmlns="http://maven.apache.org/POM/3.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/3.0.0
http://maven.apache.org/maven-v3_0_0.xsd";>
<pomVersion>3</pomVersion>
<id>plugin-sandbox-root</id>
<name>Maven Plugins Sandbox</name>
@@ -31,12 +30,12 @@
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
<logo>http://maven.apache.org/images/maven-logo-2.gif</logo>
- <url>http://maven.apache.org/maven-1.x/plugins-sandbox/</url>
+ <url>http://maven.apache.org/maven-1.x/reference/plugins-sandbox/</url>
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10030</issueTrackingUrl>
<siteAddress>people.apache.org</siteAddress>
-
<siteDirectory>/www/maven.apache.org/maven-1.x/plugins-sandbox/</siteDirectory>
- <distributionSite>cvs.apache.org</distributionSite>
-
<distributionDirectory>/www/cvs.apache.org/repository/</distributionDirectory>
+
<siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins-sandbox/</siteDirectory>
+ <distributionSite>people.apache.org</distributionSite>
+
<distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>
<mailingLists>
<mailingList>
<name>Maven User List</name>
@@ -53,6 +52,7 @@
</mailingLists>
<repository>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/</developerConnection>
<url>http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/</url>
</repository>
<developers>
@@ -85,53 +85,18 @@
</dependency>
</dependencies>
<build>
- <nagEmailAddress>dev@maven.apache.org</nagEmailAddress>
- <sourceDirectory>src/main</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
- <resources>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>src/plugin-resources</directory>
- <targetPath>plugin-resources</targetPath>
- </resource>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.jelly</include>
- <include>plugin.properties</include>
- <include>project.properties</include>
- <include>project.xml</include>
- </includes>
- </resource>
- </resources>
+ <defaultGoal>plugins:site</defaultGoal>
</build>
<reports>
- <report>maven-jdepend-plugin</report>
- <report>maven-checkstyle-plugin</report>
- <report>maven-changes-plugin</report>
<report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-dashboard-plugin</report>
<report>maven-developer-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-tasklist-plugin</report>
- <report>maven-jellydoc-plugin</report>
- <report>maven-pmd-plugin</report>
- <report>maven-simian-plugin</report>
<report>maven-faq-plugin</report>
- <report>maven-multiproject-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-linkcheck-plugin</report>
<report>maven-multichanges-plugin</report>
+ <report>maven-multiproject-plugin</report>
</reports>
</project>
