From f4ae455482b7841d704368bec5262b103c2c4a27 Mon Sep 17 00:00:00 2001 From: aheritier Date: Sat, 11 Mar 2006 16:55:57 +0000 Subject: [PATCH] Share properties between plugins and master-site git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@385108 13f79535-47bb-0310-9956-ffa450edef68 --- .../LICENSE.txt | 0 plugins-common/README.txt | 2 + .../checkstyle-license.txt | 0 .../checkstyle.xml | 0 plugins-common/project.properties | 65 +++++++++++++++++++ plugins-parent/project.properties | 39 +---------- plugins-site/README.txt | 1 + plugins-site/project.properties | 38 ----------- 8 files changed, 69 insertions(+), 76 deletions(-) rename {plugins-parent => plugins-common}/LICENSE.txt (100%) create mode 100644 plugins-common/README.txt rename {plugins-parent => plugins-common}/checkstyle-license.txt (100%) rename {plugins-parent => plugins-common}/checkstyle.xml (100%) create mode 100644 plugins-common/project.properties create mode 100644 plugins-site/README.txt diff --git a/plugins-parent/LICENSE.txt b/plugins-common/LICENSE.txt similarity index 100% rename from plugins-parent/LICENSE.txt rename to plugins-common/LICENSE.txt diff --git a/plugins-common/README.txt b/plugins-common/README.txt new file mode 100644 index 00000000..9c9bb646 --- /dev/null +++ b/plugins-common/README.txt @@ -0,0 +1,2 @@ +This directory contains Maven build configuration inherited by all +plugin projects (throught plugins-parent) and the master site project. \ No newline at end of file diff --git a/plugins-parent/checkstyle-license.txt b/plugins-common/checkstyle-license.txt similarity index 100% rename from plugins-parent/checkstyle-license.txt rename to plugins-common/checkstyle-license.txt diff --git a/plugins-parent/checkstyle.xml b/plugins-common/checkstyle.xml similarity index 100% rename from plugins-parent/checkstyle.xml rename to plugins-common/checkstyle.xml diff --git a/plugins-common/project.properties b/plugins-common/project.properties new file mode 100644 index 00000000..f6f387b5 --- /dev/null +++ b/plugins-common/project.properties @@ -0,0 +1,65 @@ +# ------------------------------------------------------------------- +# 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ------------------------------------------------------------------- + +#==================================================================== +# WARNING: All these properties are inherited by the plugin projects +# and by the master site. +#==================================================================== + +#===== +# 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}/../plugins-common/checkstyle-license.txt +maven.checkstyle.properties = ${basedir}/../plugins-common/checkstyle.xml + +#===== +# License plugin settings +#===== +maven.license.licenseFile=${basedir}/../plugins-common/LICENSE.txt + +#===== +# LinkCheck plugin settings +#===== +maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl},http://www.clarkware.com/software/JDepend.html + +#===== +# Site plugin settings +#===== +maven.site.stage.address=people.apache.org +maven.site.stage.directory=/home/${maven.username}/public_html/maven-stage-site/${pom.siteDirectory.substring(22)} +maven.site.deploy.method=rsync + +#===== +# XDOC plugin settings +#===== +# Display the date on the Maven web site +maven.xdoc.date = bottom +maven.xdoc.date.format = dd MMMM yyyy HH:mm z +# Use the maven site theme +maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css +maven.xdoc.locale.default=en \ No newline at end of file diff --git a/plugins-parent/project.properties b/plugins-parent/project.properties index 85849179..b00aae83 100644 --- a/plugins-parent/project.properties +++ b/plugins-parent/project.properties @@ -106,38 +106,14 @@ maven.artifact.legacy=false #===== # Changelog plugin properties #===== -maven.changelog.svn.baseurl=http://svn.apache.org/viewcvs.cgi -maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory maven.changelog.type=date maven.changelog.date=lastRelease -#===== -# Changes plugin settings -#===== -# Changes issue template -maven.changes.issue.template = %URL%/%ISSUE% - -#===== -# Checkstyle plugin settings -#===== -maven.checkstyle.header.file = ${basedir}/../plugins-parent/checkstyle-license.txt -maven.checkstyle.properties = ${basedir}/../plugins-parent/checkstyle.xml - #===== # Javadoc plugin settings #===== maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/ -#===== -# License plugin settings -#===== -maven.license.licenseFile=${basedir}/../plugins-parent/LICENSE.txt - -#===== -# LinkCheck plugin settings -#===== -maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl},http://www.clarkware.com/software/JDepend.html - #===== # MultiProject plugin settings #===== @@ -156,13 +132,6 @@ maven.pdf.companyLogo=http://maven.apache.org/images/apache-maven-project.jpg maven.scm.svn.tag.base=https://svn.apache.org/repos/asf/maven/maven-1/plugins/tags maven.scm.checkout.dir=${maven.build.dir}/scm/checkout -#===== -# Site plugin settings -#===== -maven.site.stage.address=people.apache.org -maven.site.stage.directory=/home/${maven.username}/public_html/maven-stage-site/${pom.siteDirectory.substring(22)} -maven.site.deploy.method=rsync - #===== # Test/JUnit plugin settings #===== @@ -172,11 +141,5 @@ maven.junit.fork = true #===== # XDOC plugin settings #===== -# Display the date on the Maven web site -maven.xdoc.date = bottom -maven.xdoc.date.format = dd MMMM yyyy HH:mm z maven.xdoc.distributionUrl=http://www.apache.org/dyn/closer.cgi/java-repository/maven/plugins -maven.xdoc.version = ${pom.currentVersion} -# Use the maven site theme -maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css -maven.xdoc.locale.default=en \ No newline at end of file +maven.xdoc.version = ${pom.currentVersion} \ No newline at end of file diff --git a/plugins-site/README.txt b/plugins-site/README.txt new file mode 100644 index 00000000..957b1d8c --- /dev/null +++ b/plugins-site/README.txt @@ -0,0 +1 @@ +This directory contains Maven build configuration for the master site project. \ No newline at end of file diff --git a/plugins-site/project.properties b/plugins-site/project.properties index 683da692..f6712214 100644 --- a/plugins-site/project.properties +++ b/plugins-site/project.properties @@ -20,24 +20,6 @@ # must now inherit from /plugins-parent/project.xml. #==================================================================== -#===== -# 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}/../plugins-parent/checkstyle-license.txt -maven.checkstyle.properties = ${basedir}/../plugins-parent/checkstyle.xml - #===== # Clover plugin settings #===== @@ -51,16 +33,6 @@ maven.clover.report.xml=true # 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}/../plugins-parent/LICENSE.txt - -#===== -# LinkCheck plugin settings -#===== -maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl},http://www.clarkware.com/software/JDepend.html - #===== # Multiproject plugin settings #===== @@ -74,17 +46,7 @@ maven.multiproject.excludes=plugins-parent/project.xml,plugins-site/project.xml, # We don't exclude it because we want that it appears in the plugin list. maven.multiproject.ignoreFailures=true -#===== -# Site plugin settings -#===== -maven.site.stage.address=people.apache.org -maven.site.stage.directory=/home/${maven.username}/public_html/maven-stage-site/${pom.siteDirectory.substring(22)} -maven.site.deploy.method=rsync - #===== # XDOC plugin settings #===== -maven.xdoc.date = bottom -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