svn commit: r1229051 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: olamy
Date: Mon Jan 9 08:09:36 2012
New Revision: 1229051
URL: http://svn.apache.org/viewvc?rev=1229051view=rev
Log:
update version for archetype 2.2
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=1229051r1=1229050r2=1229051view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Mon Jan 9 08:09:36 2012
@@ -130,7 +130,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-antrun-plugin/} antrun}} | B |
1.7 | 2011-11-01 | 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}}
*--++--++--+++
-| {{{/archetype/maven-archetype-plugin/} archetype}} | B |
2.1 | 2011-09-04 | 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}}
+| {{{/archetype/maven-archetype-plugin/} archetype}} | B |
2.2 | 2011-11-19 | 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/} assembly}} | B |
2.2.2| 2011-12-02 | 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: r1229351 - /maven/site/trunk/src/site/apt/pom/index.apt
Author: hboutemy
Date: Mon Jan 9 21:07:28 2012
New Revision: 1229351
URL: http://svn.apache.org/viewvc?rev=1229351view=rev
Log:
added Maven Skins parent POM to parent POMs list
Modified:
maven/site/trunk/src/site/apt/pom/index.apt
Modified: maven/site/trunk/src/site/apt/pom/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom/index.apt?rev=1229351r1=1229350r2=1229351view=diff
==
--- maven/site/trunk/src/site/apt/pom/index.apt (original)
+++ maven/site/trunk/src/site/apt/pom/index.apt Mon Jan 9 21:07:28 2012
@@ -3,7 +3,7 @@
-
Hervé Boutemy
-
- 2011-08-19
+ 2012-01-09
-
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -37,7 +37,9 @@ Parent POMs
*--+--++--+++
| {{{./maven/} Maven}} | 21 | 2011-08-19 |
Maven wide configuration.|
{{{http://svn.apache.org/repos/asf/maven/pom/trunk/maven/}SVN}} |
{{{https://issues.apache.org/jira/browse/MPOM/component/12314371}JIRA}}
*--+--++--+++
-| {{{./maven-plugins/} Maven plugins}} | 22 | 2011-08-19 |
Maven plugins configuration. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins/}SVN}} |
{{{https://issues.apache.org/jira/browse/MPOM/component/12314501}JIRA}}
+| {{{./maven-plugins/} Maven Plugins}} | 22 | 2011-08-19 |
Maven plugins configuration. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins/}SVN}} |
{{{https://issues.apache.org/jira/browse/MPOM/component/12314501}JIRA}}
*--+--++--+++
| {{{./maven-shared-components/} Maven Shared Components}} | 17 |
2011-08-19 | Maven shared components. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-components/}SVN}}
| {{{https://issues.apache.org/jira/browse/MPOM/component/12314801}JIRA}}
*--+--++--+++
+| {{{./skins/} Skins}} | 5| 2010-03-14 |
Skins configuration. |
{{{http://svn.apache.org/repos/asf/maven/skins/trunk/maven-skins/}SVN}} |
{{{https://issues.apache.org/jira/browse/MPOM/component/12317104}JIRA}}
+*--+--++--+++
svn commit: r1229355 - /maven/skins/trunk/maven-skins/
Author: hboutemy Date: Mon Jan 9 21:13:30 2012 New Revision: 1229355 URL: http://svn.apache.org/viewvc?rev=1229355view=rev Log: added IDE files to svn:ignore Modified: maven/skins/trunk/maven-skins/ (props changed) Propchange: maven/skins/trunk/maven-skins/ -- --- svn:ignore (original) +++ svn:ignore Mon Jan 9 21:13:30 2012 @@ -1,2 +1,5 @@ target *.iml +.classpath +.project +.settings
svn commit: r1229361 - in /maven/skins/trunk/maven-skins: site-pom.xml src/ src/site-docs/ src/site-docs/apt/ src/site-docs/apt/index.apt src/site-docs/site.xml
Author: hboutemy
Date: Mon Jan 9 21:27:34 2012
New Revision: 1229361
URL: http://svn.apache.org/viewvc?rev=1229361view=rev
Log:
added parent pom documentation
Added:
maven/skins/trunk/maven-skins/site-pom.xml (with props)
maven/skins/trunk/maven-skins/src/
maven/skins/trunk/maven-skins/src/site-docs/
maven/skins/trunk/maven-skins/src/site-docs/apt/
maven/skins/trunk/maven-skins/src/site-docs/apt/index.apt (with props)
maven/skins/trunk/maven-skins/src/site-docs/site.xml (with props)
Added: maven/skins/trunk/maven-skins/site-pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/site-pom.xml?rev=1229361view=auto
==
--- maven/skins/trunk/maven-skins/site-pom.xml (added)
+++ maven/skins/trunk/maven-skins/site-pom.xml Mon Jan 9 21:27:34 2012
@@ -0,0 +1,70 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+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.
+--
+
+project 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/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.maven.skins/groupId
+artifactIdmaven-skins/artifactId
+version5/version
+relativePath./pom.xml/relativePath
+ /parent
+
+ artifactIdmaven-skins./artifactId
+ packagingpom/packaging
+
+ nameApache Maven Skins Parent POM/name
+ descriptionThis project consists of a POM that contains settings that are
likely to be useful to any Maven Skin that is building and releasing code with
Maven 2/3./description
+ urlhttp://maven.apache.org/pom/skins//url
+
+ scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-skins//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-skins//developerConnection
+urlhttp://svn.apache.org/viewvc/maven/skins/trunk/maven-skins//url
+ /scm
+ issueManagement
+systemjira/system
+urlhttp://issues.apache.org/jira/browse/MPOM/component/12317104/url
+ /issueManagement
+ ciManagement
+systemJenkins/system
+urlhttps://builds.apache.org//view/M-R/view/Maven/job/maven-skins//url
+ /ciManagement
+ distributionManagement
+site
+ idapache.website/id
+ urlscp://people.apache.org/www/maven.apache.org/pom/skins//url
+/site
+ /distributionManagement
+
+ build
+plugins
+ plugin
+artifactIdmaven-site-plugin/artifactId
+configuration
+ siteDirectory${basedir}/src/site-docs/siteDirectory
+
stagingSiteURLscp://people.apache.org/www/maven.apache.org/pom/skins-${project.version}//stagingSiteURL
+/configuration
+ /plugin
+/plugins
+ /build
+/project
\ No newline at end of file
Propchange: maven/skins/trunk/maven-skins/site-pom.xml
--
svn:eol-style = native
Propchange: maven/skins/trunk/maven-skins/site-pom.xml
--
svn:keywords = Author Date Id Revision
Propchange: maven/skins/trunk/maven-skins/site-pom.xml
--
svn:mime-type = text/plain
Added: maven/skins/trunk/maven-skins/src/site-docs/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/src/site-docs/apt/index.apt?rev=1229361view=auto
==
--- maven/skins/trunk/maven-skins/src/site-docs/apt/index.apt (added)
+++ maven/skins/trunk/maven-skins/src/site-docs/apt/index.apt Mon Jan 9
21:27:34 2012
@@ -0,0 +1,42 @@
+ -
+ Maven Skins Parent POM
+ -
+ Hervé Boutemy
+ -
+ 2012-01-09
+ -
+
+~~ 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.
svn commit: r1229362 - /maven/site/trunk/src/site/apt/developers/committer-environment.apt
Author: baerrach
Date: Mon Jan 9 21:28:35 2012
New Revision: 1229362
URL: http://svn.apache.org/viewvc?rev=1229362view=rev
Log:
Upgraded to use IdentityFile and placeholder apache username
Modified:
maven/site/trunk/src/site/apt/developers/committer-environment.apt
Modified: maven/site/trunk/src/site/apt/developers/committer-environment.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/committer-environment.apt?rev=1229362r1=1229361r2=1229362view=diff
==
--- maven/site/trunk/src/site/apt/developers/committer-environment.apt
(original)
+++ maven/site/trunk/src/site/apt/developers/committer-environment.apt Mon Jan
9 21:28:35 2012
@@ -70,7 +70,7 @@ Setting up SSH public/private keys
By default, SSH (Secure Shell) asks you to enter your password each time,
i.e.:
+-+
-ssh vsive...@apache.org
+ssh your_apache_usern...@people.apache.org
Password:
+-+
@@ -78,40 +78,44 @@ Password:
You need to execute the following on your development machine:
+-+
- ssh-keygen -t dsa
+ cd ~/.ssh
+ ssh-keygen -t dsa -f your_apache_usern...@apache.org -C
your_apache_usern...@apache.org
Generating public/private dsa key pair.
-Enter file in which to save the key (~/.ssh/id_dsa): (just type return)
Enter passphrase (empty for no passphrase): (just type return)
Enter same passphrase again: (just type return)
-Your identification has been saved in ~/.ssh/id_dsa
-Your public key has been saved in ~/.ssh/id_dsa.pub
+Your identification has been saved in your_apache_usern...@apache.org.
+Your public key has been saved in your_apache_usern...@apache.org.pub.
The key fingerprint is:
-ec:06:c7:44:9e:a6:2c:c0:8a:87:04:07:a0:5b:94:d2 YOUR_MACHINE_USERNAME @
YOUR_MACHINE_DOMAIN
+0c:16:c7:44:9e:a6:2c:c0:8a:87:04:07:a0:5b:94:d2 your_apache_usern...@apache.org
+-+
- Then, paste the content of the local ~/.ssh/id_dsa.pub file into the
file
+ Then, paste the content of the local ~/.ssh/YOUR_APACHE_USERNAME.pub
file into the file
/home/YOUR_APACHE_USERNAME/.ssh/authorized_keys on the Apache remote
host.
Note: under Cygwin, it is located at
\{cygwin.install.path\}\home\YOUR_MACHINE_USERNAME\.ssh. You need
to copy the content of
\{cygwin.install.path\}\home\YOUR_MACHINE_USERNAME\.ssh into
C:\Documents and Settings\YOUR_MACHINE_USERNAME\.ssh for Maven.
+ You also need to modify the ~/.ssh/config to use this identity file
when communicating with *.apache.org
+
++-+
+Host *.apache.org
+User=YOUR_APACHE_USERNAME
+IdentityFile=~/.ssh/your_apache_usern...@apache.org
++-+
+
To test the installation, try to log in again on Apache. You should not be
asked for your password any more.
+-+
-ssh vsive...@apache.org
-Last login: Tue Oct 10 03:50:10 2006 from ipXXX-XXX-XXX-XXX
+ ssh your_apache_usern...@people.apache.org
Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994
-The Regents of the University of California. All rights reserved.
-
-FreeBSD 6.1-RELEASE (SMP-turbo) #0: Thu May 11 11:50:25 PDT 2006
+ The Regents of the University of California. All rights reserved.
-This is an Apache Software Foundation server.
-For more information, see http://www.apache.org/dev/
+FreeBSD 8.2-RELEASE-p4 (GENERIC) #1 r226043: Wed Oct 5 18:45:41 UTC 2011
-Time to change your password? Type passwd and follow the prompts.
--- Dru gene...@istar.ca
--bash-2.05b$
+This is minotaur.apache.org (a.k.a. people.apache.org).
+...
+YOUR_APACHE_USERNAME@minotaur:~$
+-+
Useful software
svn commit: r1229363 - in /maven/skins/trunk/maven-skins/src/site: ./ site.xml
Author: hboutemy Date: Mon Jan 9 21:28:59 2012 New Revision: 1229363 URL: http://svn.apache.org/viewvc?rev=1229363view=rev Log: added skins breadcrumb Added: maven/skins/trunk/maven-skins/src/site/ maven/skins/trunk/maven-skins/src/site/site.xml (with props) Added: maven/skins/trunk/maven-skins/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/src/site/site.xml?rev=1229363view=auto == --- maven/skins/trunk/maven-skins/src/site/site.xml (added) +++ maven/skins/trunk/maven-skins/src/site/site.xml Mon Jan 9 21:28:59 2012 @@ -0,0 +1,28 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +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. +-- + +project + body +breadcrumbs + item name=Skins href=http://maven.apache.org/skins/index.html; / +/breadcrumbs + /body +/project Propchange: maven/skins/trunk/maven-skins/src/site/site.xml -- svn:eol-style = native Propchange: maven/skins/trunk/maven-skins/src/site/site.xml -- svn:keywords = Author Date Id Revision Propchange: maven/skins/trunk/maven-skins/src/site/site.xml -- svn:mime-type = text/plain
svn commit: r1229364 - /maven/site/trunk/src/site/apt/skins/index.apt
Author: hboutemy
Date: Mon Jan 9 21:30:25 2012
New Revision: 1229364
URL: http://svn.apache.org/viewvc?rev=1229364view=rev
Log:
fixed typo
Modified:
maven/site/trunk/src/site/apt/skins/index.apt
Modified: maven/site/trunk/src/site/apt/skins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/skins/index.apt?rev=1229364r1=1229363r2=1229364view=diff
==
--- maven/site/trunk/src/site/apt/skins/index.apt (original)
+++ maven/site/trunk/src/site/apt/skins/index.apt Mon Jan 9 21:30:25 2012
@@ -18,7 +18,7 @@ Skins
*---+--+--+
| {{{/skins/maven-classic-skin/} Maven Classic Skin}} | 1.0
| This skin resembles the look of a site generated by Maven 1.
*---+--+--+
-| {{{/skins/maven-default-skin/} Maven Default Skin}} | 1.0
| You get this skin if you don't specify a skin.
+| {{{/skins/maven-default-skin/} Maven Default Skin}} | 1.0
| You get this skin if you don't specify any skin.
*---+--+--+
| {{{/skins/maven-stylus-skin/} Maven Stylus Skin}} | 1.3
| The skin used for the website of Maven itself.
*---+--+--+
svn commit: r1229365 - /maven/skins/trunk/maven-skins/site-pom.xml
Author: dennisl Date: Mon Jan 9 21:44:10 2012 New Revision: 1229365 URL: http://svn.apache.org/viewvc?rev=1229365view=rev Log: Fix Jenkins URL. Modified: maven/skins/trunk/maven-skins/site-pom.xml Modified: maven/skins/trunk/maven-skins/site-pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/site-pom.xml?rev=1229365r1=1229364r2=1229365view=diff == --- maven/skins/trunk/maven-skins/site-pom.xml (original) +++ maven/skins/trunk/maven-skins/site-pom.xml Mon Jan 9 21:44:10 2012 @@ -47,7 +47,7 @@ under the License. /issueManagement ciManagement systemJenkins/system -urlhttps://builds.apache.org//view/M-R/view/Maven/job/maven-skins//url +urlhttps://builds.apache.org/job/maven-skins//url /ciManagement distributionManagement site
svn commit: r1229374 - /maven/skins/trunk/maven-fluido-skin/pom.xml
Author: hboutemy Date: Mon Jan 9 21:47:28 2012 New Revision: 1229374 URL: http://svn.apache.org/viewvc?rev=1229374view=rev Log: removed unused configuration Modified: maven/skins/trunk/maven-fluido-skin/pom.xml Modified: maven/skins/trunk/maven-fluido-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1229374r1=1229373r2=1229374view=diff == --- maven/skins/trunk/maven-fluido-skin/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/pom.xml Mon Jan 9 21:47:28 2012 @@ -25,7 +25,6 @@ relativePath../maven-skins/pom.xml/relativePath /parent - groupIdorg.apache.maven.skins/groupId artifactIdmaven-fluido-skin/artifactId version1.1-SNAPSHOT/version
svn commit: r1229377 - /maven/skins/trunk/maven-fluido-skin/pom.xml
Author: hboutemy Date: Mon Jan 9 21:48:38 2012 New Revision: 1229377 URL: http://svn.apache.org/viewvc?rev=1229377view=rev Log: removed duplicate scm element Modified: maven/skins/trunk/maven-fluido-skin/pom.xml Modified: maven/skins/trunk/maven-fluido-skin/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1229377r1=1229376r2=1229377view=diff == --- maven/skins/trunk/maven-fluido-skin/pom.xml (original) +++ maven/skins/trunk/maven-fluido-skin/pom.xml Mon Jan 9 21:48:38 2012 @@ -60,12 +60,6 @@ /contributor /contributors - scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-fluido-skin/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-fluido-skin/developerConnection -urlhttp://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/url - /scm - build resources resource
svn commit: r1229380 - /maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt
Author: baerrach
Date: Mon Jan 9 21:54:19 2012
New Revision: 1229380
URL: http://svn.apache.org/viewvc?rev=1229380view=rev
Log:
Fixed typo
Modified:
maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt
Modified:
maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt?rev=1229380r1=1229379r2=1229380view=diff
==
---
maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt
(original)
+++
maven/site/trunk/src/site/apt/developers/website/deploy-maven-current-ref.apt
Mon Jan 9 21:54:19 2012
@@ -74,8 +74,8 @@ maven-2.2.0$ mvn site-deploy -Preporting
[]
-Information on {{/ref/current}} mecanism
+Information on {{/ref/current}} mechanism
The redirection from {{/ref/current}} to actual Maven version
reference is done through
{{{http://svn.apache.org/viewvc/maven/site/trunk/src/site/filtered-resources/.htaccess?view=markup}.htaccess}}
- published in site.
\ No newline at end of file
+ published in site.
svn commit: r1229386 - in /maven/plugins/trunk/maven-ear-plugin/src/site: apt/tests.apt apt/usage.apt.vm fml/faq.fml
Author: dennisl
Date: Mon Jan 9 22:08:25 2012
New Revision: 1229386
URL: http://svn.apache.org/viewvc?rev=1229386view=rev
Log:
Fix typos.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm
maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt?rev=1229386r1=1229385r2=1229386view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/tests.apt Mon Jan 9
22:08:25 2012
@@ -26,7 +26,7 @@
EAR Plugin Tests
- This page lists the ear plugin integration tests. Each tests is built on top
of a sample project available in
+ This page lists the EAR Plugin integration tests. Each tests is built on top
of a sample project available in
the
{{{http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/}svn
repository}}.
This structure provides lots of concrete use cases for beginners.
@@ -104,7 +104,7 @@ EAR Plugin Tests
* project-037: builds an EAR and make sure that ejb-client dependencies are
detected and added in the generated application.xml if includeInApplicationXml
is set
- * project-038: builds an EAR and make sure that a non-classified dependency
with mutiple candidates is detected when specifying the mainArtifactId as
classifier
+ * project-038: builds an EAR and make sure that a non-classified dependency
with multiple candidates is detected when specifying the mainArtifactId as
classifier
* project-039: builds an EAR with a Jboss 4 configuration specifying the
loader repository to use
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm?rev=1229386r1=1229385r2=1229386view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/usage.apt.vm Mon Jan 9
22:08:25 2012
@@ -34,14 +34,14 @@ Usage
* Introduction
- The EAR Plugin allows to generate automatically the deployment descriptor,
e.g.
- application.xml. This generation is already customized by the goal's
+ The EAR Plugin allows you to automatically generate the deployment
descriptor, e.g.
+ application.xml. This generation is customizable by the goal's
parameters, see {{{./plugin-info.html}the goals description}}.
* Configuring the EAR Plugin
- The configuration of the EAR Plugin is not any different to the configuration
- of the other plugins. The configuration should be similar to:
+ The configuration of the EAR Plugin is not any different from the
configuration
+ of any other plugin. The configuration should be similar to:
+-
project
@@ -61,15 +61,15 @@ Usage
/project
+-
- When configuring the EAR Plugin in your pom.xml, you do not declare any
- \executions\ elements in it because it is always invoked at least
once
+ When configuring the EAR Plugin in your pom.xml, you do not declare an
+ \executions\ element in it because it is always invoked at least once
during the package phase of an ear project.
* Executing and Generating your EAR Package
The EAR Plugin replaces the JAR Plugin when your project \packaging\
is
ear. So to generate your EAR package, you need only call the
package
- phase like so:
+ phase like this:
+-
mvn package
@@ -111,7 +111,7 @@ mvn package
The security settings might be specified under the security parameter.
- The artifact's types that should be unpacked by default can be specified
+ The artifact types that should be unpacked by default can be specified
using the unpackTypes parameter.
The file name mapping to use for artifacts stored in the EAR can be specified
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml?rev=1229386r1=1229385r2=1229386view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml Mon Jan 9
22:08:25 2012
@@ -62,12 +62,12 @@ under the License.
questionWhen should one use the modules configuration?/question
answer
p
- By default, the EAR plugin generates sensitive defaults for all the
JavaEE dependencies it found in the
+ By default, the EAR plugin generates sensible defaults for all the
JavaEE dependencies it finds in the
current project.
svn commit: r1229389 - in /maven/plugins/trunk/maven-remote-resources-plugin: ./ src/it/ src/it/resources/bootstrap/ src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/ src/it/resourc
Author: rfscholte
Date: Mon Jan 9 22:10:40 2012
New Revision: 1229389
URL: http://svn.apache.org/viewvc?rev=1229389view=rev
Log:
Fix MRRESOURCES-55: Support groupId:artifactId:version:type and
groupId:artifactId:version:type:classifier as resource bundle references
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-type-and-classifier/src/main/resources/DEPENDENCIES.vm
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle-with-type-and-classifier/src/main/java/org/apache/maven/plugin/rresource/it/App.java
maven/plugins/trunk/maven-remote-resources-plugin/src/it/settings.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1229389r1=1229388r2=1229389view=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Mon Jan 9
22:10:40 2012
@@ -112,11 +112,6 @@ under the License.
/dependency
dependency
groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-downloader/artifactId
- version1.1/version
-/dependency
-dependency
- groupIdorg.apache.maven.shared/groupId
artifactIdmaven-filtering/artifactId
version${mavenFilteringVersion}/version
/dependency
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml?rev=1229389r1=1229388r2=1229389view=diff
==
---
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
Mon Jan 9 22:10:40 2012
@@ -48,6 +48,7 @@
modules
moduleresource-bundle-with-template/module
