diff --git a/appserver/xdocs/properties.xml b/appserver/xdocs/properties.xml index 301c2737..d90592e5 100644 --- a/appserver/xdocs/properties.xml +++ b/appserver/xdocs/properties.xml @@ -22,7 +22,7 @@ These properties can be overridden to change the default behavior of the Maven J2EE Plug-in. If you need to override any of these properties, please refer to the - Integration + Integration document for the preferred method of setting properties in your project.

@@ -158,7 +158,7 @@ diff --git a/aspectj/xdocs/properties.xml b/aspectj/xdocs/properties.xml index ad64f88a..3cda720c 100644 --- a/aspectj/xdocs/properties.xml +++ b/aspectj/xdocs/properties.xml @@ -66,7 +66,7 @@ ]]> source modifications in your - + project descriptor. This property is used during compilation to exclude or include classes from compilation depending on whether a named class is available @@ -102,7 +102,7 @@ diff --git a/cactus/xdocs/using.xml b/cactus/xdocs/using.xml index 87c6de47..2b6a2010 100644 --- a/cactus/xdocs/using.xml +++ b/cactus/xdocs/using.xml @@ -30,7 +30,7 @@ maven.cactus.resin2x.home = C:/Apps/resin-2.1.4
  • Call the - War + War plugin's goals to generate a war for your webapp. For example: maven war. Note that in the future you would also be able to call the Ear plugin if your application is an EAR. diff --git a/j2ee/xdocs/properties.xml b/j2ee/xdocs/properties.xml index a704764f..ca424c4b 100644 --- a/j2ee/xdocs/properties.xml +++ b/j2ee/xdocs/properties.xml @@ -22,7 +22,7 @@ These properties can be overridden to change the default behavior of the Maven J2EE Plug-in. If you need to override any of these properties, please refer to the - Integration + Integration document for the preferred method of setting properties in your project.

    • WARNING: This property is temporarily unused.

    Specifies the pattern of files in the - project dependencies + project dependencies not to be included in the /WEB-INF/lib of the resulting war file. It defaults to blank, that is, no dependencies are excluded.     		This property holds the Ant path of all the dependent jar files listed in the dependencies block of your - + project descriptor
    @@ -118,7 +118,7 @@ diff --git a/java/xdocs/properties.xml b/java/xdocs/properties.xml index 6f88246e..94162103 100644 --- a/java/xdocs/properties.xml +++ b/java/xdocs/properties.xml @@ -174,7 +174,7 @@ ]]> source modifications in your - + project descriptor. This property is used during compilation to exclude or include classes from compilation depending on whether a named class is available diff --git a/repository/src/plugin-resources/repository-audit.xml b/repository/src/plugin-resources/repository-audit.xml index fe749a83..82a27e83 100644 --- a/repository/src/plugin-resources/repository-audit.xml +++ b/repository/src/plugin-resources/repository-audit.xml @@ -1097,8 +1097,8 @@ Template: maven - http://jakarta.apache.org/turbine/maven/ - http://cvs.apache.org/viewcvs.cgi/*checkout*/jakarta-turbine-maven/LICENSE.txt + http://maven.apache.org/ + http://cvs.apache.org/viewcvs.cgi/*checkout*/maven/LICENSE.txt ASL @@ -1416,8 +1416,8 @@ Template: touchstone - http://jakarta.apache.org/turbine/maven/ - http://cvs.apache.org/viewcvs/*checkout*/jakarta-turbine-maven/LICENSE.txt + http://maven.apache.org/ + http://cvs.apache.org/viewcvs/*checkout*/maven/LICENSE.txt ASL diff --git a/xdoc/plugin.properties b/xdoc/plugin.properties index 88759fe5..d27d43d8 100644 --- a/xdoc/plugin.properties +++ b/xdoc/plugin.properties @@ -9,7 +9,7 @@ maven.docs.dest = ${maven.build.dir}/docs maven.docs.outputencoding = ISO-8859-1 maven.gen.docs = ${maven.build.dir}/generated-xdocs -maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/turbine/maven/development-process.html +maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html maven.xdoc.includeProjectDocumentation = yes # diff --git a/xdoc/project.properties b/xdoc/project.properties index 3dbbc864..c093b8bd 100644 --- a/xdoc/project.properties +++ b/xdoc/project.properties @@ -3,6 +3,6 @@ # ------------------------------------------------------------------- maven.xdoc.date=left maven.xdoc.version=${pom.currentVersion} -#maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/turbine/maven/development-process.html +#maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html maven.license.licenseFile=${basedir}/../../../LICENSE.txt diff --git a/xdoc/src/plugin-resources/templates/project-info.xml b/xdoc/src/plugin-resources/templates/project-info.xml index 1f3d1210..fc0e84da 100644 --- a/xdoc/src/plugin-resources/templates/project-info.xml +++ b/xdoc/src/plugin-resources/templates/project-info.xml @@ -12,7 +12,7 @@ This document provides an overview of the various documents and links that are part of this project's general information. All of this content is automatically generated by - Maven on + Maven on behalf of the project.

    diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml index 558f83d1..0ecb58b2 100644 --- a/xdoc/xdocs/properties.xml +++ b/xdoc/xdocs/properties.xml @@ -429,8 +429,8 @@

    WARNING: This property is temporarily unused.

    Specifies the pattern of files in the - project dependencies + project dependencies not to be included in the /WEB-INF/lib of the resulting war file. It defaults to blank, that is, no dependencies are excluded.     		Yes Sets the url of development process page. - Defaults to - http://jakarta.apache.org/turbine/maven/development-process.html. + Defaults to + http://maven.apache.org/development-process.html.