svn commit: r574075 - /maven/shared/trunk/pom.xml
Author: wsmoak Date: Sun Sep 9 13:47:40 2007 New Revision: 574075 URL: http://svn.apache.org/viewvc?rev=574075&view=rev Log: Removed maven-artifact-converter from parent pom. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=574075&r1=574074&r2=574075&view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Sun Sep 9 13:47:40 2007 @@ -28,7 +28,6 @@ maven-archiver maven-plugin-tools maven-reporting-impl -maven-artifact-converter maven-model-converter maven-shared-io maven-shared-monitor
svn commit: r604476 - /maven/plugins/trunk/maven-stage-plugin/pom.xml
Author: wsmoak Date: Sat Dec 15 10:16:09 2007 New Revision: 604476 URL: http://svn.apache.org/viewvc?rev=604476&view=rev Log: Use the latest plugin parent pom. Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=604476&r1=604475&r2=604476&view=diff == --- maven/plugins/trunk/maven-stage-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-stage-plugin/pom.xml Sat Dec 15 10:16:09 2007 @@ -24,7 +24,7 @@ maven-plugins org.apache.maven.plugins -8 +10 4.0.0 org.apache.maven.plugins
svn commit: r606663 - in /maven/site/trunk/src/site: apt/developers/index.apt apt/guides/getting-started/index.apt xdoc/index.xml.vm
Author: wsmoak
Date: Sun Dec 23 20:30:58 2007
New Revision: 606663
URL: http://svn.apache.org/viewvc?rev=606663&view=rev
Log:
Minor documentation improvements
Modified:
maven/site/trunk/src/site/apt/developers/index.apt
maven/site/trunk/src/site/apt/guides/getting-started/index.apt
maven/site/trunk/src/site/xdoc/index.xml.vm
Modified: maven/site/trunk/src/site/apt/developers/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/index.apt?rev=606663&r1=606662&r2=606663&view=diff
==
--- maven/site/trunk/src/site/apt/developers/index.apt (original)
+++ maven/site/trunk/src/site/apt/developers/index.apt Sun Dec 23 20:30:58 2007
@@ -40,6 +40,9 @@
* {{{../guides/development/guide-m2-development.html}Developing Maven 2}}
* {{{../continuous-integration.html}Continuous Integration}}
+
+ * Source Repository for Maven
{{{../ref/2.0.9-SNAPSHOT/source-repository.html}2.0.x}}
+or {{{../ref/2.1-SNAPSHOT/source-repository.html}2.1.x}}
* Committers Resources
Modified: maven/site/trunk/src/site/apt/guides/getting-started/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/getting-started/index.apt?rev=606663&r1=606662&r2=606663&view=diff
==
--- maven/site/trunk/src/site/apt/guides/getting-started/index.apt (original)
+++ maven/site/trunk/src/site/apt/guides/getting-started/index.apt Sun Dec 23
20:30:58 2007
@@ -1178,8 +1178,14 @@
+- pom.xml
+- my-app
| +- pom.xml
+| +- src
+| +- main
+| +- java
+- my-webapp
| +- pom.xml
+| +- src
+| +- main
+| +- webapp
---
The POM file you'll create should contain the following:
Modified: maven/site/trunk/src/site/xdoc/index.xml.vm
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/index.xml.vm?rev=606663&r1=606662&r2=606663&view=diff
==
--- maven/site/trunk/src/site/xdoc/index.xml.vm (original)
+++ maven/site/trunk/src/site/xdoc/index.xml.vm Sun Dec 23 20:30:58 2007
@@ -141,8 +141,8 @@
Develop Maven
-Information for those who are currently developers, or interested
in becoming developers of the Maven
-project itself
+Information for those who are currently developers, or who are
interested
+in contributing to the Maven project itself
svn commit: r607431 - /maven/site/trunk/src/site/resources/.htaccess
Author: wsmoak Date: Sat Dec 29 07:45:18 2007 New Revision: 607431 URL: http://svn.apache.org/viewvc?rev=607431&view=rev Log: Update redirects to latest Maven version. Add redirect for Continuum docs. Modified: maven/site/trunk/src/site/resources/.htaccess Modified: maven/site/trunk/src/site/resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/.htaccess?rev=607431&r1=607430&r2=607431&view=diff == --- maven/site/trunk/src/site/resources/.htaccess (original) +++ maven/site/trunk/src/site/resources/.htaccess Sat Dec 29 07:45:18 2007 @@ -2,12 +2,13 @@ Redirect Permanent /guides/mini/guide-ibiblio-upload.html http://maven.apache.org/guides/mini/guide-central-repository-upload.html Redirect Permanent /faq.html http://maven.apache.org/general.html +Redirect Permanent /continuum/documentation/1_1 http://maven.apache.org/continuum/docs/1.1 RedirectMatch ^/maven2/(.*)$ /$1 RedirectMatch ^/reference/(.*)$ /maven-1.x/reference/$1 RedirectMatch ^/maven-1.x/reference/plugins/(.*)$ /maven-1.x/plugins/$1 -RedirectMatch ^/maven-model/(.*)$ /ref/2.0.4/maven-model/$1 -RedirectMatch ^/maven-settings/(.*)$ /ref/2.0.4/maven-settings/$1 +RedirectMatch ^/maven-model/(.*)$ /ref/2.0.8/maven-model/$1 +RedirectMatch ^/maven-settings/(.*)$ /ref/2.0.8/maven-settings/$1 RedirectMatch ^/maven-1.x/plugins-sandbox/(.*)$ /maven-1.x/plugins/$1 RedirectMatch ^/repository-manager/(.*)$ /archiva/$1
svn commit: r607508 - /maven/archiva/parent/pom.xml
Author: wsmoak Date: Sat Dec 29 19:53:43 2007 New Revision: 607508 URL: http://svn.apache.org/viewvc?rev=607508&view=rev Log: Add the issues list. Modified: maven/archiva/parent/pom.xml Modified: maven/archiva/parent/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/parent/pom.xml?rev=607508&r1=607507&r2=607508&view=diff == --- maven/archiva/parent/pom.xml (original) +++ maven/archiva/parent/pom.xml Sat Dec 29 19:53:43 2007 @@ -45,27 +45,34 @@ - Maven Archiva User List + Archiva User List [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] http://mail-archives.apache.org/mod_mbox/maven-archiva-users - Maven Archiva Developer List + Archiva Development List [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] http://mail-archives.apache.org/mod_mbox/maven-archiva-dev - Maven Archiva Commits List + Archiva Commits List [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] http://mail-archives.apache.org/mod_mbox/maven-archiva-commits - + + Archiva Issues List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + [EMAIL PROTECTED] + http://mail-archives.apache.org/mod_mbox/maven-archiva-issues + + scm:svn:http://svn.apache.org/repos/asf/maven/archiva/parent scm:svn:https://svn.apache.org/repos/asf/maven/archiva/parent
svn commit: r607509 - /maven/archiva/trunk/pom.xml
Author: wsmoak
Date: Sat Dec 29 19:59:47 2007
New Revision: 607509
URL: http://svn.apache.org/viewvc?rev=607509&view=rev
Log:
Remove mailing lists and issue tracking which are now in the parent pom.
Use the latest parent pom (to pick up the issues list which was just added).
Use version 2.2 of the Cobertura plugin.
Publish reference docs to /ref/[version].
Modified:
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=607509&r1=607508&r2=607509&view=diff
==
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Sat Dec 29 19:59:47 2007
@@ -28,7 +28,7 @@
org.apache.maven.archiva
archiva-parent
-1
+2-SNAPSHOT
../parent/pom.xml
Archiva
@@ -41,41 +41,7 @@
http://svn.apache.org/viewcvs.cgi/maven/archiva/trunk
-
- org.apache.maven.archiva
-
-Archiva is an application for managing one or more remote
-repositories, including administration, artifact handling,
-browsing and searching.
-
http://maven.apache.org/archiva/
-
-jira
-http://jira.codehaus.org/browse/MRM
-
-
-
- Maven Archiva User List
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
-
http://mail-archives.apache.org/mod_mbox/maven-archiva-users
-
-
- Maven Archiva Developer List
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
-
http://mail-archives.apache.org/mod_mbox/maven-archiva-dev
-
-
- Maven Archiva Commits List
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
-
http://mail-archives.apache.org/mod_mbox/maven-archiva-commits
-
-
@@ -732,14 +698,11 @@
-
maven-checkstyle-plugin
@@ -915,7 +878,7 @@
apache.website
- ${siteBaseDeployment}/reports/
+ ${siteBaseDeployment}/ref/${project.version}
svn commit: r607519 - /maven/archiva/parent/pom.xml
Author: wsmoak Date: Sat Dec 29 21:46:29 2007 New Revision: 607519 URL: http://svn.apache.org/viewvc?rev=607519&view=rev Log: Use the latest site plugin Modified: maven/archiva/parent/pom.xml Modified: maven/archiva/parent/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/parent/pom.xml?rev=607519&r1=607518&r2=607519&view=diff == --- maven/archiva/parent/pom.xml (original) +++ maven/archiva/parent/pom.xml Sat Dec 29 21:46:29 2007 @@ -89,7 +89,7 @@ maven-site-plugin - 2.0-beta-5 + 2.0-beta-6 maven-release-plugin
svn commit: r609352 - /maven/release/trunk/maven-release-plugin/pom.xml
Author: wsmoak
Date: Sun Jan 6 09:29:30 2008
New Revision: 609352
URL: http://svn.apache.org/viewvc?rev=609352&view=rev
Log:
Configure staging url for the plugin website.
Modified:
maven/release/trunk/maven-release-plugin/pom.xml
Modified: maven/release/trunk/maven-release-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=609352&r1=609351&r2=609352&view=diff
==
--- maven/release/trunk/maven-release-plugin/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/pom.xml Sun Jan 6 09:29:30 2008
@@ -86,6 +86,12 @@
1.4
+
+maven-site-plugin
+
+
scp://people.apache.org/www/maven.apache.org/plugins/${artifactId}-${version}
+
+
svn commit: r609353 - /maven/release/trunk/maven-release-plugin/src/site/apt/usage.apt
Author: wsmoak Date: Sun Jan 6 09:30:00 2008 New Revision: 609353 URL: http://svn.apache.org/viewvc?rev=609353&view=rev Log: Correct location of tags directory Modified: maven/release/trunk/maven-release-plugin/src/site/apt/usage.apt Modified: maven/release/trunk/maven-release-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/usage.apt?rev=609353&r1=609352&r2=609353&view=diff == --- maven/release/trunk/maven-release-plugin/src/site/apt/usage.apt (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/usage.apt Sun Jan 6 09:30:00 2008 @@ -41,7 +41,7 @@ This example shows how to set the repository location for all tags to be created in Subversion. Note that it is not needed if you use the standard SVN layout, where the root project is in <<>>, and - there is a <<>> directory immediately above it. + there is a sibling <<>> directory. ---
svn commit: r612150 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java
Author: wsmoak Date: Tue Jan 15 08:35:31 2008 New Revision: 612150 URL: http://svn.apache.org/viewvc?rev=612150&view=rev Log: Use released versions of maven-shared-io and maven-common-artifact-filters. Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=612150&r1=612149&r2=612150&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Jan 15 08:35:31 2008 @@ -381,7 +381,7 @@ org.apache.maven.shared maven-shared-io - 1.1-SNAPSHOT + 1.1 org.codehaus.plexus @@ -458,7 +458,7 @@ org.apache.maven.shared maven-common-artifact-filters - 1.0-alpha-2-SNAPSHOT + 1.0 org.apache.maven.shared Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java?rev=612150&r1=612149&r2=612150&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java Tue Jan 15 08:35:31 2008 @@ -31,7 +31,7 @@ * * @goal assembly * @execute phase="package" - * @aggregator + * @aggregator */ public class AssemblyMojo extends AbstractAssemblyMojo
svn commit: r612151 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java
Author: wsmoak Date: Tue Jan 15 08:39:48 2008 New Revision: 612151 URL: http://svn.apache.org/viewvc?rev=612151&view=rev Log: Reformat comment (r612150). Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java?rev=612151&r1=612150&r2=612151&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java Tue Jan 15 08:39:48 2008 @@ -31,7 +31,7 @@ * * @goal assembly * @execute phase="package" - * @aggregator + * @aggregator */ public class AssemblyMojo extends AbstractAssemblyMojo
svn commit: r470151 - /maven/site/trunk/src/site/resources/.htaccess
Author: wsmoak Date: Wed Nov 1 16:56:24 2006 New Revision: 470151 URL: http://svn.apache.org/viewvc?view=rev&rev=470151 Log: Redirect maven-model to the reference docs for the 2.0.4 release. Modified: maven/site/trunk/src/site/resources/.htaccess Modified: maven/site/trunk/src/site/resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/.htaccess?view=diff&rev=470151&r1=470150&r2=470151 == --- maven/site/trunk/src/site/resources/.htaccess (original) +++ maven/site/trunk/src/site/resources/.htaccess Wed Nov 1 16:56:24 2006 @@ -2,7 +2,7 @@ RedirectMatch ^/maven2/(.*)$ /$1 RedirectMatch ^/reference/(.*)$ /maven-1.x/reference/$1 RedirectMatch ^/maven-1.x/reference/plugins/(.*)$ /maven-1.x/plugins/$1 -RedirectMatch ^/maven-model/(.*)$ /ref/2.0.3-SNAPSHOT/maven-model/$1 +RedirectMatch ^/maven-model/(.*)$ /ref/2.0.4/maven-model/$1 RedirectMatch ^/maven-1.x/plugins-sandbox/(.*)$ /maven-1.x/plugins/$1 RedirectMatch ^/repository-manager/(.*)$ /archiva/$1
svn commit: r470638 - /maven/site/trunk/src/site/resources/.htaccess
Author: wsmoak Date: Thu Nov 2 18:51:08 2006 New Revision: 470638 URL: http://svn.apache.org/viewvc?view=rev&rev=470638 Log: Also redirect maven-settings to the reference docs for the 2.0.4 release. Modified: maven/site/trunk/src/site/resources/.htaccess Modified: maven/site/trunk/src/site/resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/.htaccess?view=diff&rev=470638&r1=470637&r2=470638 == --- maven/site/trunk/src/site/resources/.htaccess (original) +++ maven/site/trunk/src/site/resources/.htaccess Thu Nov 2 18:51:08 2006 @@ -3,6 +3,7 @@ RedirectMatch ^/reference/(.*)$ /maven-1.x/reference/$1 RedirectMatch ^/maven-1.x/reference/plugins/(.*)$ /maven-1.x/plugins/$1 RedirectMatch ^/maven-model/(.*)$ /ref/2.0.4/maven-model/$1 +RedirectMatch ^/maven-settings/(.*)$ /ref/2.0.4/maven-settings/$1 RedirectMatch ^/maven-1.x/plugins-sandbox/(.*)$ /maven-1.x/plugins/$1 RedirectMatch ^/repository-manager/(.*)$ /archiva/$1
svn commit: r474060 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: wsmoak
Date: Sun Nov 12 14:13:02 2006
New Revision: 474060
URL: http://svn.apache.org/viewvc?view=rev&rev=474060
Log:
Fixed typo, minor editing.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?view=diff&rev=474060&r1=474059&r2=474060
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sun Nov 12 14:13:02 2006
@@ -84,7 +84,7 @@
*---++--+
| {{{maven-archetype-plugin/} <<>>}} | 1.0-alpha-4 |
Generate a skeleton project structure from an archetype.
*---++--+
-| {{{maven-assembly-plugin/} <<>>}} | 2.1| Build
an assembly (distribution) of sources and binaries.
+| {{{maven-assembly-plugin/} <<>>}} | 2.1| Build
an assembly (distribution) of sources and/or binaries.
*---+---+--+
| {{{maven-dependency-plugin/} <<>>}} ||
Dependency manipulation.
*---++--+
@@ -96,7 +96,7 @@
*---++--+
| {{{maven-release-plugin/} <<>>}} | 2.0-beta-4 |
Release the current project - updating the POM and tagging in the SCM.
*---++--+
-| {{{maven-repository-plugin/} <<>>}} | 2.0| Plugin
to help woth repository-based tasks.
+| {{{maven-repository-plugin/} <<>>}} | 2.0| Plugin
to help with repository-based tasks.
*---++--+
| {{{/scm/plugins/} <<>>}} | 1.0-beta-3 |
Generate a SCM for the current project.
*---++--+
svn commit: r474062 - /maven/site/trunk/pom.xml
Author: wsmoak Date: Sun Nov 12 14:16:56 2006 New Revision: 474062 URL: http://svn.apache.org/viewvc?view=rev&rev=474062 Log: Give the site module a name. Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?view=diff&rev=474062&r1=474061&r2=474062 == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Sun Nov 12 14:16:56 2006 @@ -9,6 +9,7 @@ 4.0.0 maven-site pom + Maven Site true
svn commit: r475127 - /maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Author: wsmoak
Date: Tue Nov 14 21:22:05 2006
New Revision: 475127
URL: http://svn.apache.org/viewvc?view=rev&rev=475127
Log:
Update the instructions for building Maven 2.0 now that it is on a branch.
MNG-2620
Modified:
maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Modified: maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt?view=diff&rev=475127&r1=475126&r2=475127
==
--- maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
(original)
+++ maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt Tue
Nov 14 21:22:05 2006
@@ -1,5 +1,5 @@
--
- Guide to Building Maven 2.0
+ Guide to Building Maven
--
Brett Porter
Jason van Zyl
@@ -7,11 +7,11 @@
12 June 2005
--
-Building Maven 2.0
+Building Maven
-* Why would I want to build Maven 2.0?
+* Why would I want to build Maven?
- Building Maven 2.0 yourself is for one of two reasons:
+ Building Maven yourself is for one of two reasons:
* to try out a bleeding edge feature or bugfix (issues can be found in
{{{http://jira.codehaus.org/browse/MNG} JIRA}}),
@@ -23,16 +23,24 @@
* Checking out the sources
- All of the source code for Maven 2.0 and its related libraries are in
{{{http://subversion.tigris.org/} Subversion}}.
+ All of the source code for Maven and its related libraries is in
{{{http://subversion.tigris.org/} Subversion}}.
You can {{{http://svn.apache.org/viewvc/maven/} browse the repository}}, or
checkout specific modules directly.
- To build Maven 2.0, you need the <<>> module. To check that out,
run the command:
+ To build Maven 2.0, you need the <<>> branch of the
<<>> module. To check that out, run the command:
---
-svn co https://svn.apache.org/repos/asf/maven/components/trunk maven-components
+svn co https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x
---
- The <<>> directory will contain the source code. Note that
this does not contain any of the plugins.
+ Alternatively, you can check out all Maven projects in one directory using:
+
+---
+svn co https://svn.apache.org/repos/asf/maven/trunks maven
+---
+
+ The <<>> directory will contain the Maven 2.0 source code, and
+ the <<>> directory will contain the 2.1 source code. Note
+ that neither directory contains any of the plugins.
Other modules you might be interested in related to Maven development are:
@@ -52,12 +60,6 @@
* {{{http://svn.plexus.codehaus.org/plexus/} Plexus}} - the IoC container
used by Maven.
- Alternatively, you can check out all Maven projects in one directory using:
-
-svn co https://svn.apache.org/repos/asf/maven/trunks maven
-
If you're looking at {{{http://svn.apache.org/viewvc/maven/trunks/}ViewVC}}
there is seemingly nothing there. We use
{{{http://svnbook.red-bean.com/en/1.0/ch07s03.html}externals definitions}}
to link together all the trunks into one logical location for convenience.
If you want to see what is being
@@ -67,11 +69,11 @@
svn propget svn:externals
---
-* Building Maven with Maven installed
+* Building Maven 2.0 with Maven installed
If you already have Maven installed, it can be faster to build a new version
with Maven, rather than a clean bootstrap.
- To do this, run from the root:
+ To do this, run from the <<>> directory:
mvn install
@@ -86,21 +88,21 @@
The assemblies will be created in <<>> and can be unzipped to the
location where you'd like Maven installed.
-* Building Maven without Maven installed
+* Building Maven 2.0 without Maven installed
- Once you have checked out the code, change into the <<>>
directory that was created.
+ Once you have checked out the code, change into the <<>>
directory that was created.
You may want to setup a different environment to install Maven to, other
than your normal installation of a
release, so set the <<>> environment variable accordingly, e.g.:
-export M2_HOME=/usr/local/maven-2.0.1-SNAPSHOT
+export M2_HOME=/usr/local/maven-2.0.5-SNAPSHOT
PATH=$M2_HOME/bin:$PATH
or
-set M2_HOME=c:\maven-2.0.1-SNAPSHOT
+set M2_HOME=c:\maven-2.0.5-SNAPSHOT
set PATH=%M2_HOME%\bin;%PATH%
@@ -124,4 +126,8 @@
If you have any problems or get any failures during the run, please report
them to the
{{{/mail-lists.html} Maven Developers List}}.
+
+* Building Maven 2.1
+
+ TODO
svn commit: r476029 - in /maven/site/trunk/src/site/apt/guides/development: guide-plugin-snapshot-repositories.apt guide-testing-development-plugins.apt
Author: wsmoak
Date: Thu Nov 16 18:39:20 2006
New Revision: 476029
URL: http://svn.apache.org/viewvc?view=rev&rev=476029
Log:
Fixed the snapshot repository URL.
Modified:
maven/site/trunk/src/site/apt/guides/development/guide-plugin-snapshot-repositories.apt
maven/site/trunk/src/site/apt/guides/development/guide-testing-development-plugins.apt
Modified:
maven/site/trunk/src/site/apt/guides/development/guide-plugin-snapshot-repositories.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-plugin-snapshot-repositories.apt?view=diff&rev=476029&r1=476028&r2=476029
==
---
maven/site/trunk/src/site/apt/guides/development/guide-plugin-snapshot-repositories.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/development/guide-plugin-snapshot-repositories.apt
Thu Nov 16 18:39:20 2006
@@ -43,7 +43,7 @@
apache.org
Maven Snapshots
- http://people.apache.org/maven-snapshot-repository
+ http://people.apache.org/repo/m2-snapshot-repository
false
@@ -56,7 +56,7 @@
apache.org
Maven Plugin Snapshots
- http://people.apache.org/maven-snapshot-repository
+ http://people.apache.org/repo/m2-snapshot-repository
false
Modified:
maven/site/trunk/src/site/apt/guides/development/guide-testing-development-plugins.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-testing-development-plugins.apt?view=diff&rev=476029&r1=476028&r2=476029
==
---
maven/site/trunk/src/site/apt/guides/development/guide-testing-development-plugins.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/development/guide-testing-development-plugins.apt
Thu Nov 16 18:39:20 2006
@@ -17,7 +17,7 @@
* How do I do this?
- Development versions of Maven plugins are periodically published to the
repository: {{http://people.apache.org/maven-snapshot-repository/}}
+ Development versions of Maven plugins are periodically published to the
repository: {{http://people.apache.org/repo/m2-snapshot-repository/}}
Currently, this is not done automatically by our continuous
integration setup. This is coming soon.
@@ -29,7 +29,7 @@
snapshots
- http://people.apache.org/maven-snapshot-repository/
+ http://people.apache.org/repo/m2-snapshot-repository/
...
@@ -54,7 +54,7 @@
snapshots
- http://people.apache.org/maven-snapshot-repository/
+ http://people.apache.org/repo/m2-snapshot-repository/
svn commit: r476054 - /maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Author: wsmoak
Date: Thu Nov 16 21:28:19 2006
New Revision: 476054
URL: http://svn.apache.org/viewvc?view=rev&rev=476054
Log:
Added instructions for building Maven 2.1.
MNG-2620
Modified:
maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Modified: maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt?view=diff&rev=476054&r1=476053&r2=476054
==
--- maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
(original)
+++ maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt Thu
Nov 16 21:28:19 2006
@@ -29,7 +29,14 @@
To build Maven 2.0, you need the <<>> branch of the
<<>> module. To check that out, run the command:
---
-svn co https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x
+svn co https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x
maven-2.0.x
+---
+
+ To build Maven 2.1, you need the trunk of the <<>> module. To
+ check that out, run the command:
+
+---
+svn co https://svn.apache.org/repos/asf/maven/components/trunk maven-components
---
Alternatively, you can check out all Maven projects in one directory using:
@@ -60,7 +67,7 @@
* {{{http://svn.plexus.codehaus.org/plexus/} Plexus}} - the IoC container
used by Maven.
- If you're looking at {{{http://svn.apache.org/viewvc/maven/trunks/}ViewVC}}
+ If you're {{{http://svn.apache.org/viewvc/maven/trunks/}looking at the
<<>> directory with ViewVC}},
there is seemingly nothing there. We use
{{{http://svnbook.red-bean.com/en/1.0/ch07s03.html}externals definitions}}
to link together all the trunks into one logical location for convenience.
If you want to see what is being
linked into one logical location you can use the following command:
@@ -127,7 +134,115 @@
If you have any problems or get any failures during the run, please report
them to the
{{{/mail-lists.html} Maven Developers List}}.
-* Building Maven 2.1
+
+* Building Maven 2.1 with Maven installed
+
+ Once you have checked out the code, change into the <<>>
+ directory. (If you checked out <<>>, then it will be the
+ <<>> directory.)
+
+ Then execute the following command:
+
+
+mvn install
+
+
+ This will build, test and install all libraries in the local repository.
Next,
+ if you want to produce the binary distribution:
+
+
+cd maven-cli
+mvn assembly:assembly
+
+
+ The assemblies will be created in <<>> and can be unzipped to the
+ location where you'd like Maven installed.
+
+
+* Building Maven 2.1 without Maven installed
+
+ If you do not have Maven installed, you can use
+ {{{http://ant.apache.org}Apache Ant}} to build Maven 2.1.
+
+ Set the M2_HOME environment variable to the location that should contain
+ Maven. This directory <> be named after the Maven version you want to
+ build and install, for example <<>>.
+
+
+export M2_HOME=/usr/local/maven-2.1-SNAPSHOT
+
+
+ or
+
+
+set M2_HOME=c:\maven-2.1-SNAPSHOT
+
- TODO
+ Once you have checked out the code, change into the <<>>
+ directory. (If you checked out <<>>, then it will be the
+ <<>> directory.)
+
+ From this, just run <<>> which will execute the default <<>>
target.
+
+
+ant
+
+
+ This will download dependencies, build Maven 2.1, and install it into the
+ directory you specified as <<>> above.
+
+ For more information, consult the project help in the Ant build file.
+
+
+ant -projecthelp
+
+
+ The result is included here for convenience:
+
+++
+Buildfile: build.xml
+
+The first time you build Maven from source, you have to build Maven without
+Maven. This Ant script builds a minimal Maven, just enough to re-launch
+Maven again in this directory and generate an installation assembly. Then
we
+extract the assembly and re-run the Maven build one more time, this time
+with the full generated Maven.
+
+To run this script, you must set the M2_HOME environment variable or the
mav
+en.home property to the location that should contain Maven. This directory
+*must* be named after the maven version you want to install, e.g.
+/usr/local/maven-2.1-SNAPSHOT.
+
+You can set the maven.repo.local property to specify a custom location for
+your local repository for the bootstrap process.
+
+Main targets:
+
+ classpath-pre constructs a classpath reference containing our
dependencies,
+ and verifies that all files are present
+
+ clean-bootstrap cleans up
svn commit: r476055 - /maven/site/trunk/src/site/site.xml
Author: wsmoak Date: Thu Nov 16 21:30:43 2006 New Revision: 476055 URL: http://svn.apache.org/viewvc?view=rev&rev=476055 Log: Make the Plugins link easier to find. Modified: maven/site/trunk/src/site/site.xml Modified: maven/site/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?view=diff&rev=476055&r1=476054&r2=476055 == --- maven/site/trunk/src/site/site.xml (original) +++ maven/site/trunk/src/site/site.xml Thu Nov 16 21:30:43 2006 @@ -125,11 +125,11 @@ - +
svn commit: r478752 - /maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Author: wsmoak Date: Thu Nov 23 18:40:45 2006 New Revision: 478752 URL: http://svn.apache.org/viewvc?view=rev&rev=478752 Log: [MNG-2620] Fixed directory name, formatting. Modified: maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt Modified: maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt?view=diff&rev=478752&r1=478751&r2=478752 == --- maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt (original) +++ maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt Thu Nov 23 18:40:45 2006 @@ -32,7 +32,7 @@ svn co https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x maven-2.0.x --- - To build Maven 2.1, you need the trunk of the <<>> module. To + To build Maven 2.1, you need the <<>> of the <<>> module. To check that out, run the command: --- @@ -45,9 +45,10 @@ svn co https://svn.apache.org/repos/asf/maven/trunks maven --- - The <<>> directory will contain the Maven 2.0 source code, and - the <<>> directory will contain the 2.1 source code. Note - that neither directory contains any of the plugins. + If you have checked out <<>>, the <<>> directory will + contain the Maven 2.0 source code, and the <<>> directory will + contain the 2.1 source code. Note that neither directory contains any of the + plugins. Other modules you might be interested in related to Maven development are: @@ -208,9 +209,9 @@ extract the assembly and re-run the Maven build one more time, this time with the full generated Maven. -To run this script, you must set the M2_HOME environment variable or the mav -en.home property to the location that should contain Maven. This directory -*must* be named after the maven version you want to install, e.g. +To run this script, you must set the M2_HOME environment variable or the +maven.home property to the location that should contain Maven. This +directory *must* be named after the maven version you want to install, e.g. /usr/local/maven-2.1-SNAPSHOT. You can set the maven.repo.local property to specify a custom location for
svn commit: r478765 - in /maven/site/trunk/src/site/apt: ./ developers/ guides/getting-started/ guides/mini/ guides/mini/guide-ide-netbeans/
Author: wsmoak Date: Thu Nov 23 20:33:46 2006 New Revision: 478765 URL: http://svn.apache.org/viewvc?view=rev&rev=478765 Log: Encourage the use of the standard url for the v4 pom schema, as discussed on [EMAIL PROTECTED] See: http://www.nabble.com/Publishing-schemas-t2566129s177.html Modified: maven/site/trunk/src/site/apt/developers/committer-testing-plugins.apt maven/site/trunk/src/site/apt/guides/getting-started/index.apt maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt maven/site/trunk/src/site/apt/guides/mini/guide-ide-netbeans/guide-ide-netbeans.apt maven/site/trunk/src/site/apt/guides/mini/guide-m1-m2.apt maven/site/trunk/src/site/apt/pom.apt Modified: maven/site/trunk/src/site/apt/developers/committer-testing-plugins.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/committer-testing-plugins.apt?view=diff&rev=478765&r1=478764&r2=478765 == --- maven/site/trunk/src/site/apt/developers/committer-testing-plugins.apt (original) +++ maven/site/trunk/src/site/apt/developers/committer-testing-plugins.apt Thu Nov 23 20:33:46 2006 @@ -112,7 +112,7 @@ xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> ... maven-XXX-plugin maven-plugin @@ -198,7 +198,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> ... @@ -228,7 +228,7 @@ xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> ... maven-XXX-plugin maven-plugin @@ -361,7 +361,7 @@ xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> ... Modified: maven/site/trunk/src/site/apt/guides/getting-started/index.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/getting-started/index.apt?view=diff&rev=478765&r1=478764&r2=478765 == --- maven/site/trunk/src/site/apt/guides/getting-started/index.apt (original) +++ maven/site/trunk/src/site/apt/guides/getting-started/index.apt Thu Nov 23 20:33:46 2006 @@ -128,7 +128,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 com.mycompany.app my-app @@ -674,7 +674,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 com.mycompany.app my-app @@ -761,7 +761,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 com.mycompany.app my-app @@ -811,7 +811,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd";> + http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 com.mycompany.app my-app @@ -879,7 +879,7 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0
svn commit: r479196 - in /maven/site/trunk/src/site/apt/guides: index.apt mini/guide-snippet-macro.apt
Author: wsmoak
Date: Sat Nov 25 12:55:55 2006
New Revision: 479196
URL: http://svn.apache.org/viewvc?view=rev&rev=479196
Log:
Adding some documentation for the snippet macro.
Added:
maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt (with
props)
Modified:
maven/site/trunk/src/site/apt/guides/index.apt
Modified: maven/site/trunk/src/site/apt/guides/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/index.apt?view=diff&rev=479196&r1=479195&r2=479196
==
--- maven/site/trunk/src/site/apt/guides/index.apt (original)
+++ maven/site/trunk/src/site/apt/guides/index.apt Sat Nov 25 12:55:55 2006
@@ -48,6 +48,8 @@
* {{{mini/guide-site.html}Creating a Site}}
* {{{mini/guide-apt-format.html}The APT Format}}
+
+ * {{{mini/guide-snippet-macro.html}Snippet Macro}}
** Archetypes
Added: maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt?view=auto&rev=479196
==
--- maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt (added)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt Sat Nov
25 12:55:55 2006
@@ -0,0 +1,94 @@
+ --
+ Guide to the Snippet Macro
+ --
+ Wendy Smoak
+ --
+ 20 November 2006
+ --
+
+~~ Copyright 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.
+
+Guide to the Snippet Macro
+
+ When generating your project website with Maven, you have the option of
+ dynamically including s of source code in your pages.
+
+ A is a section of a source code file that is surrounded by specially
+ formatted comments.
+
+ This functionality is inspired by the
+ {{{http://www.atlassian.com/software/confluence/}Confluence}} snippet macro,
+ and is provided by the Maven Doxia project by way of the Maven Site Plugin.
+
+ To include snippets of source code in your documentation, first add comments
+ in the source document surrounding the lines you want to include, and then
+ refer to the snippet by its id in the documentation file.
+
+ Each snippet must be assigned an id, and the id must be unique within the
+ source document.
+
+ Following are examples of snippets in Java and XML source documents, as well
+ as the corresponding macros in the APT documentation formats.
+
+* Snippets in Sources
+
+** Java
+
+-
+// START SNIPPET: snip-id
+public static void main( String[] args )
+{
+System.out.println( "Hello World!" );
+}
+// END SNIPPET: snip-id
+-
+
+** XML
+
+-
+
+
+/logon.jsp
+
+ success
+ /mainMenu.jsp
+
+
+
+-
+
+* Snippets in Documentation
+
+** APT
+
+ Macros in apt <> be indented.
+
+--
+%{snippet|id=snip-id|url=http://svn.example.com/path/to/Sample.java}
+
+%{snippet|id=snip-id|url=file:///path/to/Sample.java}
+--
+
+** XDOC
+
+ See {{{http://jira.codehaus.org/browse/DOXIA-77}DOXIA-77}} -
+ Snippets do not work in xdoc
+
+~~ --
+~~ http://svn.example.com/path/to/Sample.java"/>
+~~
+~~
+~~ --
+
Propchange: maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt
--
svn:eol-style = native
Propchange: maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt
--
svn:keywords = Date Author Id Revision HeadURL
svn commit: r479270 - /maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt
Author: wsmoak
Date: Sat Nov 25 20:11:25 2006
New Revision: 479270
URL: http://svn.apache.org/viewvc?view=rev&rev=479270
Log:
Document the 'file' parameter which will be in the next doxia-core release.
Add a JSP snippet example.
Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt?view=diff&rev=479270&r1=479269&r2=479270
==
--- maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt Sat Nov
25 20:11:25 2006
@@ -39,8 +39,8 @@
Each snippet must be assigned an id, and the id must be unique within the
source document.
- Following are examples of snippets in Java and XML source documents, as well
- as the corresponding macros in the APT documentation formats.
+ Following are examples of snippets in various source documents, as well
+ as the corresponding macros in the APT documentation format.
* Snippets in Sources
@@ -69,17 +69,39 @@
-
+** JSP
+
+--
+ <%-- START-SNIPPET: snip-id --%>
+
+ Create a new person
+ List all people
+
+ <%-- START-SNIPPET: snip-id --%>
+--
+
* Snippets in Documentation
** APT
- Macros in apt <> be indented.
+--
+ %{snippet|id=snip-id|url=http://svn.example.com/path/to/Sample.java}
+ %{snippet|id=snip-id|url=file:///path/to/Sample.java}
--
-%{snippet|id=snip-id|url=http://svn.example.com/path/to/Sample.java}
-%{snippet|id=snip-id|url=file:///path/to/Sample.java}
+ As of doxia-core version 1.0-alpha-9, a 'file' parameter is also available.
+ If a full path is not specified, the location is assumed to be relative to
+ $\{basedir\}.
+
--
+ ~~ Since doxia-core 1.0-alpha-9
+ %{snippet|id=abc|file=src/main/webapp/index.jsp}
+--
+
+ * Macros in apt <> be indented.
+
+ * Exactly one of <<>> or <<>> <> be specified.
** XDOC
svn commit: r481572 - /maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt
Author: wsmoak Date: Sat Dec 2 08:14:31 2006 New Revision: 481572 URL: http://svn.apache.org/viewvc?view=rev&rev=481572 Log: Corrected comment format. Modified: maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt Modified: maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt?view=diff&rev=481572&r1=481571&r2=481572 == --- maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-snippet-macro.apt Sat Dec 2 08:14:31 2006 @@ -72,12 +72,12 @@ ** JSP -- - <%-- START-SNIPPET: snip-id --%> + <%-- START SNIPPET: snip-id --%> Create a new person List all people - <%-- START-SNIPPET: snip-id --%> + <%-- END SNIPPET: snip-id --%> -- * Snippets in Documentation
svn commit: r620380 - /maven/archetype/trunk/archetype-plugin/pom.xml
Author: wsmoak
Date: Sun Feb 10 18:28:55 2008
New Revision: 620380
URL: http://svn.apache.org/viewvc?rev=620380&view=rev
Log:
Configure site and staging urls for the archetype plugin.
Modified:
maven/archetype/trunk/archetype-plugin/pom.xml
Modified: maven/archetype/trunk/archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=620380&r1=620379&r2=620380&view=diff
==
--- maven/archetype/trunk/archetype-plugin/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/pom.xml Sun Feb 10 18:28:55 2008
@@ -53,6 +53,13 @@
archetype
+
+maven-site-plugin
+
+
scp://people.apache.org/www/maven.apache.org/plugins/$
+{artifactId}-${version}
+
+
@@ -72,4 +79,10 @@
-
\ No newline at end of file
+
+
+ apache.website
+
scp://people.apache.org/www/maven.apache.org/plugins/maven-archetype-plugin
+
+
+
svn commit: r620383 - /maven/archetype/trunk/src/site/site.xml
Author: wsmoak
Date: Sun Feb 10 18:40:32 2008
New Revision: 620383
URL: http://svn.apache.org/viewvc?rev=620383&view=rev
Log:
Remove Codehaus Mojo graphics and references from archetype website
Modified:
maven/archetype/trunk/src/site/site.xml
Modified: maven/archetype/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/src/site/site.xml?rev=620383&r1=620382&r2=620383&view=diff
==
--- maven/archetype/trunk/src/site/site.xml (original)
+++ maven/archetype/trunk/src/site/site.xml Sun Feb 10 18:40:32 2008
@@ -1,18 +1,5 @@
-
-Mojo
-http://mojo.codehaus.org/images/mojo_logo.png
-http://mojo.codehaus.org
-
-
-Codehaus
-http://mojo.codehaus.org/images/codehaus-small.png
-http://www.codehaus.org
-
-
- http://mojo.codehaus.org"/>
-
@@ -24,4 +11,4 @@
${reports}
-
\ No newline at end of file
+
svn commit: r620393 - /maven/archetype/trunk/archetype-plugin/pom.xml
Author: wsmoak
Date: Sun Feb 10 19:13:01 2008
New Revision: 620393
URL: http://svn.apache.org/viewvc?rev=620393&view=rev
Log:
Remove line break in url
Modified:
maven/archetype/trunk/archetype-plugin/pom.xml
Modified: maven/archetype/trunk/archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=620393&r1=620392&r2=620393&view=diff
==
--- maven/archetype/trunk/archetype-plugin/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/pom.xml Sun Feb 10 19:13:01 2008
@@ -56,8 +56,7 @@
maven-site-plugin
-
scp://people.apache.org/www/maven.apache.org/plugins/$
-{artifactId}-${version}
+
scp://people.apache.org/www/maven.apache.org/plugins/${artifactId}-${version}
svn commit: r620397 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: wsmoak
Date: Sun Feb 10 19:39:09 2008
New Revision: 620397
URL: http://svn.apache.org/viewvc?rev=620397&view=rev
Log:
Fix svn url, and list both Archetype plugin versions until 2.0 is further along.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=620397&r1=620396&r2=620397&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sun Feb 10 19:39:09 2008
@@ -85,7 +85,9 @@
*---+--+--+++
| {{{/plugins/maven-antrun-plugin/} <<>>}} | 1.1| Run a
set of ant tasks from a phase of the build. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-antrun-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MANTRUN}JIRA}}
*---+--+--+++
-| {{{/plugins/maven-archetype-plugin/} <<>>}}| 1.0-alpha-7 |
Generate a skeleton project structure from an archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/maven-archetype/maven-archetype-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
+| {{{/plugins/maven-archetype-plugin/} <<>>}}| 2.0-alpha-1 |
Generate a skeleton project structure from an archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
+*---+--+--+++
+| {{{/plugins/maven-archetype-plugin-1.0-alpha-7/} <<>>}}|
1.0-alpha-7 | Generate a skeleton project structure from an archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-1.0-alpha-7/maven-archetype-plugin/}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
*---+--+--+++
| {{{/plugins/maven-assembly-plugin/} <<>>}} | 2.2-beta-1 |
Build an assembly (distribution) of sources and/or binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
*---+--+--+++
svn commit: r620406 - /maven/archetype/trunk/archetype-plugin/pom.xml
Author: wsmoak Date: Sun Feb 10 20:21:22 2008 New Revision: 620406 URL: http://svn.apache.org/viewvc?rev=620406&view=rev Log: Add a ci profile with the docck plugin configured. Modified: maven/archetype/trunk/archetype-plugin/pom.xml Modified: maven/archetype/trunk/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=620406&r1=620405&r2=620406&view=diff == --- maven/archetype/trunk/archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/archetype-plugin/pom.xml Sun Feb 10 20:21:22 2008 @@ -78,6 +78,34 @@ + + + + ciProfile + + + enableCiProfile + true + + + + + +maven-docck-plugin +1.0-beta-2 + + + + check + + + + + + + + + apache.website
svn commit: r620415 - /maven/archetype/trunk/archetype-plugin/pom.xml
Author: wsmoak Date: Sun Feb 10 21:16:15 2008 New Revision: 620415 URL: http://svn.apache.org/viewvc?rev=620415&view=rev Log: Must specify project and scm urls because the directory name does not match the artifact id. Modified: maven/archetype/trunk/archetype-plugin/pom.xml Modified: maven/archetype/trunk/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=620415&r1=620414&r2=620415&view=diff == --- maven/archetype/trunk/archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/archetype-plugin/pom.xml Sun Feb 10 21:16:15 2008 @@ -17,11 +17,19 @@ maven-archetype-plugin Maven Archetype Plugin + http://maven.apache.org/plugins/maven-archetype-plugin maven-plugin 2.0.7 + + + scm:svn:http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin + http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin + +
svn commit: r627643 - in /maven/enforcer/trunk: maven-enforcer-plugin/pom.xml pom.xml
Author: wsmoak
Date: Wed Feb 13 19:22:41 2008
New Revision: 627643
URL: http://svn.apache.org/viewvc?rev=627643&view=rev
Log:
Configure the site plugin staging url.
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=627643&r1=627642&r2=627643&view=diff
==
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Wed Feb 13 19:22:41 2008
@@ -80,6 +80,12 @@
+
+maven-site-plugin
+
+
scp://people.apache.org/www/maven.apache.org/plugins/${artifactId}-${version}
+
+
svn commit: r628597 - /maven/components/branches/maven-2.0.x/README.txt
Author: wsmoak Date: Sun Feb 17 18:21:26 2008 New Revision: 628597 URL: http://svn.apache.org/viewvc?rev=628597&view=rev Log: Fix example for M2_HOME value. Modified: maven/components/branches/maven-2.0.x/README.txt Modified: maven/components/branches/maven-2.0.x/README.txt URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/README.txt?rev=628597&r1=628596&r2=628597&view=diff == --- maven/components/branches/maven-2.0.x/README.txt (original) +++ maven/components/branches/maven-2.0.x/README.txt Sun Feb 17 18:21:26 2008 @@ -10,7 +10,7 @@ export PATH=$PATH:$M2_HOME/bin In addition, the last part of the M2_HOME path MUST be of the form maven-$version, eg: -/usr/local/maven-2.1-SNAPSHOT +/usr/local/apache-maven-2.0.9-SNAPSHOT You can set the parameters passed to the Java VM when running Maven2 bootstrap, setting the environment variable MAVEN_OPTS, e.g.
svn commit: r628625 - /maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt
Author: wsmoak
Date: Sun Feb 17 22:23:37 2008
New Revision: 628625
URL: http://svn.apache.org/viewvc?rev=628625&view=rev
Log:
Update the release process to reflect staging and voting on the actual
artifacts.
Modified:
maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt
Modified:
maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt?rev=628625&r1=628624&r2=628625&view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt
(original)
+++ maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt
Sun Feb 17 22:23:37 2008
@@ -28,7 +28,7 @@
Introduction
- This document gives step-by-step instructions for releasing a part of Maven.
The primary audience is Maven PMC.
+ This document gives step-by-step instructions for releasing a part of Maven.
The primary audience is Maven committers.
Prerequisite
@@ -39,7 +39,7 @@
* you have created your GPG keys. For more information, please refer to
{{{pmc-gpg-keys.html}Making GPG Keys}}.
-Release Process for Part Of Maven
+Release Process for a Maven Plugin
[[1]] Prepare your poms for release:
@@ -63,23 +63,49 @@
* Remember to do '<<>>' before you start the real
release process.
- [[2]] Publish a snapshot:
+ []
+
+ []
+
+ []
+
+[[4]] Prepare the release
+-+
->mvn deploy
-...
-[INFO] [deploy:deploy]
-[INFO] Retrieving previous build number from apache.snapshots
+>mvn release:prepare \
+ -Dtag=maven-XXX-plugin-2.1 \
+ -B \
+ -DtagBase=https://svn.apache.org/repos/asf/maven/plugins/tags \
+ -Dusername=YOUR_APACHE_USERNAME
+ ...
++-+
+
+<>: a release.properties file should be generated with release
configuration. DO NOT DELETE IT before release.
+
+[[5]] Stage the release.
+
+It should deploy several JARS (maven-XXX-plugin-2.1.jar,
maven-XXX-plugin-2.1-javadoc.jar
+and maven-XXX-plugin-2.1-sources.jar), maven-XXX-plugin-2.1.pom and
their associated md5 and sha1 files.
+
++-+
+>mvn release:perform -DstagingUrl=...
...
+-+
- <>: You could verify the deployment under Maven Snapshot repository on
Apache.
+<>: Maven could stop after <<<[INFO] [deploy:deploy]>>>. You
need to review your authentification settings
+for Apache (SSH public/private keys) or your servers in the
settings.xml. You could try also the following
+(NOT recommended) :
+-+
-http://people.apache.org/repo/m2-snapshot-repository/org/apache/maven/plugins/maven-XXX-plugin/2.1/
+>cd target/checkout
+>mvn deploy site-deploy --no-plugin-updates -DperformRelease=true
+-+
+
+ All artifacts must be accompanied by detached signature (.asc) files.
+The Maven GPG Plugin is configured to do this automatically.
- [[3]] Propose a vote on the dev list with the closed issues, the issues left
and the staging site. For instance:
+ [[3]] Propose a vote on the dev list with the closed issues, the issues left
and the staging repo and site urls.
+ For instance:
+-+
To: "Maven Developers List" <[EMAIL PROTECTED]>
@@ -97,7 +123,7 @@
http://people.apache.org/~YOUR_APACHE_USERNAME/maven-XXX-plugin/
Vote open for 72 hours, based on:
-maven-XXX-plugin-2.1-20061005.31-3.jar (rev 453071)
+http://people.apache.org/~YOUR_APACHE_USERNAME/staging-repo
[ ] +1
[ ] +0
@@ -107,92 +133,21 @@
Once a vote is successful, post the result to the dev list.
- [[4]] Prepare the release
+ [[5]] Sync the release to central
+
+ See the Maven Stage Plugin docs for more information.
-+-+
->mvn release:prepare \
- -Dtag=maven-XXX-plugin-2.1 \
- -B \
- -DtagBase=https://svn.apache.org/repos/asf/maven/plugins/tags \
- -Dusername=YOUR_APACHE_USERNAME
-...
-+-+
-
- <>: a release.properties file should be generated with release
configuration. DO NOT DELETE IT before release.
-
- [[5]] Perform the release.
-
- It should deploy several JARS (maven-XXX-plugin-2.1.jar,
maven-XXX-plugin-2.1-javadoc.jar
- and maven-XXX-plugin-2.1-sources.jar), maven-XXX-plugin-2.1.pom and their
associated md5 and sha1 files.
-
-+-+
->mvn release:perform
-...
-+-+
-
- <>: Maven could stop after <<<[INFO] [deploy:deploy]>>>. You need to
review your authentification settings
- for Apache (SSH public/private keys) or your servers in the settings.xml. You
could try also the following
- (NOT recommended) :
-
-+-+
->cd target/checkout
->mvn deploy site-deploy --no-plugin-updates -DperformRelease=true
-+-+
-
- <>: You could verify the deployment under Maven Rsync repository on
Apache.
+<>: You could verify the deplo
svn commit: r628627 - in /maven/site/trunk/src/site: apt/developers/release/pmc-release-process.apt resources/.htaccess
Author: wsmoak Date: Sun Feb 17 22:30:59 2008 New Revision: 628627 URL: http://svn.apache.org/viewvc?rev=628627&view=rev Log: Remove the old release instructions and redirect to the new ones. Removed: maven/site/trunk/src/site/apt/developers/release/pmc-release-process.apt Modified: maven/site/trunk/src/site/resources/.htaccess Modified: maven/site/trunk/src/site/resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/.htaccess?rev=628627&r1=628626&r2=628627&view=diff == --- maven/site/trunk/src/site/resources/.htaccess (original) +++ maven/site/trunk/src/site/resources/.htaccess Sun Feb 17 22:30:59 2008 @@ -2,6 +2,7 @@ Redirect Permanent /guides/mini/guide-ibiblio-upload.html http://maven.apache.org/guides/mini/guide-central-repository-upload.html Redirect Permanent /faq.html http://maven.apache.org/general.html +Redirect Permanent /developers/release/pmc-release-process.apt http://maven.apache.org/developers/release/releasing.html RedirectMatch ^/maven2/(.*)$ /$1 RedirectMatch ^/reference/(.*)$ /maven-1.x/reference/$1
svn commit: r628628 - /maven/site/trunk/src/site/resources/.htaccess
Author: wsmoak Date: Sun Feb 17 22:32:35 2008 New Revision: 628628 URL: http://svn.apache.org/viewvc?rev=628628&view=rev Log: Fix file extension, apt -> html Modified: maven/site/trunk/src/site/resources/.htaccess Modified: maven/site/trunk/src/site/resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/.htaccess?rev=628628&r1=628627&r2=628628&view=diff == --- maven/site/trunk/src/site/resources/.htaccess (original) +++ maven/site/trunk/src/site/resources/.htaccess Sun Feb 17 22:32:35 2008 @@ -2,7 +2,7 @@ Redirect Permanent /guides/mini/guide-ibiblio-upload.html http://maven.apache.org/guides/mini/guide-central-repository-upload.html Redirect Permanent /faq.html http://maven.apache.org/general.html -Redirect Permanent /developers/release/pmc-release-process.apt http://maven.apache.org/developers/release/releasing.html +Redirect Permanent /developers/release/pmc-release-process.html http://maven.apache.org/developers/release/releasing.html RedirectMatch ^/maven2/(.*)$ /$1 RedirectMatch ^/reference/(.*)$ /maven-1.x/reference/$1
svn commit: r628841 - /maven/site/trunk/src/site/apt/developers/index.apt
Author: wsmoak
Date: Mon Feb 18 10:26:45 2008
New Revision: 628841
URL: http://svn.apache.org/viewvc?rev=628841&view=rev
Log:
Docs on releasing have been consolidated.
Modified:
maven/site/trunk/src/site/apt/developers/index.apt
Modified: maven/site/trunk/src/site/apt/developers/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/index.apt?rev=628841&r1=628840&r2=628841&view=diff
==
--- maven/site/trunk/src/site/apt/developers/index.apt (original)
+++ maven/site/trunk/src/site/apt/developers/index.apt Mon Feb 18 10:26:45 2008
@@ -60,8 +60,6 @@
* {{{release/releasing.html}Release Process}}
-~~TODO: merge the above two documents
-
* Deploy Maven references
* {{{website/deploy-maven-current-ref.html}Deploy Maven Current References}}
svn commit: r628838 - in /maven/site/trunk/src/site/apt/developers: index.apt release/releasing.apt
Author: wsmoak
Date: Mon Feb 18 10:22:14 2008
New Revision: 628838
URL: http://svn.apache.org/viewvc?rev=628838&view=rev
Log:
Release vote email += guide to testing staged releases.
Use site:stage-deploy to published versioned plugin docs.
Modified:
maven/site/trunk/src/site/apt/developers/index.apt
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/index.apt?rev=628838&r1=628837&r2=628838&view=diff
==
--- maven/site/trunk/src/site/apt/developers/index.apt (original)
+++ maven/site/trunk/src/site/apt/developers/index.apt Mon Feb 18 10:22:14 2008
@@ -58,9 +58,7 @@
* {{{release/pmc-gpg-keys.html}Making GPG Keys}}
- * {{{release/pmc-release-process.html}Release Process}}
-
- * {{{release/releasing.html}New Release Process}}
+ * {{{release/releasing.html}Release Process}}
~~TODO: merge the above two documents
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=628838&r1=628837&r2=628838&view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Mon Feb 18
10:22:14 2008
@@ -122,12 +122,21 @@
<>: Preparing the release will create the new tag in SVN, automatically
checking in on your behalf.
- [[4]] Perform the release
+ [[4]] Stage the release for a vote
+-+
mvn release:perform
+-+
+ [[4]] Stage the latest documentation
+
+ <>: The plugin parent pom is configured to stage the documentation in a
"versioned" directory
+ such as <<>>.
+
++--+
+mvn site:stage-deploy -Preporting
++--+
+
[[3]] Propose a vote on the dev list with the closed issues, the issues left,
the staging repository and the staging site. For instance:
@@ -147,7 +156,10 @@
http://people.apache.org/~YOUR_APACHE_USERNAME/staging-repo/maven-XXX-plugin/
Staging site:
-http://people.apache.org/~YOUR_APACHE_USERNAME/maven-XXX-plugin/
+http://maven.apache.org/plugins/maven-XXX-plugin-Y.Z-SNAPSHOT/
+
+Guide to testing staged releases:
+http://maven.apache.org/guides/development/guide-testing-releases.html
Vote open for 72 hours.
@@ -206,10 +218,15 @@
This will allow you to bypass the staging phase and push the release directly
into a production repository. It is assume that
you have pushed a snapshot somewhere that people have looked at and approved
of.
- [[6]] Deploy the project site.
+ [[6]] Deploy the current and versioned websites
<> Be sure to generate and deploy the site using the same version of
the release. Typically, you need to check out the tag (or go to
<<>>)
- and call <<>>.
+
++-+
+mvn site-deploy -Preporting
+
+mvn site:stage-deploy -Preporting
++-+
[[7]] Review Website
svn commit: r628845 - /maven/pom/trunk/maven/pom.xml
Author: wsmoak
Date: Mon Feb 18 11:15:26 2008
New Revision: 628845
URL: http://svn.apache.org/viewvc?rev=628845&view=rev
Log:
Override the distribution url to avoid inaadvertently publishing directly to
the rsynced repo.
Modified:
maven/pom/trunk/maven/pom.xml
Modified: maven/pom/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=628845&r1=628844&r2=628845&view=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Mon Feb 18 11:15:26 2008
@@ -82,6 +82,10 @@
+
+ maven.staging
+
scp://people.apache.org/www/people.apache.org/builds/maven/${project.version}/staging-repo
+
apache.website
scp://people.apache.org/www/maven.apache.org
svn commit: r628938 - /maven/plugins/trunk/maven-stage-plugin/pom.xml
Author: wsmoak Date: Mon Feb 18 16:53:15 2008 New Revision: 628938 URL: http://svn.apache.org/viewvc?rev=628938&view=rev Log: Trivial change to debug failing commit during release:prepare. Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=628938&r1=628937&r2=628938&view=diff == --- maven/plugins/trunk/maven-stage-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-stage-plugin/pom.xml Mon Feb 18 16:53:15 2008 @@ -65,7 +65,7 @@ org.apache.maven.plugins maven-surefire-plugin - + **/RepositoryCopierTest.* @@ -146,4 +146,4 @@ 2.0.5 - \ No newline at end of file +
svn commit: r628976 - in /maven/plugins/tags/maven-stage-plugin-1.0-alpha-1: ./ pom.xml
Author: wsmoak Date: Mon Feb 18 19:20:51 2008 New Revision: 628976 URL: http://svn.apache.org/viewvc?rev=628976&view=rev Log: [maven-release-plugin] copy for tag maven-stage-plugin-1.0-alpha-1 Added: maven/plugins/tags/maven-stage-plugin-1.0-alpha-1/ - copied from r628974, maven/plugins/trunk/maven-stage-plugin/ maven/plugins/tags/maven-stage-plugin-1.0-alpha-1/pom.xml - copied unchanged from r628975, maven/plugins/trunk/maven-stage-plugin/pom.xml
svn commit: r628977 - /maven/plugins/trunk/maven-stage-plugin/pom.xml
Author: wsmoak Date: Mon Feb 18 19:21:08 2008 New Revision: 628977 URL: http://svn.apache.org/viewvc?rev=628977&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=628977&r1=628976&r2=628977&view=diff == --- maven/plugins/trunk/maven-stage-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-stage-plugin/pom.xml Mon Feb 18 19:21:08 2008 @@ -29,7 +29,7 @@ maven-stage-plugin maven-plugin Maven Stage Plugin - 1.0-alpha-1 + 1.0-SNAPSHOT The Maven Stage Plugin copies artifacts from one repository to another. @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/
svn commit: r628975 - /maven/plugins/trunk/maven-stage-plugin/pom.xml
Author: wsmoak Date: Mon Feb 18 19:20:39 2008 New Revision: 628975 URL: http://svn.apache.org/viewvc?rev=628975&view=rev Log: [maven-release-plugin] prepare release maven-stage-plugin-1.0-alpha-1 Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=628975&r1=628974&r2=628975&view=diff == --- maven/plugins/trunk/maven-stage-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-stage-plugin/pom.xml Mon Feb 18 19:20:39 2008 @@ -29,7 +29,7 @@ maven-stage-plugin maven-plugin Maven Stage Plugin - 1.0-SNAPSHOT + 1.0-alpha-1 The Maven Stage Plugin copies artifacts from one repository to another. @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1
svn commit: r628982 - /maven/plugins/tags/maven-stage-plugin-1.0-alpha-1/
Author: wsmoak Date: Mon Feb 18 19:56:48 2008 New Revision: 628982 URL: http://svn.apache.org/viewvc?rev=628982&view=rev Log: Removing the tag to try again. Removed: maven/plugins/tags/maven-stage-plugin-1.0-alpha-1/
svn commit: r628984 - /maven/plugins/trunk/maven-stage-plugin/pom.xml
Author: wsmoak Date: Mon Feb 18 20:09:31 2008 New Revision: 628984 URL: http://svn.apache.org/viewvc?rev=628984&view=rev Log: [maven-release-plugin] prepare release maven-stage-plugin-1.0-alpha-1 Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=628984&r1=628983&r2=628984&view=diff == --- maven/plugins/trunk/maven-stage-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-stage-plugin/pom.xml Mon Feb 18 20:09:31 2008 @@ -29,7 +29,7 @@ maven-stage-plugin maven-plugin Maven Stage Plugin - 1.0-SNAPSHOT + 1.0-alpha-1 The Maven Stage Plugin copies artifacts from one repository to another. @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1
svn commit: r628985 - in /maven/plugins/tags/maven-stage-plugin-1.0-alpha-1: ./ pom.xml
Author: wsmoak Date: Mon Feb 18 20:09:47 2008 New Revision: 628985 URL: http://svn.apache.org/viewvc?rev=628985&view=rev Log: [maven-release-plugin] copy for tag maven-stage-plugin-1.0-alpha-1 Added: maven/plugins/tags/maven-stage-plugin-1.0-alpha-1/ - copied from r628983, maven/plugins/trunk/maven-stage-plugin/ maven/plugins/tags/maven-stage-plugin-1.0-alpha-1/pom.xml - copied unchanged from r628984, maven/plugins/trunk/maven-stage-plugin/pom.xml
svn commit: r628986 - /maven/plugins/trunk/maven-stage-plugin/pom.xml
Author: wsmoak Date: Mon Feb 18 20:10:06 2008 New Revision: 628986 URL: http://svn.apache.org/viewvc?rev=628986&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?rev=628986&r1=628985&r2=628986&view=diff == --- maven/plugins/trunk/maven-stage-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-stage-plugin/pom.xml Mon Feb 18 20:10:06 2008 @@ -29,7 +29,7 @@ maven-stage-plugin maven-plugin Maven Stage Plugin - 1.0-alpha-1 + 1.0-SNAPSHOT The Maven Stage Plugin copies artifacts from one repository to another. @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-stage-plugin-1.0-alpha-1 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/
svn commit: r630088 - /maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Author: wsmoak
Date: Thu Feb 21 20:27:13 2008
New Revision: 630088
URL: http://svn.apache.org/viewvc?rev=630088&view=rev
Log:
[MINSTALL-48] Don't create checksums for gpg signature files
Submitted by: Niall Pemberton
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=630088&r1=630087&r2=630088&view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Thu Feb 21 20:27:13 2008
@@ -135,7 +135,9 @@
installer.install( attached.getFile(), attached,
localRepository );
-if ( createChecksum )
+boolean signatureFile = attached.getFile().getName().endsWith(
".asc" );
+
+if ( createChecksum && !signatureFile )
{
installCheckSum( attached.getFile(), attached, false );
}
svn commit: r630359 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: wsmoak Date: Fri Feb 22 15:50:39 2008 New Revision: 630359 URL: http://svn.apache.org/viewvc?rev=630359&view=rev Log: Assume Maven 2, and include a short description of the plugin in the announcement. Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=630359&r1=630358&r2=630359&view=diff == --- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original) +++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Fri Feb 22 15:50:39 2008 @@ -253,9 +253,11 @@ From: YOUR_APACHE_EMAIL To: [EMAIL PROTECTED], [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] -Subject: [ANN] Maven XXX Plugin Y.Y for Maven 2 Released +Subject: [ANN] Maven XXX Plugin Y.Y Released The Maven team is pleased to announce the release of the Maven XXX Plugin, version Y.Y + +This plugin (insert short description of the plugin's purpose). http://maven.apache.org/plugins/maven-XXX-plugin/
svn commit: r630358 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: wsmoak
Date: Fri Feb 22 15:49:32 2008
New Revision: 630358
URL: http://svn.apache.org/viewvc?rev=630358&view=rev
Log:
Added maven-stage-plugin 1.0-alpha-1.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=630358&r1=630357&r2=630358&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Fri Feb 22 15:49:32 2008
@@ -117,6 +117,8 @@
*---+--+--+++
| {{{/plugins/maven-source-plugin/} <<>>}} | 2.0.4 | Build a
JAR of sources for use in IDEs and distribution to the repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSOURCES}JIRA}}
*---+--+--+++
+| {{{/plugins/maven-stage-plugin/} <<>>}}| 1.0-alpha-1 |
Assists with release staging and promotion. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSTAGE}JIRA}}
+*---+--+--+++
| <> | | | |
*---+--+--+++
| {{{/plugins/maven-eclipse-plugin/} <<>>}}| 2.4|
Generate an Eclipse project file for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MECLIPSE}JIRA}}
svn commit: r630460 - /maven/plugins/trunk/maven-deploy-plugin/src/site/fml/faq.fml
Author: wsmoak Date: Sat Feb 23 07:56:58 2008 New Revision: 630460 URL: http://svn.apache.org/viewvc?rev=630460&view=rev Log: [MDEPLOY-63] Add a faq explaining how to skip deployment. TODO: sections in .fml files do not display properly Modified: maven/plugins/trunk/maven-deploy-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-deploy-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/site/fml/faq.fml?rev=630460&r1=630459&r2=630460&view=diff == --- maven/plugins/trunk/maven-deploy-plugin/src/site/fml/faq.fml (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/site/fml/faq.fml Sat Feb 23 07:56:58 2008 @@ -51,5 +51,24 @@ + + I don't want to deploy one of the artifacts in my multi-module build. Can I skip deployment? + + + Yes, you can skip deployment of individual modules by configuring the deploy plugin as follows: + + + + + maven-deploy-plugin + X.Y + + true + + + + + +
svn commit: r632060 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: wsmoak
Date: Thu Feb 28 09:12:09 2008
New Revision: 632060
URL: http://svn.apache.org/viewvc?rev=632060&view=rev
Log:
Update archetype plugin. Latest release is 2.0-alpha-2, and remove 1.x now
that backwards compatibility is restored.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=632060&r1=632059&r2=632060&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Thu Feb 28 09:12:09 2008
@@ -85,9 +85,7 @@
*---+--+--+++
| {{{/plugins/maven-antrun-plugin/} <<>>}} | 1.1| Run a
set of ant tasks from a phase of the build. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-antrun-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MANTRUN}JIRA}}
*---+--+--+++
-| {{{/plugins/maven-archetype-plugin/} <<>>}}| 2.0-alpha-1 |
Generate a skeleton project structure from an archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
-*---+--+--+++
-| {{{/plugins/maven-archetype-plugin-1.0-alpha-7/} <<>>}}|
1.0-alpha-7 | Generate a skeleton project structure from an archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-1.0-alpha-7/maven-archetype-plugin/}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
+| {{{/plugins/maven-archetype-plugin/} <<>>}}| 2.0-alpha-2 |
Generate a skeleton project structure from an archetype. |
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/ARCHETYPE}JIRA}}
*---+--+--+++
| {{{/plugins/maven-assembly-plugin/} <<>>}} | 2.2-beta-1 |
Build an assembly (distribution) of sources and/or binaries. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MASSEMBLY}JIRA}}
*---+--+--+++
svn commit: r632773 - in /maven/site/trunk/src/site: apt/continuous-integration.apt apt/repository-management.apt site.xml
Author: wsmoak
Date: Sun Mar 2 07:52:53 2008
New Revision: 632773
URL: http://svn.apache.org/viewvc?rev=632773&view=rev
Log:
Add the related topics of repository management and continuous integration to
the site.
Added:
maven/site/trunk/src/site/apt/continuous-integration.apt
maven/site/trunk/src/site/apt/repository-management.apt
Modified:
maven/site/trunk/src/site/site.xml
Added: maven/site/trunk/src/site/apt/continuous-integration.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/continuous-integration.apt?rev=632773&view=auto
==
--- maven/site/trunk/src/site/apt/continuous-integration.apt (added)
+++ maven/site/trunk/src/site/apt/continuous-integration.apt Sun Mar 2
07:52:53 2008
@@ -0,0 +1,39 @@
+
+ Continuous Integration
+ -
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Continuous Integration
+
+~~ TODO: definition, description, motivation for using, etc.
+
+* CI Servers
+
+ Following is an alphabetical list of some CI servers we've heard mentioned
around the Maven community:
+
+ * {{{http://maven.apache.org/continuum}Apache Continuum}}
+
+ * {{{http://www.atlassian.com/software/bamboo/}Bamboo (Atlassian)}}
+
+ * {{{http://cruisecontrol.sourceforge.net/}Cruise Control}}
+
+ * {{{https://hudson.dev.java.net}Hudson}}
Added: maven/site/trunk/src/site/apt/repository-management.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/repository-management.apt?rev=632773&view=auto
==
--- maven/site/trunk/src/site/apt/repository-management.apt (added)
+++ maven/site/trunk/src/site/apt/repository-management.apt Sun Mar 2 07:52:53
2008
@@ -0,0 +1,37 @@
+
+ Repository Management
+ -
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Repository Management
+
+~~ TODO: definition, description, motivation for using, etc.
+
+* Repository Managers
+
+ Following is an alphabetical list of some repository managers we've heard
mentioned around the Maven community:
+
+ * {{{http://maven.apache.org/archiva}Apache Archiva}}
+
+ * {{{http://www.jfrog.org/sites/artifactory/1.2/}Artifactory}}
+
+ * {{{http://proximity.abstracthorizon.org}Proximity}}
Modified: maven/site/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?rev=632773&r1=632772&r2=632773&view=diff
==
--- maven/site/trunk/src/site/site.xml (original)
+++ maven/site/trunk/src/site/site.xml Sun Mar 2 07:52:53 2008
@@ -174,7 +174,6 @@
http://maven.apache.org/"/>
- http://maven.apache.org/continuum"/>
http://maven.apache.org/archiva"/>
http://maven.apache.org/scm"/>
http://maven.apache.org/wagon"/>
@@ -182,5 +181,11 @@
http://maven.apache.org/doxia"/>
http://maven.apache.org/maven-1.x"/>
+
+
+
+
+
+
svn commit: r632888 - in /maven/plugins/trunk/maven-javadoc-plugin: ./ src/it/MJAVADOC-137/ src/it/MJAVADOC-137/test1/ src/it/MJAVADOC-137/test1/src/ src/it/MJAVADOC-137/test1/src/main/ src/it/MJAVADO
Author: wsmoak Date: Sun Mar 2 16:16:31 2008 New Revision: 632888 URL: http://svn.apache.org/viewvc?rev=632888&view=rev Log: Adding a test for MJAVADOC-137, which really should fail, but doesn't. mvn javadoc:jar at the command line does not produce the javadoc jars in the sub-modules, but the same config in the parent pom does. Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/pom.xml maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/main/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/main/java/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/main/java/com/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/main/java/com/example/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/main/java/com/example/App.java maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/pom.xml maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/src/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/src/main/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/src/main/java/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/src/main/java/com/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/src/main/java/com/example/ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test2/src/main/java/com/example/App.java maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/verify.bsh Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=632888&r1=632887&r2=632888&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Mar 2 16:16:31 2008 @@ -260,6 +260,7 @@ src/it **/MJAVADOC-110/pom.xml +**/MJAVADOC-137/pom.xml **/MJAVADOC-172/pom.xml verify.bsh Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml?rev=632888&view=auto == --- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml (added) +++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml Sun Mar 2 16:16:31 2008 @@ -0,0 +1,43 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + 4.0.0 + com.example + test-parent + 1.0-SNAPSHOT + pom + test-parent + http://maven.apache.org + + + + + + maven-javadoc-plugin + 2.4-SNAPSHOT + + + + + + +org.apache.maven.plugins +maven-javadoc-plugin + + +attach-javadocs + + jar + + + + + + + + + +test1 +test2 + + + Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/pom.xml?rev=632888&view=auto == --- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/pom.xml (added) +++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/pom.xml Sun Mar 2 16:16:31 2008 @@ -0,0 +1,12 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + 4.0.0 + +com.example +test-parent +1.0-SNAPSHOT + + test1 + jar + test1 + Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/main/java/com/example/App.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/test1/src/main/java/com/example/App.java?rev=632888&view=auto =
svn commit: r632911 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml src/it/MJAVADOC-137/goals.txt src/it/MJAVADOC-137/pom.xml
Author: wsmoak Date: Sun Mar 2 17:27:34 2008 New Revision: 632911 URL: http://svn.apache.org/viewvc?rev=632911&view=rev Log: [MJAVADOC-137] Add goals.txt to execute 'mvn javadoc:jar' and comment out the now failing test. Thanks to Brian and Brett for assistance. :) Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/goals.txt Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=632911&r1=632910&r2=632911&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Mar 2 17:27:34 2008 @@ -260,7 +260,7 @@ src/it **/MJAVADOC-110/pom.xml -**/MJAVADOC-137/pom.xml + **/MJAVADOC-172/pom.xml verify.bsh @@ -280,4 +280,4 @@ - \ No newline at end of file + Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/goals.txt?rev=632911&view=auto == --- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/goals.txt (added) +++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/goals.txt Sun Mar 2 17:27:34 2008 @@ -0,0 +1 @@ +javadoc:jar \ No newline at end of file Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml?rev=632911&r1=632910&r2=632911&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml Sun Mar 2 17:27:34 2008 @@ -17,22 +17,6 @@ - - - -org.apache.maven.plugins -maven-javadoc-plugin - - -attach-javadocs - - jar - - - - - -
svn commit: r632945 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: wsmoak
Date: Sun Mar 2 22:05:15 2008
New Revision: 632945
URL: http://svn.apache.org/viewvc?rev=632945&view=rev
Log:
[MJAVADOC-137] Revert the addition of @aggregator and other changes from
MJAVADOC-104, which fixed a problem with missing javadoc for generated sources.
Unfortunately, adding @aggregator to the javadoc plugin causes too many other
problems.
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=632945&r1=632944&r2=632945&view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Mar 2 22:05:15 2008
@@ -260,7 +260,7 @@
src/it
**/MJAVADOC-110/pom.xml
-
+**/MJAVADOC-137/pom.xml
**/MJAVADOC-172/pom.xml
verify.bsh
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=632945&r1=632944&r2=632945&view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Sun Mar 2 22:05:15 2008
@@ -84,7 +84,6 @@
* @version $Id$
* @since 2.0
* @requiresDependencyResolution compile
- * @aggregator
*/
public abstract class AbstractJavadocMojo
extends AbstractMojo
@@ -1667,11 +1666,6 @@
if ( subProject != project )
{
List sourceRoots = getProjectSourceRoots( subProject );
-
-if ( subProject.getExecutionProject() != null )
-{
-sourceRoots.addAll(
getExecutionProjectSourceRoots( subProject ) );
-}
ArtifactHandler artifactHandler =
subProject.getArtifact().getArtifactHandler();
if ( "java".equals( artifactHandler.getLanguage() ) )
svn commit: r634146 - /maven/site/trunk/src/site/apt/continuous-integration.apt
Author: wsmoak
Date: Wed Mar 5 19:57:39 2008
New Revision: 634146
URL: http://svn.apache.org/viewvc?rev=634146&view=rev
Log:
Add TeamCity to the list of CI servers.
Modified:
maven/site/trunk/src/site/apt/continuous-integration.apt
Modified: maven/site/trunk/src/site/apt/continuous-integration.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/continuous-integration.apt?rev=634146&r1=634145&r2=634146&view=diff
==
--- maven/site/trunk/src/site/apt/continuous-integration.apt (original)
+++ maven/site/trunk/src/site/apt/continuous-integration.apt Wed Mar 5
19:57:39 2008
@@ -37,3 +37,5 @@
* {{{http://cruisecontrol.sourceforge.net/}Cruise Control}}
* {{{https://hudson.dev.java.net}Hudson}}
+
+ * {{{http://www.jetbrains.com/teamcity/}TeamCity (JetBrains)}}
svn commit: r634897 - in /maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137: pom.xml verify.bsh
Author: wsmoak
Date: Fri Mar 7 19:52:21 2008
New Revision: 634897
URL: http://svn.apache.org/viewvc?rev=634897&view=rev
Log:
MJAVADOC-137 Added description and removed commentC
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/verify.bsh
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml?rev=634897&r1=634896&r2=634897&view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml Fri
Mar 7 19:52:21 2008
@@ -26,6 +26,12 @@
Maven MJAVADOC-137 test
http://maven.apache.org
+
+ Tests that 'mvn javadoc:jar' produces javadoc jars in each sub-project
+ when run from the parent. This broke when @aggregator was added to the
+ javadoc plugin as part of MJAVADOC-104.
+
+
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/verify.bsh?rev=634897&r1=634896&r2=634897&view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/verify.bsh Fri
Mar 7 19:52:21 2008
@@ -22,9 +22,6 @@
boolean result = true;
-// This test should fail -- mvn javadoc:jar at the command line does *not*
produce the jars.
-// However, with the same config in the parent pom, it works.
-
try
{
File target = new File( basedir,
"test1/target/test1-1.0-SNAPSHOT-javadoc.jar" );
svn commit: r635005 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml
Author: wsmoak Date: Sat Mar 8 08:38:45 2008 New Revision: 635005 URL: http://svn.apache.org/viewvc?rev=635005&view=rev Log: Make sure that maven-source-plugin 2.0.4 is used for the release so that LICENSE and NOTICE will be presend in the -sources jar. Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=635005&r1=635004&r2=635005&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Mar 8 08:38:45 2008 @@ -279,5 +279,26 @@ + + + release + + + +org.apache.maven.plugins +maven-source-plugin +2.0.4 + + +attach-sources + + jar + + + + + + +
svn commit: r637424 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: wsmoak
Date: Sat Mar 15 08:08:41 2008
New Revision: 637424
URL: http://svn.apache.org/viewvc?rev=637424&view=rev
Log:
Provide an alternate method of staging the site.
Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=637424&r1=637423&r2=637424&view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Sat Mar 15
08:08:41 2008
@@ -150,6 +150,15 @@
http://maven.apache.org/plugins/plugins/maven-XXX-plugin-Y.Z/
+-+
+ Some developers have
{{{http://www.nabble.com/site%3Astage-deploy-asks-for-a-password--tt15582961s177.html}
+ reported problems}} with the stage-deploy goal. In that case, you can stage
the site locally and
+ upload it manually:
+
++--+
+mvn site:stage -Preporting
+scp -r
target/staging/people.apache.org/www/maven.apache.org/plugins/maven-XXX-plugin
people.apache.org:/www/maven.apache.org/plugins/maven-XXX-plugin-Y.Z
++--+
+
[[6]] Propose a vote on the dev list with the closed issues, the issues left,
the staging repository and the staging site. For instance:
@@ -226,14 +235,12 @@
This will allow you to bypass the staging phase and push the release directly
into a production repository. It is assumed that
you have pushed a snapshot somewhere that people have looked at and approved
of.
- [[8]] Deploy the current and versioned websites
+ [[8]] Deploy the current website
<> Be sure to generate and deploy the site using the same version of
the release. Typically, you need to check out the tag (or go to
<<>>)
+-+
mvn site-deploy -Preporting
-
-mvn site:stage-deploy -Preporting
+-+
[[9]] Review Website
svn commit: r640119 - /maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml
Author: wsmoak Date: Sat Mar 22 16:23:31 2008 New Revision: 640119 URL: http://svn.apache.org/viewvc?rev=640119&view=rev Log: MWAR-131 Added a faq explaining the new attachClasses parameter as well as the existing archiveClasses parameter. Modified: maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml?rev=640119&r1=640118&r2=640119&view=diff == --- maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/fml/faq.fml Sat Mar 22 16:23:31 2008 @@ -74,5 +74,48 @@ + + How do I create a jar containing the classes in my webapp? + + If you would simply like to package the classes and resources as a jar in WEB-INF/lib + rather than as loose files under WEB-INF/classes, use the following configuration: + + + + maven-war-plugin + X.Y + + true + + + + + If you need to re-use this jar in another project, the recommended approach is to move the classes to a + separate module that builds a jar, and then declare a dependency on that jar from your webapp as well as from + any other projects that need it. + If you can't move the classes to another project, you can deploy the classes and resources included in + your webapp as an "attached" artifact, with a classifier, by using the following configuration: + + + + ... + mywebapp + 1.0-SNAPSHOT + ... + + maven-war-plugin + X.Y + + true + + + ... + + + + This will result in two artifacts being deployed: mywebapp-1.0-SNAPSHOT.war + and mywebapp-1.0-SNAPSHOT-classes.jar + +
svn commit: r642499 - in /maven/plugins/trunk/maven-war-plugin: ./ src/it/MWAR-131/ src/it/MWAR-131/mwar131-test/ src/it/MWAR-131/mwar131-test/src/ src/it/MWAR-131/mwar131-test/src/main/ src/it/MWAR-1
Author: wsmoak Date: Fri Mar 28 20:27:06 2008 New Revision: 642499 URL: http://svn.apache.org/viewvc?rev=642499&view=rev Log: MWAR-131 Added integration test to make sure that the classified artifact is installed in the local repo, and able to be used by another project. Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/goals.txt maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/pom.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/main/java/com/example/App.java maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/example/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/src/test/java/com/example/AppTest.java maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/pom.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/java/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/java/com/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/java/com/example/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/java/com/example/Util.java maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/resources/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/webapp/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/webapp/WEB-INF/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/webapp/WEB-INF/web.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/src/main/webapp/index.jsp maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/pom.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/resources/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/webapp/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/webapp/WEB-INF/ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/webapp/WEB-INF/web.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/src/main/webapp/index.jsp maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/pom.xml maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/verify.bsh Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=642499&r1=642498&r2=642499&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Fri Mar 28 20:27:06 2008 @@ -197,6 +197,9 @@ MWAR-143/war-common/pom.xml MWAR-143/war-filter-overlay/pom.xml +MWAR-131/mwar131-test/pom.xml +MWAR-131/mwar131-webapp/pom.xml +MWAR-131/mwar131-webapp2/pom.xml **/META-INF/**/pom.xml verify.bsh Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/goals.txt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/goals.txt?rev=642499&view=auto == --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/goals.txt (added) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/goals.txt Fri Mar 28 20:27:06 2008 @@ -0,0 +1 @@ +clean install \ No newline a
svn commit: r642754 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: wsmoak Date: Sun Mar 30 07:48:12 2008 New Revision: 642754 URL: http://svn.apache.org/viewvc?rev=642754&view=rev Log: MWAR-152 Configure the clean plugin to delete files created by integration tests. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=642754&r1=642753&r2=642754&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Mar 30 07:48:12 2008 @@ -146,7 +146,22 @@ - + + +org.apache.maven.plugins +maven-clean-plugin + + + + src/it + +**/target +**/build.log + + + + +
svn commit: r642757 - in /maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131: ./ mwar131-test/ mwar131-webapp/ mwar131-webapp2/ pom.xml
Author: wsmoak Date: Sun Mar 30 08:06:44 2008 New Revision: 642757 URL: http://svn.apache.org/viewvc?rev=642757&view=rev Log: MWAR-131 Make sure the current snapshot version of the plugin is used for the IT. Added svn:ignore props. Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/ (props changed) maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/ (props changed) maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/ (props changed) maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/ (props changed) maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/pom.xml Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/ -- --- svn:ignore (added) +++ svn:ignore Sun Mar 30 08:06:44 2008 @@ -0,0 +1,2 @@ +target +build.log Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-test/ -- --- svn:ignore (added) +++ svn:ignore Sun Mar 30 08:06:44 2008 @@ -0,0 +1 @@ +target Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp/ -- --- svn:ignore (added) +++ svn:ignore Sun Mar 30 08:06:44 2008 @@ -0,0 +1 @@ +target Propchange: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/mwar131-webapp2/ -- --- svn:ignore (added) +++ svn:ignore Sun Mar 30 08:06:44 2008 @@ -0,0 +1 @@ +target Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/pom.xml?rev=642757&r1=642756&r2=642757&view=diff == --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-131/pom.xml Sun Mar 30 08:06:44 2008 @@ -7,6 +7,14 @@ 1.0-SNAPSHOT MWAR-131 Integration Test http://maven.apache.org + + + +maven-war-plugin +@pom.version@ + + + mwar131-webapp mwar131-test
svn commit: r645979 - /maven/site/trunk/src/site/apt/repository-management.apt
Author: wsmoak
Date: Tue Apr 8 08:48:30 2008
New Revision: 645979
URL: http://svn.apache.org/viewvc?rev=645979&view=rev
Log:
[MNGSITE-45] Added information about repository management
Submitted by: Erik Drolshammer
Modified:
maven/site/trunk/src/site/apt/repository-management.apt
Modified: maven/site/trunk/src/site/apt/repository-management.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/repository-management.apt?rev=645979&r1=645978&r2=645979&view=diff
==
--- maven/site/trunk/src/site/apt/repository-management.apt (original)
+++ maven/site/trunk/src/site/apt/repository-management.apt Tue Apr 8 08:48:30
2008
@@ -24,14 +24,47 @@
Repository Management
-~~ TODO: definition, description, motivation for using, etc.
+* What is a Build Artifact Repository Manager
-* Repository Managers
+ The purpose of a is to hold all software libraries used
within an organization. The responsibility
+of a is to
+
+1. <>.
+
+The proxy functionality gives increased , better and
makes it to their projects (no more which repo holds artifactX?).
+
+2. <>.
+
+The repository supports deployment of internal and external snapshots and
releases and advanced security options
+can be to restrict access to sensitive artifacts.
+This functionality is required to work effectively with a large number of
Maven projects and without it it is
+hard to implement the "one deployment unit, one Maven project" concept.
+
+3. <>
+
+The products often provide a graphical user interface that supports search
and browsing of the repositories and functionality to view/add/delete artifacts.
+
+* Repository Manager Overview
Following is an alphabetical list of some repository managers we've heard
mentioned around the Maven community:
* {{{http://maven.apache.org/archiva}Apache Archiva}}
- * {{{http://www.jfrog.org/sites/artifactory/1.2/}Artifactory}}
+ * {{{http://www.jfrog.org/sites/artifactory/latest/}Artifactory}}
* {{{http://proximity.abstracthorizon.org}Proximity}}
+
+
+~~ TODO Add link to comparison matrix on the MAVENUSER wiki that shows the
which features the different products have.
+
+~~ TODO Link to instructions for configuring repositories and mirrors
+
+* Other resources
+
+ *
{{{http://www.theserverside.com/tt/articles/article.tss?l=SettingUpMavenRepository }Setting
Up Maven Repository}} by Avneet Mangat
+
+ *
{{{http://docs.codehaus.org/display/MAVENUSER/Maven+Concepts+Repositories}Maven
Concepts Repositories}} from Maven wiki
+
+ *
{{{http://blogs.exist.com/oching/2007/11/05/the-hype-about-repository-managers/}The
Hype About Repository Managers}} by Deng Ching
+
svn commit: r655120 - /maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
Author: wsmoak
Date: Sat May 10 09:11:43 2008
New Revision: 655120
URL: http://svn.apache.org/viewvc?rev=655120&view=rev
Log:
Fix mailing list name and link to the Atom feed.
Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt?rev=655120&r1=655119&r2=655120&view=diff
==
---
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/mini/guide-central-repository-upload.apt
Sat May 10 09:11:43 2008
@@ -184,7 +184,9 @@
If you are using ssh in your own server you need to add the
{{{http://www.ibiblio.org/maven/id_dsa.pub}maven public key}} to the authorized
ones to allow us to log
in the machine.
- Remember to subscribe to {{{mailto:[EMAIL PROTECTED] mailing list}}.
+ Remember to {{{mailto:[EMAIL PROTECTED] to the
+
{{{http://mail-archives.apache.org/mod_mbox/maven-repo-maintainers/}repo-maintainers
mailing list}}. (Or watch the
+
{{{http://mail-archives.apache.org/mod_mbox/maven-repo-maintainers/?format=atom}Atom
feed}}.)
<>: nothing is deleted or changed in the Central Repository after
it is synced (except maven-metadata.xml files)
svn commit: r680603 - /maven/plugins/trunk/maven-deploy-plugin/pom.xml
Author: wsmoak Date: Mon Jul 28 19:23:08 2008 New Revision: 680603 URL: http://svn.apache.org/viewvc?rev=680603&view=rev Log: Remove snapshot repo now that maven-plugin-plugin 2.4.2 is released. Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=680603&r1=680602&r2=680603&view=diff == --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Mon Jul 28 19:23:08 2008 @@ -137,29 +137,4 @@ - - - - apache.snapshots - http://people.apache.org/repo/m2-snapshot-repository - -false - - -true - - - - - - apache.snapshots - http://people.apache.org/repo/m2-snapshot-repository - -false - - -true - - -
svn commit: r682049 - /maven/plugins/trunk/maven-deploy-plugin/pom.xml
Author: wsmoak Date: Sat Aug 2 14:29:33 2008 New Revision: 682049 URL: http://svn.apache.org/viewvc?rev=682049&view=rev Log: [maven-release-plugin] prepare release maven-deploy-plugin-2.4 Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=682049&r1=682048&r2=682049&view=diff == --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Sat Aug 2 14:29:33 2008 @@ -27,7 +27,7 @@ maven-deploy-plugin maven-plugin Maven Deploy Plugin - 2.4-SNAPSHOT + 2.4 2004 2.0 @@ -38,9 +38,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.4 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.4 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-deploy-plugin-2.4
svn commit: r682050 - in /maven/plugins/tags/maven-deploy-plugin-2.4: ./ pom.xml
Author: wsmoak Date: Sat Aug 2 14:29:36 2008 New Revision: 682050 URL: http://svn.apache.org/viewvc?rev=682050&view=rev Log: [maven-release-plugin] copy for tag maven-deploy-plugin-2.4 Added: maven/plugins/tags/maven-deploy-plugin-2.4/ - copied from r682048, maven/plugins/trunk/maven-deploy-plugin/ maven/plugins/tags/maven-deploy-plugin-2.4/pom.xml - copied unchanged from r682049, maven/plugins/trunk/maven-deploy-plugin/pom.xml
svn commit: r682052 - /maven/plugins/trunk/maven-deploy-plugin/pom.xml
Author: wsmoak Date: Sat Aug 2 14:29:39 2008 New Revision: 682052 URL: http://svn.apache.org/viewvc?rev=682052&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=682052&r1=682051&r2=682052&view=diff == --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Sat Aug 2 14:29:39 2008 @@ -27,7 +27,7 @@ maven-deploy-plugin maven-plugin Maven Deploy Plugin - 2.4 + 2.5-SNAPSHOT 2004 2.0 @@ -38,9 +38,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.4 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-deploy-plugin-2.4 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-deploy-plugin-2.4 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/
svn commit: r683507 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: wsmoak
Date: Wed Aug 6 22:10:41 2008
New Revision: 683507
URL: http://svn.apache.org/viewvc?rev=683507&view=rev
Log:
Deploy plugin released
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=683507&r1=683506&r2=683507&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed Aug 6 22:10:41 2008
@@ -56,7 +56,7 @@
*---+--++--+++
| {{{/plugins/maven-compiler-plugin/} <<>>}} | 2.0.2|
2007-02-13 | Compiles Java sources. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MCOMPILER}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-deploy-plugin/} <<>>}} | 2.3 |
2006-12-30 | Deploy the built artifact to the remote repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
+| {{{/plugins/maven-deploy-plugin/} <<>>}} | 2.4 |
2008-08-06 | Deploy the built artifact to the remote repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MDEPLOY}JIRA}}
*---+--++--+++
| {{{/plugins/maven-install-plugin/} <<>>}}| 2.2 |
2007-05-17 | Install the built artifact into the local repository. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-install-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MINSTALL}JIRA}}
*---+--++--+++
svn commit: r684157 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: wsmoak Date: Fri Aug 8 17:12:11 2008 New Revision: 684157 URL: http://svn.apache.org/viewvc?rev=684157&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=684157&r1=684156&r2=684157&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Fri Aug 8 17:12:11 2008 @@ -8,12 +8,12 @@ maven-war-plugin maven-plugin Maven War Plugin - 2.1-alpha-2 + 2.1-beta-1-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/
svn commit: r684155 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: wsmoak Date: Fri Aug 8 17:12:05 2008 New Revision: 684155 URL: http://svn.apache.org/viewvc?rev=684155&view=rev Log: [maven-release-plugin] prepare release maven-war-plugin-2.1-alpha-2 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=684155&r1=684154&r2=684155&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Fri Aug 8 17:12:05 2008 @@ -1,24 +1,4 @@ - - - - +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> maven-plugins org.apache.maven.plugins @@ -28,12 +8,12 @@ maven-war-plugin maven-plugin Maven War Plugin - 2.1-alpha-2-SNAPSHOT + 2.1-alpha-2 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 @@ -215,4 +195,4 @@ - + \ No newline at end of file
svn commit: r684156 - in /maven/plugins/tags/maven-war-plugin-2.1-alpha-2: ./ pom.xml
Author: wsmoak Date: Fri Aug 8 17:12:08 2008 New Revision: 684156 URL: http://svn.apache.org/viewvc?rev=684156&view=rev Log: [maven-release-plugin] copy for tag maven-war-plugin-2.1-alpha-2 Added: maven/plugins/tags/maven-war-plugin-2.1-alpha-2/ - copied from r684152, maven/plugins/trunk/maven-war-plugin/ maven/plugins/tags/maven-war-plugin-2.1-alpha-2/pom.xml - copied unchanged from r684155, maven/plugins/trunk/maven-war-plugin/pom.xml
svn commit: r684160 - /maven/plugins/tags/maven-war-plugin-2.1-alpha-2/
Author: wsmoak Date: Fri Aug 8 17:16:06 2008 New Revision: 684160 URL: http://svn.apache.org/viewvc?rev=684160&view=rev Log: Remove bad tag, release process removed license from pom Removed: maven/plugins/tags/maven-war-plugin-2.1-alpha-2/
svn commit: r684161 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: wsmoak Date: Fri Aug 8 17:17:30 2008 New Revision: 684161 URL: http://svn.apache.org/viewvc?rev=684161&view=rev Log: Back to 2.1-alpha-2-SNAPSHOT to try again. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=684161&r1=684160&r2=684161&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Fri Aug 8 17:17:30 2008 @@ -8,7 +8,7 @@ maven-war-plugin maven-plugin Maven War Plugin - 2.1-beta-1-SNAPSHOT + 2.1-alpha-2-SNAPSHOT scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ @@ -195,4 +195,4 @@ - \ No newline at end of file +
svn commit: r684162 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: wsmoak Date: Fri Aug 8 17:23:53 2008 New Revision: 684162 URL: http://svn.apache.org/viewvc?rev=684162&view=rev Log: Restore license and pom contents as of r684154 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=684162&r1=684161&r2=684162&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Fri Aug 8 17:23:53 2008 @@ -1,4 +1,24 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + + + maven-plugins org.apache.maven.plugins
svn commit: r684260 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: wsmoak Date: Sat Aug 9 06:25:44 2008 New Revision: 684260 URL: http://svn.apache.org/viewvc?rev=684260&view=rev Log: [maven-release-plugin] prepare release maven-war-plugin-2.1-alpha-2 Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=684260&r1=684259&r2=684260&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Aug 9 06:25:44 2008 @@ -28,12 +28,12 @@ maven-war-plugin maven-plugin Maven War Plugin - 2.1-alpha-2-SNAPSHOT + 2.1-alpha-2 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-alpha-2
svn commit: r684261 - in /maven/plugins/tags/maven-war-plugin-2.1-alpha-2: ./ pom.xml
Author: wsmoak Date: Sat Aug 9 06:25:49 2008 New Revision: 684261 URL: http://svn.apache.org/viewvc?rev=684261&view=rev Log: [maven-release-plugin] copy for tag maven-war-plugin-2.1-alpha-2 Added: maven/plugins/tags/maven-war-plugin-2.1-alpha-2/ - copied from r684255, maven/plugins/trunk/maven-war-plugin/ maven/plugins/tags/maven-war-plugin-2.1-alpha-2/pom.xml - copied unchanged from r684260, maven/plugins/trunk/maven-war-plugin/pom.xml
svn commit: r684262 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: wsmoak Date: Sat Aug 9 06:25:53 2008 New Revision: 684262 URL: http://svn.apache.org/viewvc?rev=684262&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=684262&r1=684261&r2=684262&view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Aug 9 06:25:53 2008 @@ -28,12 +28,12 @@ maven-war-plugin maven-plugin Maven War Plugin - 2.1-alpha-2 + 2.1-beta-1-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-war-plugin-2.1-alpha-2 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/
svn commit: r685940 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: wsmoak
Date: Thu Aug 14 08:21:41 2008
New Revision: 685940
URL: http://svn.apache.org/viewvc?rev=685940&view=rev
Log:
War plugin 2.1-alpha-2 released.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=685940&r1=685939&r2=685940&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Thu Aug 14 08:21:41 2008
@@ -78,7 +78,7 @@
*---+--++--+++
| {{{/plugins/maven-rar-plugin/} <<>>}}| 2.2 |
2007-02-28 | Build a RAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-rar-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MRAR}JIRA}}
*---+--++--+++
-| {{{/plugins/maven-war-plugin/} <<>>}}| 2.1-alpha-1 |
2007-10-19 | Build a WAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MWAR}JIRA}}
+| {{{/plugins/maven-war-plugin/} <<>>}}| 2.1-alpha-2 |
2008-08-14 | Build a WAR from the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-war-plugin}SVN}} |
{{{http://jira.codehaus.org/browse/MWAR}JIRA}}
*---+--++--+++
| {{{/plugins/maven-shade-plugin/} <<>>}}| 1.1 |
2008-05-27 | Build an Uber-JAR from the current project, including
dependencies. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MSHADE}JIRA}}
*---+--++--+++
svn commit: r686141 - /maven/sandbox/trunk/reports/maven-plugins-fixed.vm
Author: wsmoak
Date: Thu Aug 14 21:18:21 2008
New Revision: 686141
URL: http://svn.apache.org/viewvc?rev=686141&view=rev
Log:
Add a report showing which plugins have issues that are fixed but unreleased,
by descending vote count.
Added:
maven/sandbox/trunk/reports/maven-plugins-fixed.vm
- copied, changed from r686136,
maven/sandbox/trunk/reports/maven-plugins.vm
Copied: maven/sandbox/trunk/reports/maven-plugins-fixed.vm (from r686136,
maven/sandbox/trunk/reports/maven-plugins.vm)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/reports/maven-plugins-fixed.vm?p2=maven/sandbox/trunk/reports/maven-plugins-fixed.vm&p1=maven/sandbox/trunk/reports/maven-plugins.vm&r1=686136&r2=686141&rev=686141&view=diff
==
--- maven/sandbox/trunk/reports/maven-plugins.vm (original)
+++ maven/sandbox/trunk/reports/maven-plugins-fixed.vm Thu Aug 14 21:18:21 2008
@@ -1,9 +1,10 @@
#set( $jira =
$xmlrpc.connect("swizzletester:swizzle","http://jira.codehaus.org/rpc/xmlrpc";) )
#set( $projects = $jira.getProjects().matches("name", "Maven 2.*Plugin") )
+Plugins with issues that are fixed but unreleased, by descending vote count
#foreach( $project in $projects )
-#set( $url =
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&&pid=${project.id}&status=1&sorter/field=issuekey&sorter/order=DESC&tempMax=100&reset=true&decorator=none";
)
+#set( $url =
"http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&pid=${project.id}&fixfor=-2&status=5&status=6&sorter/field=issuekey&sorter/order=DESC&tempMax=100&reset=true&decorator=none";
)
#set( $jirarss = $rss.fetch( $url ) )
#set( $project.attributes.totalVotes = $jirarss.issues.sum("votes") )
## keep the issues in case you want them later
svn commit: r688437 - /maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml
Author: wsmoak Date: Sat Aug 23 18:59:10 2008 New Revision: 688437 URL: http://svn.apache.org/viewvc?rev=688437&view=rev Log: [ARCHETYPE-199] Remove Struts, Shale and MyFaces snapshots from the Archetype catalog. Modified: maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml Modified: maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml?rev=688437&r1=688436&r2=688437&view=diff == --- maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml (original) +++ maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml Sat Aug 23 18:59:10 2008 @@ -110,55 +110,6 @@ A simple Java web application - org.apache.struts - struts2-archetype-starter - 2.0.9-SNAPSHOT - http://people.apache.org/repo/m2-snapshot-repository - A starter Struts 2 application with Sitemesh, DWR, and Spring - - - org.apache.struts - struts2-archetype-blank - 2.0.9-SNAPSHOT - http://people.apache.org/repo/m2-snapshot-repository - A minimal Struts 2 application - - - org.apache.struts - struts2-archetype-portlet - 2.0.9-SNAPSHOT - http://people.apache.org/repo/m2-snapshot-repository - A minimal Struts 2 application that can be deployed as a portlet - - - org.apache.struts - struts2-archetype-dbportlet - 2.0.9-SNAPSHOT - http://people.apache.org/repo/m2-snapshot-repository - A starter Struts 2 portlet that demonstrates a simple CRUD interface with db backing - - - org.apache.struts - struts2-archetype-plugin - 2.0.9-SNAPSHOT - http://people.apache.org/repo/m2-snapshot-repository - A Struts 2 plugin - - - org.apache.shale - shale-archetype-blank - 1.0.3-SNAPSHOT - http://people.apache.org/repo/m2-snapshot-repository - A blank Shale web application with JSF - - - org.apache.myfaces.adfbuild - maven-adf-archetype - 1.0-SNAPSHOT - http://people.apache.org/repo/m2-snapshot-repository - Archetype to ease the burden of creating a new application based with ADF - - org.jini.maven-jini-plugin jini-service-archetype 2.0
svn commit: r488099 - /maven/site/trunk/src/site/xdoc/errors/404.xml
Author: wsmoak Date: Sun Dec 17 17:50:11 2006 New Revision: 488099 URL: http://svn.apache.org/viewvc?view=rev&rev=488099 Log: Update link locations, and don't discourage people from reporting broken links. Modified: maven/site/trunk/src/site/xdoc/errors/404.xml Modified: maven/site/trunk/src/site/xdoc/errors/404.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/errors/404.xml?view=diff&rev=488099&r1=488098&r2=488099 == --- maven/site/trunk/src/site/xdoc/errors/404.xml (original) +++ maven/site/trunk/src/site/xdoc/errors/404.xml Sun Dec 17 17:50:11 2006 @@ -28,17 +28,13 @@ The page has moved, was outdated, or has not been created yet You typed the address incorrectly - You following a link from another site that pointed to this page. + You followed a link from another site that pointed to this page. We have recently reorganised our site, so please try looking in the navigation on the left for the item - you are looking for on Maven 1.x or the Maven project. For information about Maven 2.0 or Continuum, please - visit their sub sites, available from the links in the top right of the page. - - - - There is no need to report this broken link to the Maven team, as errors are periodically monitored and repaired. + you are looking for on Maven or the Maven project. For information about Maven 1, Continuum, or Archiva, please + visit their sub sites, available from the links in the bottom left of the page.
svn commit: r500910 - /maven/release/trunk/maven-release-plugin/pom.xml
Author: wsmoak Date: Sun Jan 28 15:10:40 2007 New Revision: 500910 URL: http://svn.apache.org/viewvc?view=rev&rev=500910 Log: Publish the release plugin site under /plugins with the others. Modified: maven/release/trunk/maven-release-plugin/pom.xml Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?view=diff&rev=500910&r1=500909&r2=500910 == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Sun Jan 28 15:10:40 2007 @@ -79,4 +79,10 @@ + + + apache.website + scp://people.apache.org/www/maven.apache.org/plugins/maven-release-plugin + +
svn commit: r500926 - /maven/release/trunk/maven-release-plugin/src/site/apt/index.apt
Author: wsmoak Date: Sun Jan 28 18:45:49 2007 New Revision: 500926 URL: http://svn.apache.org/viewvc?view=rev&rev=500926 Log: Fix formatting, title/author/date should be indented. Modified: maven/release/trunk/maven-release-plugin/src/site/apt/index.apt Modified: maven/release/trunk/maven-release-plugin/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/index.apt?view=diff&rev=500926&r1=500925&r2=500926 == --- maven/release/trunk/maven-release-plugin/src/site/apt/index.apt (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/index.apt Sun Jan 28 18:45:49 2007 @@ -1,11 +1,11 @@ --- -Introduction --- -Carlos Sanchez <[EMAIL PROTECTED]> -Brett Porter <[EMAIL PROTECTED]> -John Tolentino <[EMAIL PROTECTED]> --- -September 18, 2006 + -- + Introduction + -- + Carlos Sanchez <[EMAIL PROTECTED]> + Brett Porter <[EMAIL PROTECTED]> + John Tolentino <[EMAIL PROTECTED]> + -- + September 18, 2006 ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file
svn commit: r501300 - /maven/pom/trunk/maven/pom.xml
Author: wsmoak Date: Mon Jan 29 19:06:55 2007 New Revision: 501300 URL: http://svn.apache.org/viewvc?view=rev&rev=501300 Log: Added myself as a developer. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?view=diff&rev=501300&r1=501299&r2=501300 == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Jan 29 19:06:55 2007 @@ -268,7 +268,16 @@ -6 - + + wsmoak + Wendy Smoak + [EMAIL PROTECTED] + +Committer + + -7 + +
svn commit: r507415 - /maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
Author: wsmoak
Date: Tue Feb 13 22:40:33 2007
New Revision: 507415
URL: http://svn.apache.org/viewvc?view=rev&rev=507415
Log:
Add a method to verify the new User Roles page (for CONTINUUM-1166).
Modified:
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
Modified:
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java?view=diff&rev=507415&r1=507414&r2=507415
==
---
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
(original)
+++
maven/shared/trunk/maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java
Tue Feb 13 22:40:33 2007
@@ -522,6 +522,14 @@
assertTextPresent( "Confirm Password" );
}
+public void assertUserRolesPage()
+{
+assertPage( "[Admin] User Edit" );
+assertTextPresent( "[Admin] User Roles" );
+assertTextPresent( "Assigned Roles" );
+assertTextPresent( "Available Roles" );
+}
+
public void assertDeleteUserPage( String username )
{
assertPage( "[Admin] User Delete" );
svn commit: r514184 - /maven/sandbox/trunk/archetype/
Author: wsmoak Date: Sat Mar 3 08:39:09 2007 New Revision: 514184 URL: http://svn.apache.org/viewvc?view=rev&rev=514184 Log: Added 'archetype' to sandbox. Added: maven/sandbox/trunk/archetype/
svn commit: r514186 - /maven/sandbox/trunk/archetype/maven-archetype-quickstart/
Author: wsmoak Date: Sat Mar 3 08:42:29 2007 New Revision: 514186 URL: http://svn.apache.org/viewvc?view=rev&rev=514186 Log: Copied the quickstart archetype to the sandbox to demonstrate problems with package name interpolation for non-Java resources. Added: maven/sandbox/trunk/archetype/maven-archetype-quickstart/ - copied from r514185, maven/archetype/trunk/maven-archetype-bundles/maven-archetype-quickstart/
svn commit: r514202 - in /maven/sandbox/trunk/archetype/maven-archetype-quickstart: ./ src/main/resources/META-INF/ src/main/resources/archetype-resources/src/main/java/ src/main/resources/archetype-r
Author: wsmoak Date: Sat Mar 3 09:35:43 2007 New Revision: 514202 URL: http://svn.apache.org/viewvc?view=rev&rev=514202 Log: Demonstrating problems with package name interpolation for non-Java resources. Added: maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt (with props) maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/overview.html (with props) maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/package.html (with props) maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/resources/ maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/resources/App.properties (with props) Modified: maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml Added: maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt?view=auto&rev=514202 == --- maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt (added) +++ maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt Sat Mar 3 09:35:43 2007 @@ -0,0 +1,84 @@ + +Sandbox :: Maven Quickstart Archetype += + +Problem: package name interpolation is not possible for non-Java resources + +In fixing this problem, we should retain the ability to *not* package +non-Java resources. + +Observations: + + * elements in the archetype descriptor are placed relative to + src/main/resources, not src/main/resources/[package] + + * In prior versions of the archetype plugin, it was possible to list non-Java + resources under and have them "packaged". For example: + src/main/resources/App.properties + + * Some non-Java files in src/main/java are simply ignored. Javadoc related + files such as package.html belong with the source code so that (by default) + they are not included in the jar. + +Demonstration: + + This module contains the quickstart archetype with the following changes: + + * Added package.html and overview.html for Javadocs. + * Added App.properties file + * Modified archetype.xml to include the new files + + To try this example: + + $ cd /path/to/maven/archetype + $ mvn install + + $ cd /path/to/maven/sandbox/archetype/maven-archetype-quickstart + $ mvn install + + $ cd /path/to/temp + $ mvn archetype:create -DgroupId=com.example -DartifactId=myproject + -DarchetypeVersion=1.1-SNAPSHOT + -DarchetypeGroupId=org.apache.maven.archetypes + + (You may not need archetypeGroupId, I get an error without it.) + + Result: + +With the following in archetype.xml: + + +src/main/java/App.java +src/main/java/package.html +src/main/resources/App.properties + + +I get: + +[ERROR] BUILD ERROR +[INFO] - +[INFO] Error creating from archetype + +Embedded error: Error merging velocity templates +Unable to find resource 'archetype-resources/src/main/java/package.html' + +If I comment out the line for package.html and rebuild the archetype, the error +changes to: + +[ERROR] BUILD ERROR +[INFO] +[INFO] Error creating from archetype + +Embedded error: Template 'src/main/resources/App.properties' not in directory 's +rc/main/java' + +The only option is to move package.html and App.properties to the +section, but then they will not be placed into the proper package structure. + +I have also listed the overview.html file in archetype.xml: + + +src/main/java/overview.html + + +This works, and places the overview.html file directly in src/main/java. Propchange: maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt -- svn:eol-style = native Propchange: maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt -- svn:keywords = Date Author Id Revision HeadURL Modified: maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml?view=diff&rev=514202&r1=514201&r2=514202 == --- maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml (original) +++ maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/ME
svn commit: r514209 - /maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt
Author: wsmoak Date: Sat Mar 3 10:04:14 2007 New Revision: 514209 URL: http://svn.apache.org/viewvc?view=rev&rev=514209 Log: Added some related links. Modified: maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt Modified: maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt?view=diff&rev=514209&r1=514208&r2=514209 == --- maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt (original) +++ maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt Sat Mar 3 10:04:14 2007 @@ -82,3 +82,15 @@ This works, and places the overview.html file directly in src/main/java. + +* Related Links + + Allow Non-Java Resources in sources/testSources to be included in an archetype + http://jira.codehaus.org/browse/ARCHETYPE-62 + + Archetype: create resources as companions to java source files + http://www.mail-archive.com/users@maven.apache.org/msg62117.html + + Wrong groupId for the archetypes? + http://www.mail-archive.com/dev@maven.apache.org/msg63136.html +
svn commit: r514338 - in /maven/sandbox/trunk/archetype/maven-archetype-quickstart: README.txt src/main/resources/META-INF/archetype.xml
Author: wsmoak
Date: Sat Mar 3 18:35:28 2007
New Revision: 514338
URL: http://svn.apache.org/viewvc?view=rev&rev=514338
Log:
Update with information on package.html and packaging non-Java resources.
Modified:
maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt
maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml
Modified: maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt?view=diff&rev=514338&r1=514337&r2=514338
==
--- maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt
(original)
+++ maven/sandbox/trunk/archetype/maven-archetype-quickstart/README.txt Sat Mar
3 18:35:28 2007
@@ -10,11 +10,14 @@
Observations:
* elements in the archetype descriptor are placed relative to
- src/main/resources, not src/main/resources/[package]
+ src/main/resources, not src/main/resources/[package].
+ This is the desired behavior and should not be changed.
* In prior versions of the archetype plugin, it was possible to list non-Java
resources under and have them "packaged". For example:
- src/main/resources/App.properties
+ src/main/resources/App.properties and
+ "mvn archetype:create ... -DgroupId=com.example" would result in
+ src/main/resources/com/example/App.properties
* Some non-Java files in src/main/java are simply ignored. Javadoc related
files such as package.html belong with the source code so that (by default)
@@ -83,7 +86,27 @@
This works, and places the overview.html file directly in src/main/java.
+* Research
+
+ http://jira.codehaus.org/browse/ARCHETYPE-62
+ The package.html file is being excluded by maven-jar-plugin.
+
http://maven.apache.org/plugins/maven-jar-plugin/xref/org/apache/maven/plugin/jar/AbstractJarMojo.html
+ 39 private static final String[] DEFAULT_EXCLUDES = new
String[]{"**/package.html"};
+ ...
+ 152 archiver.getArchiver().addDirectory( contentDirectory, DEFAULT_INCLUDES,
DEFAULT_EXCLUDES );
+ It does not appear to be configurable.
+
+ Re: the inability to arrange non-Java resources in a package structure,
+ r390971 20060403 brett added the 'Template X not in directory Y' exception
+ DefaultArchetype.java:867
+
+ DefaultArchetype.java:803 has 'false' to indicate no packaging for resources
+ (This is correct, otherwise src/main/resources/META-INF would not work.)
+
* Related Links
+
+ Restore the ability to "package" non-Java resources
+ http://jira.codehaus.org/browse/ARCHETYPE-65
Allow Non-Java Resources in sources/testSources to be included in an archetype
http://jira.codehaus.org/browse/ARCHETYPE-62
Modified:
maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml?view=diff&rev=514338&r1=514337&r2=514338
==
---
maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml
(original)
+++
maven/sandbox/trunk/archetype/maven-archetype-quickstart/src/main/resources/META-INF/archetype.xml
Sat Mar 3 18:35:28 2007
@@ -2,8 +2,13 @@
quickstart
src/main/java/App.java
-src/main/java/package.html
+
+
+
+
+
src/main/resources/App.properties
+
src/main/java/overview.html
svn commit: r514674 - /maven/site/trunk/src/site/apt/release-notes.apt
Author: wsmoak
Date: Mon Mar 5 06:20:43 2007
New Revision: 514674
URL: http://svn.apache.org/viewvc?view=rev&rev=514674
Log:
Add the list of issues for Maven 2.0.5 to the release notes instead of linking
to JIRA.
Modified:
maven/site/trunk/src/site/apt/release-notes.apt
Modified: maven/site/trunk/src/site/apt/release-notes.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/release-notes.apt?view=diff&rev=514674&r1=514673&r2=514674
==
--- maven/site/trunk/src/site/apt/release-notes.apt (original)
+++ maven/site/trunk/src/site/apt/release-notes.apt Mon Mar 5 06:20:43 2007
@@ -31,8 +31,6 @@
* 2.0.5 Release Notes
- Changes in this release:
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10500&styleName=Html&version=12294}
Issue Tracker Release Notes}}
-
** Changes that may affect existing builds
* {{{http://jira.codehaus.org/browse/MNG-2794} MNG-2794}} - Maven now
behaves in a defined way when matching the nearest dependency when two
@@ -44,7 +42,218 @@
global classloader, allowing them to be used more widely for extensions
to Maven's core. This may affect builds that used them to expose extra
classes to various plugins. While in most scenarios these builds will
continue to work, in these situations the <<<\>>> element of
<<<\>>> should be used instead.
-
+
+** Bug
+
+* [MNG-967] - maven.mdo, settings.mdo, and generated-sources
+
+* [MNG-1181] - MavenEmbedder.execute() doesn't run reactor modules
+
+* [MNG-1245] - Reactor projects sometimes used even with version mismatch
+
+* [MNG-1281] - Most of the links off the m2 ant task documentation page
are broken
+
+* [MNG-1290] - What is a Mojo?
+
+* [MNG-1379] - Wrong path for artifacts with system scope
+
+* [MNG-1458] - error/warning handling in embedder
+
+* [MNG-1545] - some execution output not routed through default routes.
+
+* [MNG-1562] - Exception with dependencies that have and implied
from parents
+
+* [MNG-1593] - Typo in settings doc
+
+* [MNG-1645] - document clean and site lifecycles in the build lifecycle
doc
+
+* [MNG-1697] - NPE in addEdgeWithParentCheck
+
+* [MNG-1797] - Dependency excludes apply to every subsequent dependency,
not just the one it is declared under.
+
+* [MNG-1891] - plugin execution in a profile
+
+* [MNG-1955] - null pointer exception in profile if pluginManagement
section exists in pom
+
+* [MNG-2056] - Exception when starting new page with
AbstractMavenMultiPageReport
+
+* [MNG-2088] - antcall failed
+
+* [MNG-2106] - Add dependency-maven-plugin to plugins list (patch attached)
+
+* [MNG-2164] - Generated plugin documentation lists wrong data type
+
+* [MNG-2177] - moved mojo plugins are missing web pages at
http://maven.apache.org/plugins
+
+* [MNG-2201] - Interpolation problem when using surefire
+
+* [MNG-2214] - ITs fail when bootstrapping M2 SVN trunk with
java.lang.StringIndexOutOfBoundsException: String index out of range: 1
+
+* [MNG-2221] - Multiple Executions of Plugin at Difference Inhertiance
levels causes plugin executions to run multiple times
+
+* [MNG-2228] - Classloader problem loading jars from build extensions
+
+* [MNG-2230] - The "How do I create documentation?" part of the "Maven
Gettting Started Guide" features an invalid example
+
+* [MNG-2236] - DefaultMavenProjectBuilder.buildStandaloneSuperProject()
should include a ProfileManager that includes active profiles from settings.xml
+
+* [MNG-2244] - Plugin xdoc generator outputs xdoc with unix file endings
+
+* [MNG-2256] - Misleading documentation regarding configuration of
java.utils.Properties
+
+* [MNG-2261] - Profiles ignored when working with non-projects (such as
archetype:create)
+
+* [MNG-2282] - If a repo is down, maven stops the buid instead of trying
other repos
+
+* [MNG-2284] - Cannot specify additional classpath entries in manifest
when using addClasspath
+
+* [MNG-2291] - svn ignore command incorrect
+
+* [MNG-2299] - org.apache.maven.it.Verifier.loadProperties(..) does not
close FileInputStream (relies upon finalizer being called)
+
+* [MNG-2302] - SCM path calculations don't work when parent and
grandparent are in sibling directories
+
+* [MNG-2303] - ActiveProjectArtifact.getFile(..) and .setFile(..) result
in StackOverflowException, since they are effectively recursive
+
+* [MNG-2309] - Profile activation order is random
+
+* [MNG-2312] - The mvn script doesn't work on Solaris
+
+* [MNG-2314] - not inherited more than one level
+
+* [MNG-2341] - Shell script mvn too old
+
+* [MNG-2407] - New user docs: proxy configuration is not clear to new users
+
+* [MNG-2408] - Improve handling of "
svn commit: r516290 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
Author: wsmoak
Date: Thu Mar 8 20:18:18 2007
New Revision: 516290
URL: http://svn.apache.org/viewvc?view=rev&rev=516290
Log:
Add an example of using a property to avoid hard-coding a filesystem path.
Link to 'customizing a manifest' in the jar plugin docs.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt?view=diff&rev=516290&r1=516289&r2=516290
==
---
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
Thu Mar 8 20:18:18 2007
@@ -51,4 +51,38 @@
[...]
-+---
\ No newline at end of file
++---
+
+ To avoid hard-coding a filesystem path for the executable, you can use a
+ property. For example:
+
++---
+ ${jdk14.executable}
++---
+
+ Each developer then defines this property in
+
{{{http://maven.apache.org/ref/current/maven-settings/settings.html}settings.xml}},
+ so that the build remains portable.
+
++---
+
+ [...]
+
+[...]
+
+ compiler
+
+ C:\Program
Files\Java\j2sdk1.4.2_09\bin\javac.exe
+
+
+
+ [...]
+
+compiler
+
+
++---
+
+ If you build with a different JDK, you may want to
+
{{{http://maven.apache.org/plugins/maven-jar-plugin/examples/manifest-customization.html}
+ customize}} the jar file manifest.
svn commit: r516302 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
Author: wsmoak
Date: Thu Mar 8 21:00:34 2007
New Revision: 516302
URL: http://svn.apache.org/viewvc?view=rev&rev=516302
Log:
Modify the example to use a property for the java home directory, as seen in
Surefire.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt?view=diff&rev=516302&r1=516301&r2=516302
==
---
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
Thu Mar 8 21:00:34 2007
@@ -57,12 +57,12 @@
property. For example:
+---
- ${jdk14.executable}
+ ${JAVA_1_4_HOME}/bin/javac
+---
Each developer then defines this property in
{{{http://maven.apache.org/ref/current/maven-settings/settings.html}settings.xml}},
- so that the build remains portable.
+ or sets an environment variable, so that the build remains portable.
+---
@@ -72,7 +72,7 @@
compiler
- C:\Program
Files\Java\j2sdk1.4.2_09\bin\javac.exe
+ C:\Program Files\Java\j2sdk1.4.2_09
svn commit: r516939 - /maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt
Author: wsmoak Date: Sun Mar 11 08:51:32 2007 New Revision: 516939 URL: http://svn.apache.org/viewvc?view=rev&rev=516939 Log: [MNG-2867] Fix version number in Maven 2.0 build instructions Submitted by: Thomas LECAVELIER Modified: maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt Modified: maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt?view=diff&rev=516939&r1=516938&r2=516939 == --- maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt (original) +++ maven/site/trunk/src/site/apt/guides/development/guide-building-m2.apt Sun Mar 11 08:51:32 2007 @@ -103,14 +103,14 @@ release, so set the <<>> environment variable accordingly, e.g.: -export M2_HOME=/usr/local/maven-2.0.5-SNAPSHOT +export M2_HOME=/usr/local/maven-2.0.6-SNAPSHOT PATH=$M2_HOME/bin:$PATH or -set M2_HOME=c:\maven-2.0.5-SNAPSHOT +set M2_HOME=c:\maven-2.0.6-SNAPSHOT set PATH=%M2_HOME%\bin;%PATH% @@ -246,4 +246,5 @@ Default target: all ++ +
svn commit: r517025 - /maven/plugins/trunk/pom.xml
Author: wsmoak Date: Sun Mar 11 14:51:15 2007 New Revision: 517025 URL: http://svn.apache.org/viewvc?view=rev&rev=517025 Log: Removed maven-jxr-plugin which was moved to maven/jxr/trunk in r516931 Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?view=diff&rev=517025&r1=517024&r2=517025 == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Sun Mar 11 14:51:15 2007 @@ -92,7 +92,6 @@ maven-install-plugin maven-jar-plugin maven-javadoc-plugin -maven-jxr-plugin maven-one-plugin maven-plugin-plugin maven-pmd-plugin
svn commit: r517256 - /maven/site/trunk/src/site/apt/download.apt
Author: wsmoak
Date: Mon Mar 12 08:33:44 2007
New Revision: 517256
URL: http://svn.apache.org/viewvc?view=rev&rev=517256
Log:
Fix links to Maven 2.0.5 downloads.
Modified:
maven/site/trunk/src/site/apt/download.apt
Modified: maven/site/trunk/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/download.apt?view=diff&rev=517256&r1=517255&r2=517256
==
--- maven/site/trunk/src/site/apt/download.apt (original)
+++ maven/site/trunk/src/site/apt/download.apt Mon Mar 12 08:33:44 2007
@@ -16,16 +16,16 @@
Maven 2.0.5 is distributed under the
{{{http://maven.apache.org/license.html} Apache License, version 2.0}}.
- We <> encorage our users to configure a Maven repository mirror
closer to their location, please read
{{{guides/mini/guide-mirror-settings.html} How to Use Mirrors for
Repositories}}.
+ We <> encourage our users to configure a Maven repository mirror
closer to their location, please read
{{{guides/mini/guide-mirror-settings.html} How to Use Mirrors for
Repositories}}.
*-+-+--+---+
| | Mirrors | Checksum | Signature |
*-+-+--+---+
-| Maven 2.0.5 (tar.bz2) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-${project.version}-bin.tar.bz2}
maven-${project.version}-bin.tar.bz2}} |
{{{http://www.apache.org/dist/maven/binaries/maven-${project.version}-bin.tar.bz2.md5}
maven-${project.version}-bin.tar.bz2.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-${project.version}-bin.tar.bz2.asc}
maven-${project.version}-bin.tar.bz2.asc}} |
+| Maven 2.0.5 (tar.bz2) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-2.0.5-bin.tar.bz2}
maven-2.0.5-bin.tar.bz2}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.5-bin.tar.bz2.md5}
maven-2.0.5-bin.tar.bz2.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.5-bin.tar.bz2.asc}
maven-2.0.5-bin.tar.bz2.asc}} |
*-+-+--+---+
-| Maven 2.0.5 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-${project.version}-bin.tar.gz}
maven-${project.version}-bin.tar.gz}} |
{{{http://www.apache.org/dist/maven/binaries/maven-${project.version}-bin.tar.gz.md5}
maven-${project.version}-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-${project.version}-bin.tar.gz.asc}
maven-${project.version}-bin.tar.gz.asc}} |
+| Maven 2.0.5 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-2.0.5-bin.tar.gz}
maven-2.0.5-bin.tar.gz}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.5-bin.tar.gz.md5}
maven-2.0.5-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.5-bin.tar.gz.asc}
maven-2.0.5-bin.tar.gz.asc}} |
*-+-+--+---+
-| Maven 2.0.5 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-${project.version}-bin.zip}
maven-${project.version}-bin.zip}} |
{{{http://www.apache.org/dist/maven/binaries/maven-${project.version}-bin.zip.md5}
maven-${project.version}-bin.zip.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-${project.version}-bin.zip.asc}
maven-${project.version}-bin.zip.asc}} |
+| Maven 2.0.5 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/maven/binaries/maven-2.0.5-bin.zip}
maven-2.0.5-bin.zip}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.5-bin.zip.md5}
maven-2.0.5-bin.zip.md5}} |
{{{http://www.apache.org/dist/maven/binaries/maven-2.0.5-bin.zip.asc}
maven-2.0.5-bin.zip.asc}} |
*-+-+--+---+
*Previous Releases
@@ -48,7 +48,7 @@
** Windows 2000/XP
- [[1]] Unzip <<>> to the directory you wish to install
Maven ${project.version}. These instructions
+ [[1]] Unzip <<>> to the directory you wish to install
Maven 2.0.5. These instructions
assume you chose <<>>
[[2]] Add the <<>> directory to your path, by opening up the system
properties (WinKey + Pause),
@@ -64,7 +64,7 @@
** Unix-based Operating Systems (Linux, Solaris and Mac OS X)
[[1]] Extract the distribution archive to the directory you wish to install
Maven 2.0.5. These instructions
-assume you chose <<>>. The directory
<<>> will be created from
+assume you chose <<>>. The directory
<<>> will be created from
the archive.
[[2]] Add the <<>> directory to your path, eg. <<
svn commit: r520740 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: main/java/org/apache/maven/report/projectinfo/ScmReport.java site/apt/examples/scm-report.apt site/apt/index.apt si
Author: wsmoak
Date: Tue Mar 20 21:14:37 2007
New Revision: 520740
URL: http://svn.apache.org/viewvc?view=rev&rev=520740
Log:
[MPIR-63] Allow configuration of scm anonymous connection, developer connection
and web access url for the SCM Report.
Added:
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/scm-report.apt
(with props)
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/site.xml
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?view=diff&rev=520740&r1=520739&r2=520740
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Tue Mar 20 21:14:37 2007
@@ -61,6 +61,30 @@
private String checkoutDirectoryName;
/**
+ * The scm anonymous connection url.
+ *
+ * @parameter default-value="${project.scm.connection}"
+ * @since 2.1
+ */
+private String anonymousConnection;
+
+/**
+ * The scm developer connection url.
+ *
+ * @parameter default-value="${project.scm.developerConnection}"
+ * @since 2.1
+ */
+private String developerConnection;
+
+/**
+ * The scm web access url.
+ *
+ * @parameter default-value="${project.scm.url}"
+ * @since 2.1
+ */
+private String webAccessUrl;
+
+/**
* @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
*/
public String getName( Locale locale )
@@ -82,7 +106,8 @@
public void executeReport( Locale locale )
{
ScmRenderer r =
-new ScmRenderer( scmManager, getSink(), getProject().getModel(),
i18n, locale, checkoutDirectoryName );
+new ScmRenderer( scmManager, getSink(), getProject().getModel(),
i18n, locale, checkoutDirectoryName,
+webAccessUrl, anonymousConnection, developerConnection );
r.render();
}
@@ -115,7 +140,10 @@
private String checkoutDirectoryName;
-ScmRenderer( ScmManager scmManager, Sink sink, Model model, I18N i18n,
Locale locale, String checkoutDirName )
+private String webAccessUrl;
+
+ScmRenderer( ScmManager scmManager, Sink sink, Model model, I18N i18n,
Locale locale, String checkoutDirName,
+ String webAccessUrl, String anonymousConnection, String
devConnection )
{
super( sink );
@@ -128,6 +156,13 @@
this.locale = locale;
this.checkoutDirectoryName = checkoutDirName;
+
+this.webAccessUrl = webAccessUrl;
+
+this.anonymousConnection = anonymousConnection;
+
+this.devConnection = devConnection;
+
}
/**
@@ -155,9 +190,6 @@
return;
}
-anonymousConnection = scm.getConnection();
-devConnection = scm.getDeveloperConnection();
-
if ( StringUtils.isEmpty( anonymousConnection ) &&
StringUtils.isEmpty( devConnection ) &&
StringUtils.isEmpty( scm.getUrl() ) )
{
@@ -177,7 +209,7 @@
renderOverViewSection( anonymousRepository );
// Web access section
-renderWebAccesSection( scm.getUrl() );
+renderWebAccesSection( webAccessUrl );
// Anonymous access section if needed
renderAnonymousAccessSection( anonymousRepository );
Added:
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/scm-report.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/scm-report.apt?view=auto&rev=520740
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/scm-report.apt
(added)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/scm-report.apt
Tue Mar 20 21:14:37 2007
@@ -0,0 +1,47 @@
+ --
+ Maven 2 Project Info Report Plugin - SCM Report
+ --
+ The Maven Team
+ --
+ 12 March 2007
+
+SCM Report
+
+ By default, the SCM Report uses the information configured (or inherited)
+ in the <<<>>> element of <<>>. To override these values,
+ you can configure t
svn commit: r522035 - /maven/trunks/
Author: wsmoak Date: Sat Mar 24 07:21:40 2007 New Revision: 522035 URL: http://svn.apache.org/viewvc?view=rev&rev=522035 Log: Added ant-tasks to trunks external. Modified: maven/trunks/ (props changed) Propchange: maven/trunks/ -- --- svn:externals (original) +++ svn:externals Sat Mar 24 07:21:40 2007 @@ -16,6 +16,6 @@ pomhttps://svn.apache.org/repos/asf/maven/pom/trunk resources https://svn.apache.org/repos/asf/maven/resources/trunk release https://svn.apache.org/repos/asf/maven/release/trunk - +ant-tasks https://svn.apache.org/repos/asf/maven/ant-tasks/trunk sandbox https://svn.apache.org/repos/asf/maven/sandbox/trunk
