From e1e67f9382d3eaf2b5eb8c09f372beb17b647d25 Mon Sep 17 00:00:00 2001 From: brett Date: Fri, 2 Apr 2004 03:48:57 +0000 Subject: [PATCH] don't override defaults git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114971 13f79535-47bb-0310-9956-ffa450edef68 --- ashkelon/plugin.properties | 23 ------------------- castor/xdocs/tags.xml | 2 +- changelog/plugin.properties | 4 ---- changelog/project.xml | 2 +- cruisecontrol/plugin.properties | 2 +- cruisecontrol/xdocs/properties.xml | 2 +- developer-activity/plugin.properties | 4 ---- ear/xdocs/properties.xml | 4 ++-- ejb/xdocs/properties.xml | 4 ++-- faq/plugin.properties | 2 +- file-activity/plugin.properties | 4 ---- .../template-resources/project.properties | 1 - html2xdoc/project.properties | 1 - javadoc/plugin.properties | 4 +--- jellydoc/project.properties | 1 - linkcheck/plugin.properties | 4 ---- 16 files changed, 10 insertions(+), 54 deletions(-) delete mode 100644 ashkelon/plugin.properties diff --git a/ashkelon/plugin.properties b/ashkelon/plugin.properties deleted file mode 100644 index fe562e85..00000000 --- a/ashkelon/plugin.properties +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------- -# Copyright 2001-2004 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. -# ------------------------------------------------------------------- - -# ------------------------------------------------------------------- -# P L U G I N P R O P E R I E S -# ------------------------------------------------------------------- -# Ashkelon plugin. -# ------------------------------------------------------------------- - -maven.build.dir = ${basedir}/target diff --git a/castor/xdocs/tags.xml b/castor/xdocs/tags.xml index ac097338..10c00e6d 100644 --- a/castor/xdocs/tags.xml +++ b/castor/xdocs/tags.xml @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/changelog/plugin.properties b/changelog/plugin.properties index ca30266f..beaaee72 100644 --- a/changelog/plugin.properties +++ b/changelog/plugin.properties @@ -20,11 +20,7 @@ # CVS change log plugin. # ------------------------------------------------------------------- -# These three don't belong here. maven.changelog.basedir=${basedir} -maven.build.dir = ${basedir}/target -maven.gen.docs = ${maven.build.dir}/generated-xdocs -maven.docs.outputencoding = ISO-8859-1 maven.changelog.range = 30 maven.changelog.factory = org.apache.maven.cvslib.CvsChangeLogFactory diff --git a/changelog/project.xml b/changelog/project.xml index 97356b0e..df0b4023 100644 --- a/changelog/project.xml +++ b/changelog/project.xml @@ -23,7 +23,7 @@ 3 maven-changelog-plugin Maven Changelog Plug-in - 1.4 + 1.5-SNAPSHOT Produce SCM changelog reports http://maven.apache.org/reference/plugins/changelog/ diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties index aa44935f..fce69019 100644 --- a/cruisecontrol/plugin.properties +++ b/cruisecontrol/plugin.properties @@ -17,7 +17,7 @@ maven.cruisecontrol.config=${basedir}/cruisecontrol.xml maven.cruisecontrol.schedule.interval=300 maven.cruisecontrol.checkout.dir=${basedir}/checkout -maven.cruisecontrol.logs.dir=${basedir}/target/cc-logs +maven.cruisecontrol.logs.dir=${maven.build.dir}/cc-logs maven.cruisecontrol.goals=scm:update-project|clean test|site:deploy maven.cruisecontrol.home=CC_HOME_NOT_SET maven.cruisecontrol.mail.host=localhost diff --git a/cruisecontrol/xdocs/properties.xml b/cruisecontrol/xdocs/properties.xml index 22227ce0..3a8216fe 100644 --- a/cruisecontrol/xdocs/properties.xml +++ b/cruisecontrol/xdocs/properties.xml @@ -74,7 +74,7 @@ Yes

Default value is - ${basedir}/target/cc-logs.

+ ${maven.build.dir}/cc-logs.

diff --git a/developer-activity/plugin.properties b/developer-activity/plugin.properties index 2f9ed95a..98109f69 100644 --- a/developer-activity/plugin.properties +++ b/developer-activity/plugin.properties @@ -22,8 +22,4 @@ maven.changelog.basedir=${basedir} -maven.build.dir = ${basedir}/target - -maven.docs.outputencoding = ISO-8859-1 - maven.activitylog.range = 30 diff --git a/ear/xdocs/properties.xml b/ear/xdocs/properties.xml index a913aa52..96b0c76f 100644 --- a/ear/xdocs/properties.xml +++ b/ear/xdocs/properties.xml @@ -110,14 +110,14 @@ maven.build.dir where the component will be assembled - maven.build.dir + maven.build.dir maven.final.name The assembled component will be ${maven.build.dir}/${maven.final.name}.ear - maven.final.name + maven.final.name diff --git a/ejb/xdocs/properties.xml b/ejb/xdocs/properties.xml index df3f7350..c6bb103c 100644 --- a/ejb/xdocs/properties.xml +++ b/ejb/xdocs/properties.xml @@ -121,14 +121,14 @@ maven.build.dir where the component will be assembled - maven.build.dir + maven.build.dir maven.final.name The assembled component will be ${maven.build.dir}/${maven.final.name}.jar - maven.final.name + maven.final.name diff --git a/faq/plugin.properties b/faq/plugin.properties index c51ae797..95407b30 100644 --- a/faq/plugin.properties +++ b/faq/plugin.properties @@ -18,4 +18,4 @@ maven.faq.src=${maven.docs.src} # Destination directory where output xdocs file are produced -maven.faq.dest=${maven.build.dir}/generated-xdocs +maven.faq.dest=${maven.gen.docs} diff --git a/file-activity/plugin.properties b/file-activity/plugin.properties index 2f9ed95a..98109f69 100644 --- a/file-activity/plugin.properties +++ b/file-activity/plugin.properties @@ -22,8 +22,4 @@ maven.changelog.basedir=${basedir} -maven.build.dir = ${basedir}/target - -maven.docs.outputencoding = ISO-8859-1 - maven.activitylog.range = 30 diff --git a/genapp/src/plugin-resources/struts/template-resources/project.properties b/genapp/src/plugin-resources/struts/template-resources/project.properties index 88ee44a3..934072d5 100644 --- a/genapp/src/plugin-resources/struts/template-resources/project.properties +++ b/genapp/src/plugin-resources/struts/template-resources/project.properties @@ -24,7 +24,6 @@ maven.xdoclet.webdoclet.strutsconfigxml.0=true maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1 maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -#maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=target maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge maven.xdoclet.webdoclet.strutsvalidationxml.0=true maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF diff --git a/html2xdoc/project.properties b/html2xdoc/project.properties index 88589a8a..68d474e6 100644 --- a/html2xdoc/project.properties +++ b/html2xdoc/project.properties @@ -22,4 +22,3 @@ maven.xdoc.date=left maven.license.licenseFile=${basedir}/../LICENSE.txt maven.checkstyle.header.file=${basedir}/../LICENSE.txt maven.checkstyle.format = turbine -maven.docs.outputencoding = ISO-8859-1 diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties index e972d4a8..c28baa96 100644 --- a/javadoc/plugin.properties +++ b/javadoc/plugin.properties @@ -38,7 +38,5 @@ maven.javadoc.version = true maven.javadoc.useexternalfile = yes maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API -maven.docs.outputencoding = ISO-8859-1 - #specify an alternate locale -#maven.javadoc.locale=en_US \ No newline at end of file +#maven.javadoc.locale=en_US diff --git a/jellydoc/project.properties b/jellydoc/project.properties index b9d33c73..d810d4c3 100644 --- a/jellydoc/project.properties +++ b/jellydoc/project.properties @@ -14,7 +14,6 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.docs.outputencoding = ISO-8859-1 maven.activitylog.range = 30 maven.xdoc.date=left ## maven.xdoc.version=${pom.currentVersion} diff --git a/linkcheck/plugin.properties b/linkcheck/plugin.properties index 4df30265..7f64b15c 100644 --- a/linkcheck/plugin.properties +++ b/linkcheck/plugin.properties @@ -20,8 +20,4 @@ # LinkCheck report plugin. # ------------------------------------------------------------------- -maven.build.dir = ${basedir}/target -maven.docs.dest = ${maven.build.dir}/docs -maven.docs.outputencoding = ISO-8859-1 - maven.linkcheck.cache=${maven.build.dir}/linkcheck/linkcheck.cache