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

@@ -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

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

changelog/project.xml

@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-changelog-plugin</id>
   <name>Maven Changelog Plug-in</name>
-  <currentVersion>1.4</currentVersion>
+  <currentVersion>1.5-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce SCM changelog reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/changelog/</url>

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

cruisecontrol/xdocs/properties.xml

@@ -74,7 +74,7 @@
           <td>Yes</td>
           <td>
             <p>Default value is
-              <code>${basedir}/target/cc-logs</code>.</p>
+              <code>${maven.build.dir}/cc-logs</code>.</p>
           </td>
         </tr>
         <tr>

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

ear/xdocs/properties.xml

@@ -110,14 +110,14 @@
           <td>maven.build.dir</td>
           <td>where the component will be assembled</td>
           <td>
-            <A href="../../../java/target/docs/properties.html#Other Settings">maven.build.dir</A>
+            <A href="../java/properties.html#Other Settings">maven.build.dir</A>
           </td>
         </tr>
         <tr>
           <td>maven.final.name</td>
           <td>The assembled component will be <code>${maven.build.dir}/${maven.final.name}.ear</code></td>
           <td>
-            <A href="../../../java/target/docs/properties.html#Other Settings">maven.final.name</A>
+            <A href="../java/properties.html#Other Settings">maven.final.name</A>
           </td>
         </tr>
       </table>

ejb/xdocs/properties.xml

@@ -121,14 +121,14 @@
           <td>maven.build.dir</td>
           <td>where the component will be assembled</td>
           <td>
-            <A href="../../../java/target/docs/properties.html#Other Settings">maven.build.dir</A>
+            <A href="../java/properties.html#Other Settings">maven.build.dir</A>
           </td>
         </tr>
         <tr>
           <td>maven.final.name</td>
           <td>The assembled component will be <code>${maven.build.dir}/${maven.final.name}.jar</code></td>
           <td>
-            <A href="../../../java/target/docs/properties.html#Other Settings">maven.final.name</A>
+            <A href="../java/properties.html#Other Settings">maven.final.name</A>
           </td>
         </tr>
       </table>

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}

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

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

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

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

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}

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