svn commit: r1805500 - /maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm
Author: andham Date: Sat Aug 19 11:08:12 2017 New Revision: 1805500 URL: http://svn.apache.org/viewvc?rev=1805500&view=rev Log: Fixed visual defects in example page Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm?rev=1805500&r1=1805499&r2=1805500&view=diff == --- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm (original) +++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm Sat Aug 19 11:08:12 2017 @@ -37,6 +37,7 @@ Generating an EJB client To generate the ejb-client JAR, you need to set <<>> to <<>> in the plugin's configuration: ++ + [...] [...] @@ -54,6 +55,7 @@ Generating an EJB client [...] [...] + +-+ * Client inclusions and exclusions @@ -75,6 +77,7 @@ Generating an EJB client To customize this, use the <<>> and <<>> elements: ++ + [...] [...] @@ -105,6 +108,7 @@ Generating an EJB client [...] [...] + +-+ <> Be careful when mixing excludes and includes, excludes will have a higher priority than includes.
svn commit: r1805499 - /maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Author: andham
Date: Sat Aug 19 10:59:34 2017
New Revision: 1805499
URL: http://svn.apache.org/viewvc?rev=1805499&view=rev
Log:
minor formatting fix of parameter name in Usage page
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm?rev=1805499&r1=1805498&r2=1805499&view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm Sat Aug 19
10:59:34 2017
@@ -64,7 +64,7 @@ Usage
* Specifying the EJB version to use
- The plugin generates according to the EJB version specified by the
{{{./ejb-mojo.html#ejbVersion}ejbVersion}}
+ The plugin generates according to the EJB version specified by the
{{{./ejb-mojo.html#ejbVersion}<<>>}}
parameter. To use some other version than the default, configure the plugin
as in the example below:
+
svn commit: r1805498 - /maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Author: andham
Date: Sat Aug 19 10:52:32 2017
New Revision: 1805498
URL: http://svn.apache.org/viewvc?rev=1805498&view=rev
Log:
[MEJB-115] Wrong default EJB version stated on Usage page
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm?rev=1805498&r1=1805497&r2=1805498&view=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm Sat Aug 19
10:52:32 2017
@@ -64,20 +64,22 @@ Usage
* Specifying the EJB version to use
- In EJB3, the <<>> deployment descriptor is not mandatory
anymore. By default
- the plugin assumes version 2.1. To use another version, configure the plugin
as follows:
+ The plugin generates according to the EJB version specified by the
{{{./ejb-mojo.html#ejbVersion}ejbVersion}}
+ parameter. To use some other version than the default, configure the plugin
as in the example below:
+
-
-
-org.apache.maven.plugins
-maven-ejb-plugin
-${project.version}
-
- 3.0
-
-
-
+
+
+
+ org.apache.maven.plugins
+ maven-ejb-plugin
+ ${project.version}
+
+3.0
+
+
+
+
+-
svn commit: r1804425 - /maven/pom/trunk/maven/pom.xml
Author: andham
Date: Tue Aug 8 14:03:10 2017
New Revision: 1804425
URL: http://svn.apache.org/viewvc?rev=1804425&view=rev
Log:
Changed my role to PMC member (from committer)
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=1804425&r1=1804424&r2=1804425&view=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Tue Aug 8 14:03:10 2017
@@ -70,6 +70,15 @@ under the License.
+1
+ andham
+ Anders Hammar
+ and...@apache.org
+
+PMC Member
+
+ +1
+
+
baerrach
Barrie Treloar
baerr...@apache.org
@@ -276,15 +285,6 @@ under the License.
Committer
-
-
- andham
- Anders Hammar
- and...@apache.org
- +1
-
-Committer
-
bdemers
svn commit: r1774202 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt.vm
Author: andham
Date: Wed Dec 14 12:38:48 2016
New Revision: 1774202
URL: http://svn.apache.org/viewvc?rev=1774202&view=rev
Log:
Fixed hard-coded plugin version in usage doc page
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt.vm?rev=1774202&r1=1774201&r2=1774202&view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt.vm
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt.vm Wed
Dec 14 12:38:48 2016
@@ -685,8 +685,9 @@ mvn dependency:get -Dartifact=org.apache
...
+ org.apache.maven.plugins
maven-dependency-plugin
- 2.5.1
+ ${project.version}
@@ -696,5 +697,5 @@ mvn dependency:get -Dartifact=org.apache
-
+
+---+
\ No newline at end of file
svn commit: r1774201 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
Author: andham Date: Wed Dec 14 12:33:25 2016 New Revision: 1774201 URL: http://svn.apache.org/viewvc?rev=1774201&view=rev Log: Removed duplicated (warning) text in example doc page Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm?rev=1774201&r1=1774200&r2=1774201&view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm Wed Dec 14 12:33:25 2016 @@ -120,11 +120,6 @@ mvn dependency:purge-local-repository -D the build. This goal is normally safe at the end of the build, or as part of the build clean process. - WARNING, using this goal during a build can cause build failures if - dependencies are removed from the local repo, but are needed at a later point - in the build. It is recommended that this goal only be used outside of a build - or during the clean process. - +---+ mvn dependency:purge-local-repository -DmanualInclude=org.apache:apache +---+
svn commit: r1768595 - in /maven/plugins/trunk/maven-assembly-plugin/src/site: apt/ apt/examples/multimodule/ fml/
Author: andham
Date: Mon Nov 7 22:04:40 2016
New Revision: 1768595
URL: http://svn.apache.org/viewvc?rev=1768595&view=rev
Log:
[MASSEMBLY-794] more updates to site docs for 3.0.0 release
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm?rev=1768595&r1=1768594&r2=1768595&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
Mon Nov 7 22:04:40 2016
@@ -205,8 +205,6 @@ Advanced Assembly-Descriptor Topics
* Using Regular Expressions to Exclude Files
- <>
-
Sometimes, you may find you need to specify an extremely fine-grained
inclusion or
exclusion pattern for a <<>>. In these cases, you have the option
of specifying
your pattern in the form of a regular expression by using the
<<<%regex[...]>>> syntax.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm?rev=1768595&r1=1768594&r2=1768595&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
Mon Nov 7 22:04:40 2016
@@ -37,7 +37,7 @@ Advanced Module-Set Topics
* Including and Excluding Modules using a ModuleSet
- As you are no doubt aware, Maven 2.0 introduces advanced handling of
+ As you are no doubt aware, Maven introduces advanced handling of
multimodule builds. These are builds which contain multiple, often
interrelated projects. In these builds, project hierarchy is established
through use of the <<>> section of the POM, where parent POMs
specify
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm?rev=1768595&r1=1768594&r2=1768595&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt.vm
Mon Nov 7 22:04:40 2016
@@ -30,9 +30,8 @@
Pre-defined Descriptor Files
- As of version 2.2, there are four predefined descriptor formats available
- for reuse, packaged within the Assembly Plugin, instead of the original
three.
- Their descriptorIds are:
+ There are four predefined descriptor formats available for reuse, packaged
+ within the Assembly Plugin. Their descriptorIds are:
%{toc|fromDepth=2|toDepth=2}
@@ -81,8 +80,6 @@ Pre-defined Descriptor Files
* project
- (Since 2.2)
-
Using the <<>> <<<\>>> in your Assembly Plugin
configuration will produce an assembly containing your entire project, minus
any build output that lands in the <<>> directory. The resulting
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm?rev=1768595&r1=1768594&r2=1768595&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
Mon Nov 7 22:04:40 2016
@@ -35,7 +35,7 @@ Including Module Binaries
sorts and executes project builds within a multimodule context. Please
read {{{../../faq.html#module-binaries}this FAQ entry}} if you decide to use
them.
- <> The new (since 2.2) <
svn commit: r1768594 - /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
Author: andham
Date: Mon Nov 7 21:58:40 2016
New Revision: 1768594
URL: http://svn.apache.org/viewvc?rev=1768594&view=rev
Log:
Fixed some site formatting errors
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm?rev=1768594&r1=1768593&r2=1768594&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm
Mon Nov 7 21:58:40 2016
@@ -128,9 +128,9 @@ ${module.groupId}-${module.artifactId}-$
Will result in a file called <<>> being created
within the assembly.
- >> is mapped to the file
extension
- supplied by the ArtifactHandler for the type <<>>. It's important to
- remember that the file extension <>.>
+ <<<$\{module.extension\}>>> <<>>. <><.>
* {Including Module Sources}
@@ -362,7 +362,7 @@ ${module.groupId}-${module.artifactId}-$
* {Including Module Binaries}
- *WARNING!* Using the <<>> section of a <<>> definition
+ <> Using the <<>> section of a <<>> definition
involves some tricky considerations that are a result of the way Maven
sorts and executes project builds within a multimodule context. Please
read {{{./faq.html#module-binaries}this FAQ entry}} if you decide to use
them.
@@ -494,7 +494,7 @@ ${module.groupId}-${module.artifactId}-$
---
- >> section still accommodates direct
<<<\>>>
- and <<<\>>> subsections, for specifying which module-dependencies
+ <<>>
<<<\>>>
+ <<<\>>>
svn commit: r1768126 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 23:39:17 2016
New Revision: 1768126
URL: http://svn.apache.org/viewvc?rev=1768126&view=rev
Log:
[MDEP-543] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm?rev=1768126&r1=1768125&r2=1768126&view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm Fri
Nov 4 23:39:17 2016
@@ -99,9 +99,7 @@ ${project.name}
* Usage
General instructions on how to use the Dependency Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Dependency+Plugin}plugin's
wiki page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768125 - /maven/plugins/trunk/maven-source-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 23:34:31 2016
New Revision: 1768125
URL: http://svn.apache.org/viewvc?rev=1768125&view=rev
Log:
[MSOURCES-105] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-source-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-source-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/site/apt/index.apt.vm?rev=1768125&r1=1768124&r2=1768125&view=diff
==
--- maven/plugins/trunk/maven-source-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-source-plugin/src/site/apt/index.apt.vm Fri Nov
4 23:34:31 2016
@@ -57,9 +57,7 @@ ${project.name}
* Usage
General instructions on how to use the Source Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Source+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768124 - /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 23:10:22 2016
New Revision: 1768124
URL: http://svn.apache.org/viewvc?rev=1768124&view=rev
Log:
[MJAVADOC-476] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt.vm?rev=1768124&r1=1768123&r2=1768124&view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt.vm Fri Nov
4 23:10:22 2016
@@ -102,9 +102,7 @@ javadoc.exe(or .sh) @options @packages |
* Usage
General instructions on how to use the Javadoc Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Javadoc+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768122 - /maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 23:07:10 2016
New Revision: 1768122
URL: http://svn.apache.org/viewvc?rev=1768122&view=rev
Log:
[MINVOKER-210] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt.vm?rev=1768122&r1=1768121&r2=1768122&view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt.vm Fri Nov
4 23:07:10 2016
@@ -59,9 +59,7 @@ ${project.name}
* Usage
General instructions on how to use the Invoker Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Invoker+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768118 - /maven/plugins/trunk/maven-clean-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 22:38:07 2016
New Revision: 1768118
URL: http://svn.apache.org/viewvc?rev=1768118&view=rev
Log:
[MCLEAN-77] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-clean-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-clean-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/site/apt/index.apt.vm?rev=1768118&r1=1768117&r2=1768118&view=diff
==
--- maven/plugins/trunk/maven-clean-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/site/apt/index.apt.vm Fri Nov 4
22:38:07 2016
@@ -45,9 +45,7 @@ ${project.name}
* Usage
General instructions on how to use the Clean Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Clean+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768115 - /maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 22:18:31 2016
New Revision: 1768115
URL: http://svn.apache.org/viewvc?rev=1768115&view=rev
Log:
[MEAR-244] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm?rev=1768115&r1=1768114&r2=1768115&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm Fri Nov 4
22:18:31 2016
@@ -76,8 +76,7 @@ ${project.name}
General instructions on how to use the EAR Plugin can be found on the
{{{./usage.html}usage page}}. Some more
specific use cases are described in the examples given below. Further
real-life examples are given in the plugin's
- {{{./tests.html}test suite}}. Last but not least, users occasionally
contribute additional examples, tips or errata to
- the {{{http://docs.codehaus.org/display/MAVENUSER/EAR+Plugin}plugin's wiki
page}}.
+ {{{./tests.html}test suite}}.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768114 - /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 22:13:32 2016
New Revision: 1768114
URL: http://svn.apache.org/viewvc?rev=1768114&view=rev
Log:
[MASSEMBLY-836] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm?rev=1768114&r1=1768113&r2=1768114&view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm Fri Nov
4 22:13:32 2016
@@ -145,9 +145,7 @@ ${project.name}
* Usage
General instructions on how to use the Assembly Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Assembly+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768112 - /maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 22:07:51 2016
New Revision: 1768112
URL: http://svn.apache.org/viewvc?rev=1768112&view=rev
Log:
[MINSTALL-130] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt.vm?rev=1768112&r1=1768111&r2=1768112&view=diff
==
--- maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-install-plugin/src/site/apt/index.apt.vm Fri Nov
4 22:07:51 2016
@@ -58,9 +58,7 @@ ${project.name}
* Usage
General instructions on how to use the Install Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Install+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768110 - /maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 22:04:13 2016
New Revision: 1768110
URL: http://svn.apache.org/viewvc?rev=1768110&view=rev
Log:
[MDEPLOY-215] Remove link to non-existing Codehaus wiki
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm?rev=1768110&r1=1768109&r2=1768110&view=diff
==
--- maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm Fri Nov
4 22:04:13 2016
@@ -78,9 +78,7 @@ ${project.name}
* Usage
General instructions on how to use the Deploy Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Deploy+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1768108 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 21:38:40 2016
New Revision: 1768108
URL: http://svn.apache.org/viewvc?rev=1768108&view=rev
Log:
[MCOMPILER-281] Remove reference to Maven 1's Java plugin
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm?rev=1768108&r1=1768107&r2=1768108&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm Fri Nov
4 21:38:40 2016
@@ -41,8 +41,6 @@ ${project.name}
Other compilers than <<>> can be used and work has already started
on AspectJ, .NET, and C#.
- This Compiler Plugin corresponds to Maven 1.x's Java Plugin.
-
<> http://download.oracle.com/javase/6/docs/technotes/tools/windows/javac.html}}.>
svn commit: r1768107 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Fri Nov 4 21:33:45 2016
New Revision: 1768107
URL: http://svn.apache.org/viewvc?rev=1768107&view=rev
Log:
[MCOMPILER-282] Remove link to Codehaus wiki
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm?rev=1768107&r1=1768106&r2=1768107&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt.vm Fri Nov
4 21:33:45 2016
@@ -61,9 +61,7 @@ ${project.name}
* Usage
General instructions on how to use the Compiler Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Compiler+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1748465 - /maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt.vm
Author: andham Date: Tue Jun 14 20:53:31 2016 New Revision: 1748465 URL: http://svn.apache.org/viewvc?rev=1748465&view=rev Log: Fixed date format that Doxia complains about Modified: maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt.vm Modified: maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt.vm?rev=1748465&r1=1748464&r2=1748465&view=diff == --- maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt.vm (original) +++ maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt.vm Tue Jun 14 20:53:31 2016 @@ -3,7 +3,7 @@ -- Dennis Lundberg -- - 12 July 2006 + 2006-07-12 -- ~~ Licensed to the Apache Software Foundation (ASF) under one
svn commit: r1748464 - in /maven/plugins/trunk/maven-assembly-plugin/src/site/apt: ./ examples/multimodule/ examples/single/
Author: andham Date: Tue Jun 14 20:52:02 2016 New Revision: 1748464 URL: http://svn.apache.org/viewvc?rev=1748464&view=rev Log: Fixed date format that Doxia complains about Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/index.apt maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/index.apt maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-components.apt.vm maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm maven/plugins/trunk/maven-assembly-plugin/src/site/apt/features.apt Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/index.apt?rev=1748464&r1=1748463&r2=1748464&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/index.apt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/index.apt Tue Jun 14 20:52:02 2016 @@ -3,7 +3,7 @@ --- Edwin Punzalan --- - 24-July-2006 + 2006-07-24 --- Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm?rev=1748464&r1=1748463&r2=1748464&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm Tue Jun 14 20:52:02 2016 @@ -3,7 +3,7 @@ -- John Casey -- - 05-May-2006 + 2006-05-05 -- ~~ Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm?rev=1748464&r1=1748463&r2=1748464&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm Tue Jun 14 20:52:02 2016 @@ -3,7 +3,7 @@ -- John Casey -- - 05-May-2006 + 2006-05-05 -- ~~ Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm?rev=1748464&r1=1748463&r2=1748464&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm Tue Jun 14 20:52:02 2016 @@ -3,7 +3,7 @@ -- Edwin Punzalan -- - 26-July-2006 + 2006-07-26 -- ~~ Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt?rev=1748464&r1=1748463&r2=1748464&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/including-and-excluding-artifacts.apt Tue Jun 14 20:52:02 2016 @@ -3,7 +3,7 @@ --- Barrie Treloar --- - 3
svn commit: r1748462 - /maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml
Author: andham Date: Tue Jun 14 20:41:55 2016 New Revision: 1748462 URL: http://svn.apache.org/viewvc?rev=1748462&view=rev Log: [MASSEMBLY-816] fluido skin version (and config) is now inherited from parent Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml?rev=1748462&r1=1748461&r2=1748462&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml Tue Jun 14 20:41:55 2016 @@ -24,32 +24,6 @@ under the License. xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd";> - -http://maven.apache.org/images/apache-maven-project.png -http://www.apache.org/ - - - -http://maven.apache.org/images/maven-logo-black-on-white.png -http://maven.apache.org/ - - - - org.apache.maven.skins -maven-fluido-skin -1.4 - - - - - true - - - - - - -
svn commit: r1748456 - in /maven/plugins/trunk/maven-assembly-plugin/src/site/apt: advanced-descriptor-topics.apt.vm advanced-module-set-topics.apt.vm
Author: andham Date: Tue Jun 14 19:49:05 2016 New Revision: 1748456 URL: http://svn.apache.org/viewvc?rev=1748456&view=rev Log: Fixed date format that Doxia complains about Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm?rev=1748456&r1=1748455&r2=1748456&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm Tue Jun 14 19:49:05 2016 @@ -3,7 +3,7 @@ --- John Casey --- - 1 December 2006 + 2006-12-01 --- ~~ Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm?rev=1748456&r1=1748455&r2=1748456&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt.vm Tue Jun 14 19:49:05 2016 @@ -3,7 +3,7 @@ --- John Casey --- - 1 December 2006 + 2006-12-01 --- ~~ Licensed to the Apache Software Foundation (ASF) under one
svn commit: r1744122 - /maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
Author: andham
Date: Mon May 16 19:46:19 2016
New Revision: 1744122
URL: http://svn.apache.org/viewvc?rev=1744122&view=rev
Log:
[MRESOURCES-225] Hyperlink error on character encoding example page
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm?rev=1744122&r1=1744121&r2=1744122&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
Mon May 16 19:46:19 2016
@@ -48,7 +48,7 @@ Specifying a character encoding scheme
+-+
By using the above property <<>> will automatically
- use this {{{./resources-mojo.html#encoding}encoding}}.
+ use this {{{../resources-mojo.html#encoding}encoding}}.
Occasionally you need to change the encoding explicitly for different
purposes.
This can be done by defining the encoding via the configuration
svn commit: r1744118 - /maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
Author: andham
Date: Mon May 16 19:43:45 2016
New Revision: 1744118
URL: http://svn.apache.org/viewvc?rev=1744118&view=rev
Log:
Minor change to wording as well as fixed a visual escaping glitch
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm?rev=1744118&r1=1744117&r2=1744118&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt.vm
Mon May 16 19:43:45 2016
@@ -32,9 +32,9 @@ Specifying a character encoding scheme
A character encoding scheme such as <<>>, <<>> or <<>>
can be chosen to be
used for the reading and writing of files.
- The best practice is to define
{{{https://maven.apache.org/general.html#encoding-warning}encoding}} for copying
- files via the property <<<${project.build.sourceEncoding}>>> which should be
defined in the pom
- properties section like this:
+ The best practice is to
{{{https://maven.apache.org/general.html#encoding-warning}define encoding}}
+ for copying filtered resources via the property
<<<$\{project.build.sourceEncoding}>>> which should be
+ defined in the pom properties section like this:
+-+
svn commit: r1743557 - /maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Thu May 12 20:06:15 2016
New Revision: 1743557
URL: http://svn.apache.org/viewvc?rev=1743557&view=rev
Log:
[MRESOURCES-219] Link to wiki page should be removed now that Codehaus is shut
down
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm?rev=1743557&r1=1743556&r2=1743557&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm Thu
May 12 20:06:15 2016
@@ -66,9 +66,7 @@ ${project.name}
* Usage
General instructions on how to use the Resources Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/Resources+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
svn commit: r1743555 - /maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/custom-resource-filters.apt.vm
Author: andham
Date: Thu May 12 20:00:52 2016
New Revision: 1743555
URL: http://svn.apache.org/viewvc?rev=1743555&view=rev
Log:
Syncing some titles
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/custom-resource-filters.apt.vm
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/custom-resource-filters.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/custom-resource-filters.apt.vm?rev=1743555&r1=1743554&r2=1743555&view=diff
==
---
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/custom-resource-filters.apt.vm
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/custom-resource-filters.apt.vm
Thu May 12 20:00:52 2016
@@ -26,14 +26,14 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Custom resource filters
+Custom resources filters
With version 2.5 you are now able to build your own custom resources
filter(s).
Your custom resources filter classes must implements
{{{http://maven.apache.org/shared/maven-filtering/apidocs/org/apache/maven/shared/filtering/MavenResourcesFiltering.html}org.apache.maven.shared.filtering.MavenResourcesFiltering}}.
-* Custom Resource Filter Implementation
+* Custom Resources Filter Implementation
Your custom resources filter classes must be marked as a Plexus Component.
Below a sample with a roleHint itFilter.
svn commit: r1743553 - /maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Thu May 12 19:54:43 2016
New Revision: 1743553
URL: http://svn.apache.org/viewvc?rev=1743553&view=rev
Log:
[MRESOURCES-218] List of examples not complete on first page
Modified:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm?rev=1743553&r1=1743552&r2=1743553&view=diff
==
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt.vm Thu
May 12 19:54:43 2016
@@ -86,7 +86,7 @@ ${project.name}
* Examples
The following examples show how to use the Resources Plugin in more advanced
- usecases:
+ use cases:
* {{{./examples/encoding.html}Specifying a character encoding scheme}}
@@ -100,4 +100,8 @@ ${project.name}
* {{{./examples/copy-resources.html}Copy resources}}
+ * {{{./examples/binaries-filtering.html}Binaries filtering}}
+
+ * {{{./examples/custom-resource-filters.html}Custom resources filters}}
+
[]
svn commit: r1741255 - in /maven/shared/trunk/maven-archiver/src: main/java/org/apache/maven/archiver/MavenArchiver.java main/java/org/apache/maven/archiver/PomPropertiesUtil.java test/java/org/apache
Author: andham
Date: Wed Apr 27 13:14:30 2016
New Revision: 1741255
URL: http://svn.apache.org/viewvc?rev=1741255&view=rev
Log:
[MSHARED-513] Regression: Created-By row in manifest does not include Maven
version
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=1741255&r1=1741254&r2=1741255&view=diff
==
---
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
(original)
+++
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Wed Apr 27 13:14:30 2016
@@ -655,7 +655,7 @@ public class MavenArchiver
String createdBy = "Apache Maven";
if ( session != null ) // can be null due to API backwards
compatibility
{
-String mavenVersion = session.getUserProperties().getProperty(
"maven.version" );
+String mavenVersion = session.getSystemProperties().getProperty(
"maven.version" );
if ( mavenVersion != null )
{
createdBy += " " + mavenVersion;
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java?rev=1741255&r1=1741254&r2=1741255&view=diff
==
---
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
(original)
+++
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
Wed Apr 27 13:14:30 2016
@@ -91,7 +91,7 @@ public class PomPropertiesUtil
String createdBy = CREATED_BY_MAVEN;
if ( session != null ) // can be null due to API backwards
compatibility
{
-String mavenVersion = session.getUserProperties().getProperty(
"maven.version" );
+String mavenVersion =
session.getSystemProperties().getProperty( "maven.version" );
if ( mavenVersion != null )
{
createdBy += " " + mavenVersion;
Modified:
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java?rev=1741255&r1=1741254&r2=1741255&view=diff
==
---
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
(original)
+++
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
Wed Apr 27 13:14:30 2016
@@ -1095,10 +1095,10 @@ public class MavenArchiverTest
private MavenSession getDummySession()
{
-Properties executionProperties = new Properties();
-executionProperties.put( "maven.version", "3.0.4" );
+Properties systemProperties = new Properties();
+systemProperties.put( "maven.version", "3.0.4" );
-return getDummySession( executionProperties );
+return getDummySession( systemProperties );
}
private MavenSession getDummySessionWithoutMavenVersion()
@@ -1106,7 +1106,7 @@ public class MavenArchiverTest
return getDummySession( new Properties() );
}
-private MavenSession getDummySession( Properties executionProperties )
+private MavenSession getDummySession( Properties systemProperties )
{
PlexusContainer container = null;
File settings = null;
@@ -1114,7 +1114,7 @@ public class MavenArchiverTest
Date startTime = new Date();
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
-request.setUserProperties( executionProperties );
+request.setSystemProperties( systemProperties );
request.setGoals( goals );
request.setStartTime( startTime );
request.setUserSettingsFile( settings );
maven-plugin-testing git commit: [MPLUGINTESTING-47] Incorrect Mojo Java5 annotations in example
Repository: maven-plugin-testing
Updated Branches:
refs/heads/master b8c654b6b -> 4a374fc5a
[MPLUGINTESTING-47] Incorrect Mojo Java5 annotations in example
Signed-off-by: Anders Hammar
Project: http://git-wip-us.apache.org/repos/asf/maven-plugin-testing/repo
Commit:
http://git-wip-us.apache.org/repos/asf/maven-plugin-testing/commit/4a374fc5
Tree: http://git-wip-us.apache.org/repos/asf/maven-plugin-testing/tree/4a374fc5
Diff: http://git-wip-us.apache.org/repos/asf/maven-plugin-testing/diff/4a374fc5
Branch: refs/heads/master
Commit: 4a374fc5a308a6416bfbdaf1c3f69eafefb60abd
Parents: b8c654b
Author: Anders Hammar
Authored: Thu Jan 14 09:45:30 2016 +0100
Committer: Anders Hammar
Committed: Thu Jan 14 09:45:30 2016 +0100
--
.../src/site/apt/examples/complex-mojo-parameters.apt| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-plugin-testing/blob/4a374fc5/maven-plugin-testing-harness/src/site/apt/examples/complex-mojo-parameters.apt
--
diff --git
a/maven-plugin-testing-harness/src/site/apt/examples/complex-mojo-parameters.apt
b/maven-plugin-testing-harness/src/site/apt/examples/complex-mojo-parameters.apt
index a0761c2..29b78a9 100644
---
a/maven-plugin-testing-harness/src/site/apt/examples/complex-mojo-parameters.apt
+++
b/maven-plugin-testing-harness/src/site/apt/examples/complex-mojo-parameters.apt
@@ -60,7 +60,7 @@ public class MyMojo
/**
* The Maven Project.
*/
-@Component
+@Parameter( defaultValue = "${project}", readonly = true )
protected MavenProject project;
/**
@@ -72,7 +72,7 @@ public class MyMojo
/**
* The Maven Settings.
*/
-@Component
+@Parameter( defaultValue = "${settings}", readonly = true )
private Settings settings;
...
svn commit: r1722332 - /maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Author: andham
Date: Wed Dec 30 14:17:31 2015
New Revision: 1722332
URL: http://svn.apache.org/viewvc?rev=1722332&view=rev
Log:
Clean up of some unit tests after commit 1717974
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=1722332&r1=1722331&r2=1722332&view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Wed Dec 30 14:17:31 2015
@@ -33,8 +33,6 @@ import org.apache.maven.shared.test.plug
import org.apache.maven.shared.test.plugin.RepositoryTool;
import org.apache.maven.shared.test.plugin.TestToolsException;
import org.codehaus.plexus.PlexusTestCase;
-import org.junit.Assume;
-
import java.io.File;
import java.util.Arrays;
import java.util.Collections;
@@ -125,7 +123,8 @@ public class DefaultProjectDependencyAna
{
return;
}
-// Only visible through constant pool analysis
+
+// Only visible through constant pool analysis (supported for JDK8+)
compileProject( "java8methodRefs/pom.xml" );
MavenProject project = getProject( "java8methodRefs/pom.xml" );
@@ -143,7 +142,7 @@ public class DefaultProjectDependencyAna
}
-public void testInlinedStaticReferece()
+public void testInlinedStaticReference()
throws TestToolsException, ProjectDependencyAnalyzerException
{
if ( !SystemUtils.isJavaVersionAtLeast( 180 ) )
@@ -151,7 +150,7 @@ public class DefaultProjectDependencyAna
return;
}
-// Only visible through constant pool analysis
+// Only visible through constant pool analysis (supported for JDK8+)
compileProject( "inlinedStaticReference/pom.xml" );
MavenProject project = getProject( "inlinedStaticReference/pom.xml" );
@@ -174,9 +173,7 @@ public class DefaultProjectDependencyAna
MavenProject project2 = getProject(
"jarWithCompileDependency/project2/pom.xml" );
-if ( project2.getBuild()
- .getOutputDirectory()
- .contains( "${" ) )
+if ( project2.getBuild().getOutputDirectory().contains( "${" ) )
{
// if Maven version used as dependency is upgraded to >= 2.2.0
throw new TestToolsException( "output directory was not
interpolated: " + project2.getBuild()
@@ -194,77 +191,43 @@ public class DefaultProjectDependencyAna
assertEquals( expectedAnalysis, actualAnalysis );
}
-public void testJarWithTestDependency()
+public void testForceDeclaredDependenciesUsage()
throws TestToolsException, ProjectDependencyAnalyzerException
{
-if ( SystemUtils.isJavaVersionAtLeast( 180 ) )
-{
-return;
-}
-
-Assume.assumeTrue( !SystemUtils.isJavaVersionAtLeast( 180 ) );
-
compileProject( "jarWithTestDependency/pom.xml" );
MavenProject project2 = getProject(
"jarWithTestDependency/project2/pom.xml" );
-ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2
);
-
-Artifact project1 =
-createArtifact(
"org.apache.maven.shared.dependency-analyzer.tests", "jarWithTestDependency1",
"jar", "1.0",
-"test" );
-Set usedDeclaredArtifacts = Collections.singleton( project1
);
-
-Artifact junit = createArtifact( "junit", "junit", "jar", "3.8.1",
"test" );
-Set unusedDeclaredArtifacts = Collections.singleton( junit );
-
-ProjectDependencyAnalysis expectedAnalysis =
-new ProjectDependencyAnalysis( usedDeclaredArtifacts, null,
unusedDeclaredArtifacts );
-
-assertEquals( expectedAnalysis, actualAnalysis );
-
-// MSHARED-253: force used dependency (which is actually used but not
detected)
-ProjectDependencyAnalysis forcedAnalysis =
-actualAnalysis.forceDeclaredDependenciesUsage( new String[]{
"junit:junit" } );
-
-usedDeclaredArtifacts = new HashSet( Arrays.asList(
project1, junit ) );
-expectedAn
svn commit: r1702623 - /maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
Author: andham
Date: Sat Sep 12 11:47:11 2015
New Revision: 1702623
URL: http://svn.apache.org/r1702623
Log:
CMS commit to maven by andham
Modified:
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
Modified:
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt?rev=1702623&r1=1702622&r2=1702623&view=diff
==
---
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
(original)
+++
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
Sat Sep 12 11:47:11 2015
@@ -154,8 +154,6 @@ Guide to uploading artifacts to the Cent
* {{{http://www.nuiton.org}Nuiton.org}}
- * {{{http://central.sonatype.org/pages/ossrh-guide.html}Sonatype OSSRH (OSS
Repository Hosting)}} (for any OSS project)
-
[]
Automatic publication will be provided for Forges that provide hosting
services for OSS projects and other large project repositories
svn commit: r1702618 - /maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
Author: andham
Date: Sat Sep 12 11:38:16 2015
New Revision: 1702618
URL: http://svn.apache.org/r1702618
Log:
CMS commit to maven by andham
Modified:
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
Modified:
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt?rev=1702618&r1=1702617&r2=1702618&view=diff
==
---
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
(original)
+++
maven/site/trunk/content/apt/guides/mini/guide-central-repository-upload.apt
Sat Sep 12 11:38:16 2015
@@ -150,12 +150,12 @@ Guide to uploading artifacts to the Cent
* {{{http://www.apache.org/}Apache Software Foundation}} (for all Apache
projects)
- * {{{http://www.codehaus.org/}Codehaus}} (for Codehaus projects)
-
* {{{http://www.fusesource.org/forge/}FuseSource Forge}} (focused on FUSE
related projects)
* {{{http://www.nuiton.org}Nuiton.org}}
+ * {{{http://central.sonatype.org/pages/ossrh-guide.html}Sonatype OSSRH (OSS
Repository Hosting)}} (for any OSS project)
+
[]
Automatic publication will be provided for Forges that provide hosting
services for OSS projects and other large project repositories
@@ -178,4 +178,4 @@ Guide to uploading artifacts to the Cent
mechanism currently for validating the incoming data via the rsync, and this
leads to bad metadata that affects everyone.
The aggregation of projects into single larger feeds allows us to sync faster
and more often, and ensuring these locations
- perform sufficient checks increases the quality of metadata for everyone.
+ perform sufficient checks increases the quality of metadata for everyone.
\ No newline at end of file
svn commit: r1671031 - /maven/sandbox/trunk/other/jira/ASF-jira-groups.csv
Author: andham Date: Fri Apr 3 11:35:38 2015 New Revision: 1671031 URL: http://svn.apache.org/r1671031 Log: Added my (Anders Hammar) JIRA username Modified: maven/sandbox/trunk/other/jira/ASF-jira-groups.csv Modified: maven/sandbox/trunk/other/jira/ASF-jira-groups.csv URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/other/jira/ASF-jira-groups.csv?rev=1671031&r1=1671030&r2=1671031&view=diff == --- maven/sandbox/trunk/other/jira/ASF-jira-groups.csv (original) +++ maven/sandbox/trunk/other/jira/ASF-jira-groups.csv Fri Apr 3 11:35:38 2015 @@ -32,7 +32,7 @@ wfay,Wayne Fay, ,, maven-developers,Committers, agudian,Andreas Gudian, -andham,Anders Hammar, +andham,Anders Hammar,afloom bdemers,Brian Demers, bellingard,Fabrice Bellingard, bentmann,Benjamin Bentmann,
svn commit: r1657408 - in /maven/archetype/trunk/archetype-common: ./ src/test/java/org/apache/maven/archetype/test/
Author: andham
Date: Wed Feb 4 21:38:45 2015
New Revision: 1657408
URL: http://svn.apache.org/r1657408
Log:
[ARCHETYPE-431] Only include Apache Maven archetypes in internal archetype
catalog
Added:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
- copied, changed from r1657394,
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
Removed:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
Modified:
maven/archetype/trunk/archetype-common/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=1657408&r1=1657407&r2=1657408&view=diff
==
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Wed Feb 4 21:38:45 2015
@@ -398,24 +398,4 @@
-
-
-
- internal-catalog
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-
-**/InternalCatalogFromWiki.java
-
-
-
-
-
-
-
-
Copied:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
(from r1657394,
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java)
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java?p2=maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java&p1=maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java&r1=1657394&r2=1657408&rev=1657408&view=diff
==
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
Wed Feb 4 21:38:45 2015
@@ -20,26 +20,25 @@ package org.apache.maven.archetype.test;
*/
import java.io.File;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.maven.archetype.ArchetypeManager;
+
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.ArchetypeGenerationResult;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
/**
*
* @author rafale
*/
-public class InternalCatalogArchetypesVerification
+public class InternalCatalogArchetypesVerificationTest
extends PlexusTestCase
{
+private static final String CENTRAL =
"http://repo.maven.apache.org/maven2";;
public void testInternalCatalog()
throws Exception
@@ -52,74 +51,41 @@ public class InternalCatalogArchetypesVe
File outputDirectory = new File( getBasedir(),
"target/internal-archetypes-projects" );
outputDirectory.mkdirs();
+FileUtils.cleanDirectory( outputDirectory );
ArchetypeManager archetype = (ArchetypeManager) lookup(
ArchetypeManager.class.getName() );
-ArchetypeCatalog result = archetype.getInternalCatalog();
+ArchetypeCatalog catalog = archetype.getInternalCatalog();
-List archetypesUsed = new ArrayList();
-List archetypesRemoved = new ArrayList();
int count = 1;
-for ( Archetype a : result.getArchetypes() )
+for ( Archetype a : catalog.getArchetypes() )
{
Archetype ar = new Archetype();
-
ar.setGroupId( a.getGroupId() );
ar.setArtifactId( a.getArtifactId() );
-ar.setVersion( "RELEASE" );
+ar.setVersion( a.getVersion() );
ar.setDescription( a.getDescription() );
ar.setGoals(
svn commit: r1654022 - /maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
Author: andham
Date: Thu Jan 22 19:32:22 2015
New Revision: 1654022
URL: http://svn.apache.org/r1654022
Log:
Fix for IT 'analyze-multimodule-project' to work with Maven 2.2.1
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties?rev=1654022&r1=1654021&r2=1654022&view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
Thu Jan 22 19:32:22 2015
@@ -15,4 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals = clean
${project.groupId}:${project.artifactId}:${project.version}:analyze
+# 'install' is for this IT to work with Maven 2.2.1. Not required for Maven
3.0+.
+invoker.goals = clean install
${project.groupId}:${project.artifactId}:${project.version}:analyze
svn commit: r1653649 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/it/projects/analyze-multimodule-project/ src/it/projects/analyze-multimodule-project/module1/ src/it/projects/analyze-mul
Author: andham
Date: Wed Jan 21 20:54:24 2015
New Revision: 1653649
URL: http://svn.apache.org/r1653649
Log:
[MDEP-466] analyze fails on multimodule project (regression)
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java
(with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1653649&r1=1653648&r2=1653649&view=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Jan 21 20:54:24 2015
@@ -176,7 +176,7 @@ under the License.
org.apache.maven.shared
maven-dependency-analyzer
- 1.5
+ 1.6
org.apache.maven.shared
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties?rev=1653649&view=auto
==
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
Wed Jan 21 20:54:24 2015
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = clean
${project.groupId}:${project.artifactId}:${project.version}:analyze
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties
--
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-mu
svn commit: r1636819 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: andham Date: Wed Nov 5 08:24:52 2014 New Revision: 1636819 URL: http://svn.apache.org/r1636819 Log: [MEAR-204] Upgrade maven-archiver dependency to v2.6 Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1636819&r1=1636818&r2=1636819&view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Nov 5 08:24:52 2014 @@ -75,7 +75,7 @@ under the License. -2.5 +2.6 1.0-beta-2 2.2.1 3.2 @@ -116,7 +116,7 @@ under the License. org.codehaus.plexus plexus-archiver - 2.7 + 2.8.1 org.codehaus.plexus
svn commit: r1636457 - /maven/plugins/trunk/maven-jar-plugin/pom.xml
Author: andham Date: Mon Nov 3 21:52:34 2014 New Revision: 1636457 URL: http://svn.apache.org/r1636457 Log: Removed transitive dependency exclusion not needed any more Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1636457&r1=1636456&r2=1636457&view=diff == --- maven/plugins/trunk/maven-jar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jar-plugin/pom.xml Mon Nov 3 21:52:34 2014 @@ -123,10 +123,6 @@ under the License. org.codehaus.plexus plexus-container-default - - org.codehaus.plexus - plexus-component-api -
svn commit: r1636454 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
Author: andham
Date: Mon Nov 3 21:40:10 2014
New Revision: 1636454
URL: http://svn.apache.org/r1636454
Log:
[MWAR-335] Upgrade maven-archiver dependency to v2.6 (including aligning
transitive deps)
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1636454&r1=1636453&r2=1636454&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Mon Nov 3 21:40:10 2014
@@ -57,7 +57,7 @@ under the License.
-2.5
+2.6
1.3
2.2.1
3.2
@@ -120,7 +120,7 @@ under the License.
org.codehaus.plexus
plexus-io
- 2.2
+ 2.3.2
commons-io
@@ -130,16 +130,12 @@ under the License.
org.codehaus.plexus
plexus-archiver
- 2.7.1
+ 2.8.1
org.codehaus.plexus
plexus-container-default
-
- org.codehaus.plexus
- plexus-component-api
-
Modified:
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java?rev=1636454&r1=1636453&r2=1636454&view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
Mon Nov 3 21:40:10 2014
@@ -19,12 +19,6 @@ package org.apache.maven.plugin.war;
* under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.stub.MavenProject4CopyConstructor;
-import org.apache.maven.plugin.war.stub.ProjectHelperStub;
-import org.apache.maven.plugin.war.stub.WarArtifact4CCStub;
-import org.codehaus.plexus.util.IOUtil;
-
import java.io.File;
import java.io.IOException;
import java.util.Enumeration;
@@ -35,6 +29,12 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.war.stub.MavenProject4CopyConstructor;
+import org.apache.maven.plugin.war.stub.ProjectHelperStub;
+import org.apache.maven.plugin.war.stub.WarArtifact4CCStub;
+import org.codehaus.plexus.util.IOUtil;
+
/**
* comprehensive test on buildExplodedWebApp is done on WarExplodedMojoTest
*/
@@ -88,8 +88,8 @@ public class WarMojoTest
// validate jar file
File expectedJarFile = new File( outputDir, "simple.war" );
assertJarContent( expectedJarFile, new String[] {
"META-INF/MANIFEST.MF", "WEB-INF/web.xml", "pansit.jsp",
-"org/web/app/last-exile.jsp",
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null,
+"org/web/app/last-exile.jsp",
"META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+
"META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null,
mojo.getWebXml().toString(), null, null, null, null } );
}
@@ -118,8 +118,8 @@ public class WarMojoTest
// validate jar file
File expectedJarFile = new File( outputDir, "simple.war" );
assertJarContent( expectedJarFile, new String[] {
"META-INF/MANIFEST.MF", "WEB-INF/web.xml", "pansit.jsp",
-"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-
"META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null,
+
"META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+
"META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null,
mojo.getWebXml().toString(), null, null, null, }, new String[] {
"org/web/app/last-exile.jsp" } );
}
@@ -150,8 +150,8 @@ public class WarMojoTest
// validate jar file
File expectedJarFile = new File( outputDir,
"simple-test-classifier.war" );
assertJarContent( expectedJarFile, new String[] {
"META-INF/MANIFEST.MF", "WEB-INF/web.xml", "pansit.jsp",
-
svn commit: r1636442 - /maven/plugins/trunk/maven-jar-plugin/pom.xml
Author: andham Date: Mon Nov 3 21:11:09 2014 New Revision: 1636442 URL: http://svn.apache.org/r1636442 Log: [MJAR-189] Upgrade plexus-archiver dependency to v2.8.1 Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1636442&r1=1636441&r2=1636442&view=diff == --- maven/plugins/trunk/maven-jar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jar-plugin/pom.xml Mon Nov 3 21:11:09 2014 @@ -117,7 +117,7 @@ under the License. org.codehaus.plexus plexus-archiver - 2.7.1 + 2.8.1 org.codehaus.plexus
svn commit: r1635202 - /maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Author: andham
Date: Wed Oct 29 16:57:30 2014
New Revision: 1635202
URL: http://svn.apache.org/r1635202
Log:
[MSHARED-382] JarFile object is not being closed
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1635202&r1=1635201&r2=1635202&view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Wed Oct 29 16:57:30 2014
@@ -148,22 +148,35 @@ public class DefaultProjectDependencyAna
// optimized solution for the jar case
JarFile jarFile = new JarFile( file );
-Enumeration jarEntries = jarFile.entries();
+try
+{
+Enumeration jarEntries = jarFile.entries();
-Set classes = new HashSet();
+Set classes = new HashSet();
-while ( jarEntries.hasMoreElements() )
+while ( jarEntries.hasMoreElements() )
+{
+String entry = jarEntries.nextElement().getName();
+if ( entry.endsWith( ".class" ) )
+{
+String className = entry.replace( '/', '.' );
+className = className.substring( 0,
className.length() - ".class".length() );
+classes.add( className );
+}
+}
+
+artifactClassMap.put( artifact, classes );
+}
+finally
{
-String entry = jarEntries.nextElement().getName();
-if ( entry.endsWith( ".class" ) )
+try
+{
+jarFile.close();
+}
+catch ( IOException ignore )
{
-String className = entry.replace( '/', '.' );
-className = className.substring( 0, className.length()
- ".class".length() );
-classes.add( className );
}
}
-
-artifactClassMap.put( artifact, classes );
}
else if ( file != null && file.isDirectory() )
{
svn commit: r1635198 - /maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Author: andham
Date: Wed Oct 29 16:44:47 2014
New Revision: 1635198
URL: http://svn.apache.org/r1635198
Log:
Reformatted code
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1635198&r1=1635197&r2=1635198&view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Wed Oct 29 16:44:47 2014
@@ -41,7 +41,7 @@ import org.codehaus.plexus.component.ann
* @author mailto:markhob...@gmail.com";>Mark Hobson
* @version $Id$
*/
-@Component(role = ProjectDependencyAnalyzer.class)
+@Component( role = ProjectDependencyAnalyzer.class )
public class DefaultProjectDependencyAnalyzer
implements ProjectDependencyAnalyzer
{
@@ -96,11 +96,10 @@ public class DefaultProjectDependencyAna
}
/**
- * This method defines a new way to remove the artifacts by using the
- * conflict id. We don't care about the version here because there can be
- * only 1 for a given artifact anyway.
- *
- * @param start initial set
+ * This method defines a new way to remove the artifacts by using the
conflict id. We don't care about the version
+ * here because there can be only 1 for a given artifact anyway.
+ *
+ * @param start initial set
* @param remove set to exclude
* @return set with remove excluded
*/
@@ -137,7 +136,8 @@ public class DefaultProjectDependencyAna
{
Map> artifactClassMap = new
LinkedHashMap>();
-@SuppressWarnings( "unchecked" ) Set dependencyArtifacts =
project.getArtifacts();
+@SuppressWarnings( "unchecked" )
+Set dependencyArtifacts = project.getArtifacts();
for ( Artifact artifact : dependencyArtifacts )
{
@@ -157,10 +157,9 @@ public class DefaultProjectDependencyAna
String entry = jarEntries.nextElement().getName();
if ( entry.endsWith( ".class" ) )
{
-String className = entry.replace( '/', '.' );
+String className = entry.replace( '/', '.' );
className = className.substring( 0, className.length()
- ".class".length() );
classes.add( className );
-
}
}
@@ -202,7 +201,8 @@ public class DefaultProjectDependencyAna
private Set buildDeclaredArtifacts( MavenProject project )
{
-@SuppressWarnings( "unchecked" ) Set declaredArtifacts =
project.getDependencyArtifacts();
+@SuppressWarnings( "unchecked" )
+Set declaredArtifacts = project.getDependencyArtifacts();
if ( declaredArtifacts == null )
{
@@ -212,8 +212,7 @@ public class DefaultProjectDependencyAna
return declaredArtifacts;
}
-private Set buildUsedArtifacts( Map>
artifactClassMap,
- Set dependencyClasses )
+private Set buildUsedArtifacts( Map>
artifactClassMap, Set dependencyClasses )
{
Set usedArtifacts = new HashSet();
svn commit: r1635191 - in /maven/shared/trunk/maven-dependency-analyzer: ./ src/main/java/org/apache/maven/shared/dependency/analyzer/ src/test/java/org/apache/maven/shared/dependency/analyzer/ src/te
Author: andham
Date: Wed Oct 29 16:33:52 2014
New Revision: 1635191
URL: http://svn.apache.org/r1635191
Log:
[MSHARED-361] DefaultProjectDependencyAnalyzer.buildArtifactClassMap assumes
dependencies are jar files (regression)
Added:
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module1/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module1/pom.xml
(with props)
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module1/src/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module1/src/main/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module1/src/main/java/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module1/src/main/java/foo/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module1/src/main/java/foo/Main.java
(with props)
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module2/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module2/pom.xml
(with props)
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module2/src/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module2/src/main/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module2/src/main/java/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module2/src/main/java/bar/
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/module2/src/main/java/bar/Main.java
(with props)
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/multimoduleProject/pom.xml
(with props)
Modified:
maven/shared/trunk/maven-dependency-analyzer/pom.xml
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1635191&r1=1635190&r2=1635191&view=diff
==
--- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Wed Oct 29 16:33:52
2014
@@ -91,7 +91,7 @@
org.apache.maven.plugin-testing
maven-plugin-testing-tools
- 1.2
+ 1.3
test
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1635191&r1=1635190&r2=1635191&view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
Wed Oct 29 16:33:52 2014
@@ -19,11 +19,6 @@ package org.apache.maven.shared.dependen
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-
import java.io.File;
import java.io.IOException;
import java.net.URL;
@@ -37,6 +32,11 @@ import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+
/**
* @author mailto:markhob...@gmail.com";>Mark Hobson
* @version $Id$
@@ -143,10 +143,9 @@ public class DefaultProjectDependencyAna
{
File file = artifact.getFile();
-if ( file != null && ( file.getName().endsWith( ".jar" ) ||
file.isDirectory() ) )
+if ( file != null && file.getName().endsWith( ".jar" ) )
{
-//URL url = file.toURI().toURL();
-
+// optimized solution f
svn commit: r1585825 - /maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm
Author: andham Date: Tue Apr 8 20:12:27 2014 New Revision: 1585825 URL: http://svn.apache.org/r1585825 Log: [MRELEASE-873] Remove possibly confusing non-standard goals from example Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm?rev=1585825&r1=1585824&r2=1585825&view=diff == --- maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt.vm Tue Apr 8 20:12:27 2014 @@ -65,7 +65,6 @@ mvn release:perform -DconnectionUrl=scm: During release:perform, enable the "release" profile --> release - deploy assembly:single ---
svn commit: r904619 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: andham Date: Wed Apr 2 06:03:40 2014 New Revision: 904619 Log: Publishing svnmucc operation to maven site by andham Added: websites/production/maven/content/ - copied from r904618, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r904618, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r904618, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r904618, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r904618, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r904618, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r904618, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r904618, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r904618, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r904618, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r904618, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r904618, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r904618, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r904618, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r904618, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r904618, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r904618, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r904618, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r904618, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r904618, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r904618, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r904618, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r904618, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r904618, websites/production/maven/content
svn commit: r1583885 - /maven/site/trunk/content/fml/general.fml
Author: andham Date: Wed Apr 2 05:57:44 2014 New Revision: 1583885 URL: http://svn.apache.org/r1583885 Log: [MNGSITE-201] Broken links under "public repositories" FAQ item Modified: maven/site/trunk/content/fml/general.fml Modified: maven/site/trunk/content/fml/general.fml URL: http://svn.apache.org/viewvc/maven/site/trunk/content/fml/general.fml?rev=1583885&r1=1583884&r2=1583885&view=diff == --- maven/site/trunk/content/fml/general.fml (original) +++ maven/site/trunk/content/fml/general.fml Wed Apr 2 05:57:44 2014 @@ -433,10 +433,7 @@ Where: the path to the f http://search.maven.org/";>http://search.maven.org http://repository.apache.org";>http://repository.apache.org - http://www.artifact-repository.org/";>http://www.artifact-repository.org http://mvnrepository.com";>http://mvnrepository.com - http://www.mvnbrowser.com";>http://www.mvnbrowser.com - http://www.jarvana.com";>http://www.jarvana.com
svn commit: r904260 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: andham Date: Sun Mar 30 09:48:13 2014 New Revision: 904260 Log: Publishing svnmucc operation to maven site by andham Added: websites/production/maven/content/ - copied from r904259, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r904259, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r904259, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r904259, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r904259, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r904259, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r904259, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r904259, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r904259, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r904259, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r904259, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r904259, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r904259, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r904259, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r904259, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r904259, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r904259, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r904259, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r904259, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r904259, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r904259, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r904259, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r904259, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r904259, websites/production/maven/content
svn commit: r1583114 - /maven/site/trunk/content/xdoc/download.xml.vm
Author: andham
Date: Sun Mar 30 09:35:52 2014
New Revision: 1583114
URL: http://svn.apache.org/r1583114
Log:
Changes related to MNG-5610
Modified:
maven/site/trunk/content/xdoc/download.xml.vm
Modified: maven/site/trunk/content/xdoc/download.xml.vm
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/xdoc/download.xml.vm?rev=1583114&r1=1583113&r2=1583114&view=diff
==
--- maven/site/trunk/content/xdoc/download.xml.vm (original)
+++ maven/site/trunk/content/xdoc/download.xml.vm Sun Mar 30 09:35:52 2014
@@ -283,7 +283,7 @@ under the License.
All sources (plugins, shared librairies, scm, indexer etc..) can be
downloaded from http://www.apache.org/dist/maven/";>http://www.apache.org/dist/maven/
-
+
@@ -296,11 +296,13 @@ under the License.
Disk
- No minimum requirement. Approximately 100MB will be used for
your local repository, however this will vary depending on usage and can be
removed and redownloaded at any time.
+ Approximately 10MB is required for the Maven installation
itself. In addition to that, additional disk space will
+ be used for your local Maven repository. The size of your local
repository will vary depending on usage but expect at
+ least 500MB.
Operating System
- No minimum requirement. On Windows, Windows NT and above or
Cygwin is required for the startup scripts. Tested on Windows XP, Fedora Core
and Mac OS X.
+ No minimum requirement. Start up scripts are included as
shell scripts and Windows batch files.
@@ -313,7 +315,7 @@ under the License.
Additional optional installation steps are listed after the platform
specific instructions.
-
+
Unzip the distribution archive, i.e.
apache-maven-${currentStableVersion}-bin.zip to the directory you wish
to install Maven ${currentStableVersion}.
These instructions assume you chose C:\Program Files\Apache
Software Foundation.
@@ -324,7 +326,7 @@ under the License.
selecting the "Advanced" tab, and the "Environment Variables"
button, then adding the M2_HOME
variable in the user variables with the value
C:\Program Files\Apache Software
Foundation\apache-maven-${currentStableVersion}. Be sure to omit any
quotation marks around the path
- even if it contains spaces. Note: For Maven  2.0.9,
also be sure that the M2_HOME
+ even if it contains spaces. Note: For Maven 2.0.9, also be
sure that the M2_HOME
doesn't have a '\' as last character.
@@ -337,7 +339,7 @@ under the License.
Maven available in the command line.
In the same dialog, make sure that JAVA_HOME exists in
your user variables or in the system variables and it is set to the location of
your JDK,
- e.g. C:\Program Files\Java\jdk1.5.0_02 and that
%JAVA_HOME%\bin is in your Path environment variable.
+ e.g. C:\Program Files\Java\jdk1.7.0_51 and that
%JAVA_HOME%\bin is in your Path environment variable.
Open a new command prompt (Winkey + R then type
cmd) and run mvn --version to verify that it is correctly
installed.
@@ -360,7 +362,7 @@ under the License.
Add M2 environment variable to your path, e.g. export
PATH=$M2:$PATH.
Make sure that JAVA_HOME is set to the location of your
JDK, e.g.
-export JAVA_HOME=/usr/java/jdk1.5.0_02 and that
$JAVA_HOME/bin is in your PATH environment variable.
+export JAVA_HOME=/usr/java/jdk1.7.0_51 and that
$JAVA_HOME/bin is in your PATH environment variable.
Run mvn --version to verify that it is correctly
installed.
git commit: [MNG-5610] README.txt in distro should be updated
Repository: maven Updated Branches: refs/heads/master fb27b7925 -> e7d8dad4b [MNG-5610] README.txt in distro should be updated Signed-off-by: Anders Hammar Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e7d8dad4 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e7d8dad4 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e7d8dad4 Branch: refs/heads/master Commit: e7d8dad4b4af55ae699114fbe03a79c316cc2630 Parents: fb27b79 Author: Anders Hammar Authored: Sun Mar 30 11:28:13 2014 +0200 Committer: Anders Hammar Committed: Sun Mar 30 11:28:13 2014 +0200 -- apache-maven/README.txt | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/e7d8dad4/apache-maven/README.txt -- diff --git a/apache-maven/README.txt b/apache-maven/README.txt index a07997a..668fb31 100644 --- a/apache-maven/README.txt +++ b/apache-maven/README.txt @@ -27,30 +27,30 @@ Memory: No minimum requirement. Disk: -No minimum requirement. Approximately 100MB will be used for your local repository, -however this will vary depending on usage and can be removed and redownloaded at -any time. +Approximately 10MB is required for the Maven installation itself. In addition to +that, additional disk space will be used for your local Maven repository. The size +of your local repository will vary depending on usage but expect at least 500MB. Operating System: -No minimum requirement. On Windows, Windows NT and above or Cygwin is required for -the startup scripts. Tested on Windows XP, Fedora Core and Mac OS X. +No minimum requirement. Start up scripts are included as shell scripts and Windows +batch files. Installing Maven 1) Unpack the archive where you would like to store the binaries, eg: -Unix-based Operating Systems (Linux, Solaris and Mac OS X) +Unix-based operating systems (Linux, Solaris and Mac OS X) tar zxvf apache-maven-3.x.y.tar.gz -Windows 2000/XP +Windows unzip apache-maven-3.x.y.zip 2) A directory called "apache-maven-3.x.y" will be created. 3) Add the bin directory to your PATH, eg: -Unix-based Operating Systems (Linux, Solaris and Mac OS X) +Unix-based operating systems (Linux, Solaris and Mac OS X) export PATH=/usr/local/apache-maven-3.x.y/bin:$PATH -Windows 2000/XP +Windows set PATH="c:\program files\apache-maven-3.x.y\bin";%PATH% 4) Make sure JAVA_HOME is set to the location of your JDK @@ -62,7 +62,7 @@ Licensing - - Please see the file called LICENSE.TXT + Please see the file called LICENSE. Maven URLS --
svn commit: r904054 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: andham Date: Fri Mar 28 12:45:47 2014 New Revision: 904054 Log: Publishing svnmucc operation to maven site by andham Added: websites/production/maven/content/ - copied from r904053, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r904053, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r904053, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r904053, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r904053, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r904053, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r904053, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r904053, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r904053, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r904053, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r904053, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r904053, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r904053, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r904053, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r904053, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r904053, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r904053, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r904053, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r904053, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r904053, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r904053, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r904053, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r904053, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r904053, websites/production/maven/content
svn commit: r1582729 - /maven/site/trunk/content/xdoc/download.xml.vm
Author: andham Date: Fri Mar 28 12:34:59 2014 New Revision: 1582729 URL: http://svn.apache.org/r1582729 Log: Set Installation section id to fix existing links Modified: maven/site/trunk/content/xdoc/download.xml.vm Modified: maven/site/trunk/content/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/maven/site/trunk/content/xdoc/download.xml.vm?rev=1582729&r1=1582728&r2=1582729&view=diff == --- maven/site/trunk/content/xdoc/download.xml.vm (original) +++ maven/site/trunk/content/xdoc/download.xml.vm Fri Mar 28 12:34:59 2014 @@ -306,7 +306,7 @@ under the License. - + Maven is a Java tool, so you must have http://www.oracle.com/technetwork/java/";>Java installed in order to proceed. More precisely, you need a Java Development Kit (JDK), the Java Runtime Environment (JRE) is not sufficient.
svn commit: r1582731 - /maven/site/trunk/content/apt/developers/release/pmc-gpg-keys.apt
Author: andham
Date: Fri Mar 28 12:41:07 2014
New Revision: 1582731
URL: http://svn.apache.org/r1582731
Log:
Fixed errors reported by APT.
Modified:
maven/site/trunk/content/apt/developers/release/pmc-gpg-keys.apt
Modified: maven/site/trunk/content/apt/developers/release/pmc-gpg-keys.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/release/pmc-gpg-keys.apt?rev=1582731&r1=1582730&r2=1582731&view=diff
==
--- maven/site/trunk/content/apt/developers/release/pmc-gpg-keys.apt (original)
+++ maven/site/trunk/content/apt/developers/release/pmc-gpg-keys.apt Fri Mar 28
12:41:07 2014
@@ -168,6 +168,6 @@ uid Vincent Siveton https://id.apache.org}}, log in and fill {{OpenPGP Public Key Primary
Fingerprint:}} with the value of {{Key fingerprint}}.
+ Go to {{https://id.apache.org}}, log in and fill <<>> with the value of <<>>.
You can read more about
{{{http://www.apache.org/dev/release-signing.html#faq}Checksums And
Signatures}} and
{{{https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven}
How to Generate PGP Signatures With Maven}}
git commit: [MNG-5609] README.txt in distro incorrectly states JDK requirement as 1.5+
Repository: maven Updated Branches: refs/heads/master 64c419506 -> a084de9c9 [MNG-5609] README.txt in distro incorrectly states JDK requirement as 1.5+ Signed-off-by: Anders Hammar Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a084de9c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a084de9c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a084de9c Branch: refs/heads/master Commit: a084de9c98c6a926c7d561181ffabefa9ba83ed1 Parents: 64c4195 Author: Anders Hammar Authored: Tue Mar 25 22:21:14 2014 +0100 Committer: Anders Hammar Committed: Tue Mar 25 22:21:14 2014 +0100 -- apache-maven/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a084de9c/apache-maven/README.txt -- diff --git a/apache-maven/README.txt b/apache-maven/README.txt index dc55c01..a07997a 100644 --- a/apache-maven/README.txt +++ b/apache-maven/README.txt @@ -22,7 +22,7 @@ --- JDK: -1.5 or above (this is to execute Maven - it still allows you to build against 1.3 +1.6 or above (this is to execute Maven - it still allows you to build against 1.3 and prior JDK's). Memory: No minimum requirement.
svn commit: r898995 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: andham Date: Mon Feb 24 08:33:04 2014 New Revision: 898995 Log: Publishing svnmucc operation to maven site by andham Added: websites/production/maven/content/ - copied from r898994, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r898994, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r898994, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r898994, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r898994, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r898994, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r898994, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r898994, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r898994, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r898994, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r898994, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r898994, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r898994, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r898994, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r898994, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r898994, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r898994, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r898994, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r898994, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r898994, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r898994, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r898994, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r898994, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r898994, websites/production/maven/content
svn commit: r1571166 - /maven/site/trunk/content/xdoc/download.xml.vm
Author: andham Date: Mon Feb 24 08:28:38 2014 New Revision: 1571166 URL: http://svn.apache.org/r1571166 Log: Stated JDK 1.6 requirement for Maven 3.2 Modified: maven/site/trunk/content/xdoc/download.xml.vm Modified: maven/site/trunk/content/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/maven/site/trunk/content/xdoc/download.xml.vm?rev=1571166&r1=1571165&r2=1571166&view=diff == --- maven/site/trunk/content/xdoc/download.xml.vm (original) +++ maven/site/trunk/content/xdoc/download.xml.vm Mon Feb 24 08:28:38 2014 @@ -288,7 +288,7 @@ under the License. JDK - 1.5 or above (this is to execute Maven - it still allows you to build against 1.3 and prior JDK's) + Maven 3.2 requires JDK 1.6 or above, while Maven 3.0/3.1 requires JDK 1.5 or above (this is to execute Maven - it still allows you to build against 1.3 and prior JDK's) Memory
svn commit: r898990 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr-archiv
Author: andham Date: Mon Feb 24 08:00:22 2014 New Revision: 898990 Log: Publishing svnmucc operation to maven site by andham Added: websites/production/maven/content/ - copied from r898989, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r898989, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r898989, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r898989, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r898989, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r898989, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r898989, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r898989, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r898989, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r898989, websites/production/maven/content/jxr/ websites/production/maven/content/jxr-archives/ - copied from r898989, websites/production/maven/content/jxr-archives/ websites/production/maven/content/maven-1.x/ - copied from r898989, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r898989, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r898989, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r898989, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r898989, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r898989, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r898989, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-testing-archives/ - copied from r898989, websites/production/maven/content/plugin-testing-archives/ websites/production/maven/content/plugin-tools/ - copied from r898989, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r898989, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r898989, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r898989, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r898989, websites/production/maven/content
svn commit: r1571160 - /maven/site/trunk/content/xdoc/download.xml.vm
Author: andham Date: Mon Feb 24 07:54:16 2014 New Revision: 1571160 URL: http://svn.apache.org/r1571160 Log: Fixed incorrect description of Maven 3.1 version Modified: maven/site/trunk/content/xdoc/download.xml.vm Modified: maven/site/trunk/content/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/maven/site/trunk/content/xdoc/download.xml.vm?rev=1571160&r1=1571159&r2=1571160&view=diff == --- maven/site/trunk/content/xdoc/download.xml.vm (original) +++ maven/site/trunk/content/xdoc/download.xml.vm Mon Feb 24 07:54:16 2014 @@ -159,7 +159,7 @@ under the License. -This is a stable version 3.0.x of Maven for projects that can't upgrade to Maven 3.1 yet. +This is a stable version 3.1.x of Maven. @@ -213,7 +213,7 @@ under the License. -This is a stable version 3.0.x of Maven for projects that can't upgrade to Maven 3.1 yet. +This is a stable version 3.0.x of Maven for projects that can't upgrade to Maven 3.2 yet.
svn commit: r1544314 - /maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
Author: andham
Date: Thu Nov 21 20:22:44 2013
New Revision: 1544314
URL: http://svn.apache.org/r1544314
Log:
Clarified that m2e is the preferred way for integrate Maven in Eclipse
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm?rev=1544314&r1=1544313&r2=1544314&view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
Thu Nov 21 20:22:44 2013
@@ -23,9 +23,10 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Eclipse and Maven Integration
+Eclipse and Maven Integration (without m2e)
This page describes how to integrate an EAR project in Eclipse or
Eclipse-based IDE <> {{{http://www.eclipse.org/m2e/}m2e}} support.
+ Normally however, using m2e (and m2e-wtp) should be the preferred way to
integrate Maven and Eclipse. But in some rare cases that might not be possible.
If you have used <<>> to generate the metadata for an
EAR project, it will want the <<>> file in the
<<>> directory.
svn commit: r1544297 - /maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Thu Nov 21 19:41:31 2013
New Revision: 1544297
URL: http://svn.apache.org/r1544297
Log:
Added missing link to Eclipse and Maven Integration example
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm?rev=1544297&r1=1544296&r2=1544297&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm Thu Nov 21
19:41:31 2013
@@ -133,4 +133,6 @@ ${project.name}
* {{{./examples/using-app-client.html} Using JavaEE application clients}}
+ * {{{./examples/eclipse-and-maven-integration.html} Eclipse and Maven
integration (without m2e)}}
+
[]
svn commit: r1544296 - /maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
Author: andham
Date: Thu Nov 21 19:36:06 2013
New Revision: 1544296
URL: http://svn.apache.org/r1544296
Log:
[MEAR-178] Change "J2EE" and sun link on index page
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm?rev=1544296&r1=1544295&r2=1544296&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/index.apt.vm Thu Nov 21
19:36:06 2013
@@ -28,7 +28,7 @@
${project.name}
- This plugin generates J2EE Enterprise Archive (EAR) file. It can also
generate
+ This plugin generates Java EE Enterprise Archive (EAR) file. It can also
generate
the deployment descriptor file (e.g. application.xml).
The EAR plugin supports the following artifacts:
@@ -60,8 +60,8 @@ ${project.name}
For available configuration options for these artifacts, please see the
{{{./modules.html}modules configuration}}.
- For more information about the J2EE technology, please visit
- {{http://java.sun.com/developer/technicalArticles/J2EE/Intro}}.
+ For more information about the Java EE technology, please visit
+
{{http://www.oracle.com/us/technologies/java/enterprise-edition/overview/index.html}}.
* Goals Overview
svn commit: r1544293 - /maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
Author: andham
Date: Thu Nov 21 19:19:56 2013
New Revision: 1544293
URL: http://svn.apache.org/r1544293
Log:
Changed to correct name of m2e and added link to m2e project page.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
Modified:
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm?rev=1544293&r1=1544292&r2=1544293&view=diff
==
---
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/site/apt/examples/eclipse-and-maven-integration.apt.vm
Thu Nov 21 19:19:56 2013
@@ -25,7 +25,7 @@
Eclipse and Maven Integration
- This page describes how to integrate an EAR project in Eclipse or
Eclipse-based IDE <> M2Eclipse support.
+ This page describes how to integrate an EAR project in Eclipse or
Eclipse-based IDE <> {{{http://www.eclipse.org/m2e/}m2e}} support.
If you have used <<>> to generate the metadata for an
EAR project, it will want the <<>> file in the
<<>> directory.
@@ -45,7 +45,7 @@ Eclipse and Maven Integration
++
- Obviously this does not have the typical Maven based version naming
convention applied to it. This allows us to run the application internally
within eclipse/rsa using the test environments.
+ Obviously this does not have the typical Maven based version naming
convention applied to it. This allows us to run the application internally
within Eclipse using the test environments.
When Maven is used to create the ear using <<>>, it will create
the versionized <<>> file, if told to.
However, by default it will not pick up the generated (versionized) one, it
will use the existing one in the <<>> directory.
svn commit: r1543576 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: andham
Date: Tue Nov 19 21:03:25 2013
New Revision: 1543576
URL: http://svn.apache.org/r1543576
Log:
Upgraded plexus deps
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1543576&r1=1543575&r2=1543576&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Tue Nov 19 21:03:25 2013
@@ -84,15 +84,6 @@ under the License.
plugins-archives/${project.artifactId}-LATEST
-
-
-
-org.codehaus.plexus
-plexus-io
-2.0.9
-
-
-
org.apache.maven
@@ -128,7 +119,7 @@ under the License.
org.codehaus.plexus
plexus-archiver
- 2.4.3
+ 2.4.4
org.codehaus.plexus
svn commit: r1543563 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: andham
Date: Tue Nov 19 20:37:54 2013
New Revision: 1543563
URL: http://svn.apache.org/r1543563
Log:
Cleaned up based on dependency:analyze
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1543563&r1=1543562&r2=1543563&view=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Tue Nov 19 20:37:54 2013
@@ -84,6 +84,15 @@ under the License.
plugins-archives/${project.artifactId}-LATEST
+
+
+
+org.codehaus.plexus
+plexus-io
+2.0.9
+
+
+
org.apache.maven
@@ -123,11 +132,6 @@ under the License.
org.codehaus.plexus
- plexus-io
- 2.0.9
-
-
- org.codehaus.plexus
plexus-container-default
1.0-alpha-9-stable-1
svn commit: r1541097 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc: AbstractJavadocMojo.java JavadocJar.java
Author: andham
Date: Tue Nov 12 15:11:30 2013
New Revision: 1541097
URL: http://svn.apache.org/r1541097
Log:
[MJAVADOC-380] Add Maven version used to Created-By entry in manifest
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
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=1541097&r1=1541096&r2=1541097&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
Tue Nov 12 15:11:30 2013
@@ -317,7 +317,7 @@ public abstract class AbstractJavadocMoj
* toolchain manager API calls.
*/
@Component
-private MavenSession session;
+protected MavenSession session;
/**
* The Maven Settings.
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?rev=1541097&r1=1541096&r2=1541097&view=diff
==
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
Tue Nov 12 15:11:30 2013
@@ -289,7 +289,7 @@ public class JavadocJar
{
// we don't want Maven stuff
archive.setAddMavenDescriptor( false );
-archiver.createArchive( project, archive );
+archiver.createArchive( session, project, archive );
}
catch ( ManifestException e )
{
svn commit: r1540964 - /maven/plugins/trunk/maven-jar-plugin/pom.xml
Author: andham
Date: Tue Nov 12 08:09:03 2013
New Revision: 1540964
URL: http://svn.apache.org/r1540964
Log:
[MJAR-173] Check correctness of declared deps
Modified:
maven/plugins/trunk/maven-jar-plugin/pom.xml
Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1540964&r1=1540963&r2=1540964&view=diff
==
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Tue Nov 12 08:09:03 2013
@@ -69,6 +69,15 @@ under the License.
3.2
+
+
+
+org.codehaus.plexus
+plexus-utils
+3.0.15
+
+
+
org.apache.maven
@@ -77,14 +86,13 @@ under the License.
org.apache.maven
- maven-project
+ maven-core
${mavenVersion}
org.apache.maven
- maven-model
+ maven-project
${mavenVersion}
- runtime
org.apache.maven
@@ -119,27 +127,11 @@ under the License.
- commons-lang
- commons-lang
- 2.1
-
-
- org.codehaus.plexus
- plexus-utils
- 3.0.15
-
-
org.apache.maven.plugin-testing
maven-plugin-testing-harness
1.2
test
-
- junit
- junit
- 3.8.2
- test
-
svn commit: r1537603 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/script-global-vars/src/it/beanshell/ it/script-global-vars/src/it/groovy/ main/java/org/apache/maven/plugin/invoker/ site/ap
Author: andham
Date: Thu Oct 31 19:54:54 2013
New Revision: 1537603
URL: http://svn.apache.org/r1537603
Log:
[MINVOKER-122] Import information into groovy scripts of the running Maven
environment
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/setup.bsh
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/setup.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/setup.bsh?rev=1537603&r1=1537602&r2=1537603&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/setup.bsh
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/setup.bsh
Thu Oct 31 19:54:54 2013
@@ -17,6 +17,18 @@ try
System.out.println( "Global script variable not defined:
localRepositoryPath" );
return false;
}
+
+System.out.println( mavenVersion );
+if ( mavenVersion == null )
+{
+System.out.println( "Global script variable not defined: mavenVersion"
);
+return false;
+}
+if ( mavenVersion.trim().equals( "" ) )
+{
+System.out.println( "Global script variable empty: mavenVersion" );
+return false;
+}
}
catch( Throwable t )
{
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/verify.bsh?rev=1537603&r1=1537602&r2=1537603&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/verify.bsh
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/beanshell/verify.bsh
Thu Oct 31 19:54:54 2013
@@ -17,6 +17,18 @@ try
System.out.println( "Global script variable not defined:
localRepositoryPath" );
return false;
}
+
+System.out.println( mavenVersion );
+if ( mavenVersion == null )
+{
+System.out.println( "Global script variable not defined: mavenVersion"
);
+return false;
+}
+if ( mavenVersion.trim().equals( "" ) )
+{
+System.out.println( "Global script variable empty: mavenVersion" );
+return false;
+}
}
catch( Throwable t )
{
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy?rev=1537603&r1=1537602&r2=1537603&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/setup.groovy
Thu Oct 31 19:54:54 2013
@@ -17,6 +17,18 @@ try
println "Global script variable not defined: localRepositoryPath"
return false
}
+
+println mavenVersion
+if ( !mavenVersion )
+{
+println "Global script variable not defined: mavenVersion"
+return false
+}
+if ( !mavenVersion?.trim() )
+{
+println "Global script variable empty: mavenVersion"
+return false
+}
}
catch( Throwable t )
{
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy?rev=1537603&r1=1537602&r2=1537603&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-global-vars/src/it/groovy/verify.groovy
Thu Oct 31 19:54:54 2013
@@ -17,6 +17,18 @@ try
println "Global script variable not defined: localRepositoryPath"
return false
svn commit: r1535008 - /maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh
Author: andham
Date: Wed Oct 23 12:53:34 2013
New Revision: 1535008
URL: http://svn.apache.org/r1535008
Log:
Fixed TODO; replaced calculation of local repo path with injected variable
Modified:
maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh
Modified: maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh?rev=1535008&r1=1535007&r2=1535008&view=diff
==
--- maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh
(original)
+++ maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh Wed
Oct 23 12:53:34 2013
@@ -31,16 +31,7 @@ try
return false;
}
-// TODO: Use variable localRepositoryPath once MINVOKER-49 is released
-File localRepoDir = new File( basedir.getParentFile().getParentFile(),
"local-repo" );
-System.out.println( "Checking for existence of " + localRepoDir );
-if ( !localRepoDir.isDirectory() )
-{
-System.out.println( "FAILURE!" );
-return false;
-}
-
-File attachedFile = new File( localRepoDir,
"org/apache/maven/its/ejb/jar-attached/1.0-SNAPSHOT/jar-attached-1.0-SNAPSHOT-sources.jar"
);
+File attachedFile = new File( localRepositoryPath,
"org/apache/maven/its/ejb/jar-attached/1.0-SNAPSHOT/jar-attached-1.0-SNAPSHOT-sources.jar"
);
System.out.println( "Checking for existence of " + attachedFile );
if ( !attachedFile.isFile() )
{
svn commit: r1535005 - in /maven/plugins/trunk/maven-source-plugin: ./ src/it/MSOURCES-62/ src/it/MSOURCES-64/ src/it/jar-attached/ src/it/jar-classifier/ src/it/jar-includes-excludes/ src/it/jar-no-f
Author: andham Date: Wed Oct 23 12:45:23 2013 New Revision: 1535005 URL: http://svn.apache.org/r1535005 Log: Upgraded m-invoker-p and aligned ITs on things like groupId, etc. Modified: maven/plugins/trunk/maven-source-plugin/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-64/verify.groovy maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/jar-attached/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/jar-classifier/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/jar-includes-excludes/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/jar-no-fork/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/jar-with-archive-config/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/jar/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/project-without-sources/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/test-jar-classifier/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/test-jar-generated/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/pom.xml maven/plugins/trunk/maven-source-plugin/src/it/test-jar-no-fork/verify.bsh maven/plugins/trunk/maven-source-plugin/src/it/test-jar/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Wed Oct 23 12:45:23 2013 @@ -183,7 +183,7 @@ under the License. maven-invoker-plugin - 1.6 + 1.8 true src/it Modified: maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml?rev=1535005&r1=1535004&r2=1535005&view=diff == --- maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/src/it/MSOURCES-62/pom.xml Wed Oct 23 12:45:23 2013 @@ -1,4 +1,4 @@ - +
svn commit: r1534999 - in /maven/plugins/trunk/maven-source-plugin/src: it/manifest-content/ it/manifest-content/src/ it/manifest-content/src/main/ it/manifest-content/src/main/java/ main/java/org/apa
Author: andham
Date: Wed Oct 23 12:10:21 2013
New Revision: 1534999
URL: http://svn.apache.org/r1534999
Log:
[MSOURCES-68] Add Maven version used to Created-By entry in manifest
Added:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties
(with props)
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml
(with props)
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/src/
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/src/main/
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/src/main/java/
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/src/main/java/MyClass.java
(with props)
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Added:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties?rev=1534999&view=auto
==
---
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties
(added)
+++
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties
Wed Oct 23 12:10:21 2013
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:jar
Propchange:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties
--
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/invoker.properties
--
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml?rev=1534999&view=auto
==
--- maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml
(added)
+++ maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml Wed
Oct 23 12:10:21 2013
@@ -0,0 +1,47 @@
+
+
+
+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
+
+ org.apache.maven.its.ejb
+ manifest-content
+ 1.0-SNAPSHOT
+
+ Test of manifest file content in created sources jar
+
+
+UTF-8
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ @project.version@
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml
--
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/pom.xml
--
svn:mime-type = text/plain
Added:
maven/plugins/trunk/maven-source-plugin/src/it/manifest-content/src/main/java/MyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/it/manifest-
svn commit: r1534990 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm
Author: andham Date: Wed Oct 23 11:33:51 2013 New Revision: 1534990 URL: http://svn.apache.org/r1534990 Log: fixed grammar Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm?rev=1534990&r1=1534989&r2=1534990&view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm Wed Oct 23 11:33:51 2013 @@ -329,7 +329,7 @@ Using maven-site-plugin with Maven 3 a plugin providing multiple report goals, in Maven 2, reports configured in child pom are added to reports from parent, whereas in Maven 3 up to 3.0.3 reports from child replace reports from parent. Since 3.0.4, though, inheritance of reports works - back like Maven 2. + in the same way as with Maven 2. For example, given a multi module build where the parent POM has the <<>> report configured and the child POM has the <<>> report configured for
svn commit: r1534987 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm
Author: andham Date: Wed Oct 23 11:26:39 2013 New Revision: 1534987 URL: http://svn.apache.org/r1534987 Log: Fixed typo Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm?rev=1534987&r1=1534986&r2=1534987&view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm Wed Oct 23 11:26:39 2013 @@ -47,7 +47,7 @@ Using maven-site-plugin with Maven 3 ** Plugins Maintained by the Apache Maven Community Tests have been made on the reporting profile of the Maven parent POM which enables some reports. - You will need so update some of these plugins for them to work with Maven 3. Below you will find the minimum version + You will need to update some of these plugins for them to work with Maven 3. Below you will find the minimum version required for these plugins to work in Maven 3. *---+---+
svn commit: r1531239 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
Author: andham
Date: Fri Oct 11 09:28:06 2013
New Revision: 1531239
URL: http://svn.apache.org/r1531239
Log:
Added missing Generics
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java?rev=1531239&r1=1531238&r2=1531239&view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
Fri Oct 11 09:28:06 2013
@@ -62,7 +62,7 @@ public abstract class AbstractDeployMojo
* Map that contains the layouts.
*/
@Component( role = ArtifactRepositoryLayout.class )
-private Map repositoryLayouts;
+private Map repositoryLayouts;
/**
*/
@@ -124,7 +124,7 @@ public abstract class AbstractDeployMojo
ArtifactRepositoryLayout getLayout( String id )
throws MojoExecutionException
{
-ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout)
repositoryLayouts.get( id );
+ArtifactRepositoryLayout layout = repositoryLayouts.get( id );
if ( layout == null )
{
svn commit: r873286 - in /websites/production/maven/content: ./ ant-tasks-archives/ ant-tasks/ apache-resource-bundles/ archetype-archives/ archetype/ core-its/ enforcer-archives/ enforcer/ jxr/ maven
Author: andham Date: Wed Aug 7 06:40:01 2013 New Revision: 873286 Log: Publishing svnmucc operation to maven site by andham Added: websites/production/maven/content/ - copied from r873285, websites/staging/maven/trunk/content/ websites/production/maven/content/ant-tasks/ - copied from r873285, websites/production/maven/content/ant-tasks/ websites/production/maven/content/ant-tasks-archives/ - copied from r873285, websites/production/maven/content/ant-tasks-archives/ websites/production/maven/content/apache-resource-bundles/ - copied from r873285, websites/production/maven/content/apache-resource-bundles/ websites/production/maven/content/archetype/ - copied from r873285, websites/production/maven/content/archetype/ websites/production/maven/content/archetype-archives/ - copied from r873285, websites/production/maven/content/archetype-archives/ websites/production/maven/content/core-its/ - copied from r873285, websites/production/maven/content/core-its/ websites/production/maven/content/enforcer/ - copied from r873285, websites/production/maven/content/enforcer/ websites/production/maven/content/enforcer-archives/ - copied from r873285, websites/production/maven/content/enforcer-archives/ websites/production/maven/content/jxr/ - copied from r873285, websites/production/maven/content/jxr/ websites/production/maven/content/maven-1.x/ - copied from r873285, websites/production/maven/content/maven-1.x/ websites/production/maven/content/maven-archetype-bundles/ - copied from r873285, websites/production/maven/content/maven-archetype-bundles/ websites/production/maven/content/maven-indexer/ - copied from r873285, websites/production/maven/content/maven-indexer/ websites/production/maven/content/maven-indexer-archives/ - copied from r873285, websites/production/maven/content/maven-indexer-archives/ websites/production/maven/content/maven-release/ - copied from r873285, websites/production/maven/content/maven-release/ websites/production/maven/content/maven-release-archives/ - copied from r873285, websites/production/maven/content/maven-release-archives/ websites/production/maven/content/plugin-testing/ - copied from r873285, websites/production/maven/content/plugin-testing/ websites/production/maven/content/plugin-tools/ - copied from r873285, websites/production/maven/content/plugin-tools/ websites/production/maven/content/plugin-tools-archives/ - copied from r873285, websites/production/maven/content/plugin-tools-archives/ websites/production/maven/content/plugins-archives/ - copied from r873285, websites/production/maven/content/plugins-archives/ websites/production/maven/content/plugins/maven-acr-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-acr-plugin/ websites/production/maven/content/plugins/maven-ant-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-ant-plugin/ websites/production/maven/content/plugins/maven-antrun-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-antrun-plugin/ websites/production/maven/content/plugins/maven-archetype-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-archetype-plugin/ websites/production/maven/content/plugins/maven-assembly-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-assembly-plugin/ websites/production/maven/content/plugins/maven-changelog-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-changelog-plugin/ websites/production/maven/content/plugins/maven-changes-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-changes-plugin/ websites/production/maven/content/plugins/maven-checkstyle-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-checkstyle-plugin/ websites/production/maven/content/plugins/maven-clean-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-clean-plugin/ websites/production/maven/content/plugins/maven-compiler-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-compiler-plugin/ websites/production/maven/content/plugins/maven-dependency-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-dependency-plugin/ websites/production/maven/content/plugins/maven-deploy-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-deploy-plugin/ websites/production/maven/content/plugins/maven-doap-plugin/ - copied from r873285, websites/production/maven/content/plugins/maven-doap-plugin/ websites/production/maven/content/plugins/maven-docck-plugin/ - copied from r873285
svn commit: r1511191 - /maven/site/trunk/content/xdoc/download.xml.vm
Author: andham Date: Wed Aug 7 06:34:31 2013 New Revision: 1511191 URL: http://svn.apache.org/r1511191 Log: MNGSITE-186: Link to Maven 3 compatibility notes is broken Modified: maven/site/trunk/content/xdoc/download.xml.vm Modified: maven/site/trunk/content/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/maven/site/trunk/content/xdoc/download.xml.vm?rev=1511191&r1=1511190&r2=1511191&view=diff == --- maven/site/trunk/content/xdoc/download.xml.vm (original) +++ maven/site/trunk/content/xdoc/download.xml.vm Wed Aug 7 06:34:31 2013 @@ -46,7 +46,7 @@ under the License. We strongly encourage our users to configure a Maven repository mirror closer to their location, please read How to Use Mirrors for Repositories. Be sure to check the - http://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html";>compatibility notes + https://cwiki.apache.org/confluence/display/MAVEN/Maven+3.x+Compatibility+Notes";>compatibility notes before using this version to avoid surprises. While Maven 3 aims to be backward-compatible with Maven 2.x to the extent possible, there are still a few significant changes.
svn commit: r1469776 - /maven/archetype/trunk/pom.xml
Author: andham Date: Fri Apr 19 10:52:11 2013 New Revision: 1469776 URL: http://svn.apache.org/r1469776 Log: Upgraded to maven-plugin-plugin v3.2 Modified: maven/archetype/trunk/pom.xml Modified: maven/archetype/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1469776&r1=1469775&r2=1469776&view=diff == --- maven/archetype/trunk/pom.xml (original) +++ maven/archetype/trunk/pom.xml Fri Apr 19 10:52:11 2013 @@ -74,7 +74,7 @@ under the License. 2.0.8 true -3.1 +3.2 1.0
svn commit: r1469768 - /maven/archetype/trunk/archetype-common/pom.xml
Author: andham Date: Fri Apr 19 09:53:01 2013 New Revision: 1469768 URL: http://svn.apache.org/r1469768 Log: Corrections to the maven-antrun-plugin configuration, including changing the 'tasks' param Modified: maven/archetype/trunk/archetype-common/pom.xml Modified: maven/archetype/trunk/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=1469768&r1=1469767&r2=1469768&view=diff == --- maven/archetype/trunk/archetype-common/pom.xml (original) +++ maven/archetype/trunk/archetype-common/pom.xml Fri Apr 19 09:53:01 2013 @@ -246,21 +246,21 @@ under the License. archetype-test process-test-resources - + - - + + - + run @@ -271,21 +271,21 @@ under the License. archetype-test-partial process-test-resources - + - - + + - + run @@ -296,21 +296,21 @@ under the License. archetype-test-site process-test-resources - + - - + + - + run @@ -321,21 +321,21 @@ under the License. archetype-test-old process-test-resources - + - - + + - + run @@ -346,21 +346,21 @@ under the License. archetype-test-fileset process-test-resources - + - - + + - + run @@ -371,13 +371,13 @@ under the License. repository-metadata process-test-resources - + - - + + run
svn commit: r1469757 - /maven/archetype/trunk/pom.xml
Author: andham
Date: Fri Apr 19 09:30:41 2013
New Revision: 1469757
URL: http://svn.apache.org/r1469757
Log:
Updated to maven-parent v23 and did some pom cleanup (removed unnecessary user
list declarations etc.)
Modified:
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1469757&r1=1469756&r2=1469757&view=diff
==
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Fri Apr 19 09:30:41 2013
@@ -25,7 +25,7 @@ under the License.
org.apache.maven
maven-parent
-22
+23
org.apache.maven.archetype
@@ -50,78 +50,6 @@ under the License.
archetype-packaging
-
-
- Maven User List
- users-subscr...@maven.apache.org
- users-unsubscr...@maven.apache.org
- us...@maven.apache.org
- http://mail-archives.apache.org/mod_mbox/maven-users
-
-
http://www.mail-archive.com/users@maven.apache.org/
-
http://old.nabble.com/Maven---Users-f178.html
-http://maven.users.markmail.org/
-
-
-
- Maven Developer List
- dev-subscr...@maven.apache.org
- dev-unsubscr...@maven.apache.org
- d...@maven.apache.org
- http://mail-archives.apache.org/mod_mbox/maven-dev
-
-
http://www.mail-archive.com/dev@maven.apache.org/
-
http://old.nabble.com/Maven-Developers-f179.html
-http://maven.dev.markmail.org/
-
-
-
- Maven Issues List
- issues-subscr...@maven.apache.org
- issues-unsubscr...@maven.apache.org
- http://mail-archives.apache.org/mod_mbox/maven-issues/
-
-
http://www.mail-archive.com/issues@maven.apache.org
-
http://old.nabble.com/Maven---Issues-f15573.html
-http://maven.issues.markmail.org/
-
-
-
- Maven Commits List
- commits-subscr...@maven.apache.org
- commits-unsubscr...@maven.apache.org
- http://mail-archives.apache.org/mod_mbox/maven-dev
-
-
http://www.mail-archive.com/commits@maven.apache.org
-
http://old.nabble.com/Maven---Commits-f15575.html
-http://maven.commits.markmail.org/
-
-
-
- Maven Announcements List
- annou...@maven.apache.org
- announce-subscr...@maven.apache.org
- announce-unsubscr...@maven.apache.org
-
http://mail-archives.apache.org/mod_mbox/maven-announce/
-
-
http://www.mail-archive.com/announce@maven.apache.org
-
http://old.nabble.com/Maven-Announcements-f15617.html
-http://maven.announce.markmail.org/
-
-
-
- Maven Notifications List
- notifications-subscr...@maven.apache.org
- notifications-unsubscr...@maven.apache.org
-
http://mail-archives.apache.org/mod_mbox/maven-notifications/
-
-
http://www.mail-archive.com/notifications@maven.apache.org
-
http://old.nabble.com/Maven---Notifications-f15574.html
-http://maven.notifications.markmail.org/
-
-
-
-
scm:svn:http://svn.apache.org/repos/asf/maven/archetype/trunk
scm:svn:https://svn.apache.org/repos/asf/maven/archetype/trunk
@@ -133,7 +61,7 @@ under the License.
Jenkins
-https://builds.apache.org/job/maven-archetype/
+https://builds.apache.org/job/maven-archetype-m3/
@@ -314,6 +242,7 @@ under the License.
${mavenPluginPluginVersion}
+ org.apache.maven.plugins
maven-site-plugin
scp://people.apache.org/www/maven.apache.org/archetype-${project.version}
svn commit: r1469736 - /maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml
Author: andham Date: Fri Apr 19 08:15:25 2013 New Revision: 1469736 URL: http://svn.apache.org/r1469736 Log: [ARCHETYPE-431] Only include Apache Maven archetypes in internal 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=1469736&r1=1469735&r2=1469736&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 Fri Apr 19 08:15:25 2013 @@ -17,369 +17,75 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0 http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd"; - xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> +http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0 http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd"; + xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + + + - org.appfuse.archetypes - appfuse-basic-jsf - 2.0 - AppFuse archetype for creating a web application with Hibernate, Spring and JSF - - - org.appfuse.archetypes - appfuse-basic-spring - 2.0 - AppFuse archetype for creating a web application with Hibernate, Spring and Spring MVC - - - org.appfuse.archetypes - appfuse-basic-struts - 2.0 - AppFuse archetype for creating a web application with Hibernate, Spring and Struts 2 - - - org.appfuse.archetypes - appfuse-basic-tapestry - 2.0 - AppFuse archetype for creating a web application with Hibernate, Spring and Tapestry 4 - - - org.appfuse.archetypes - appfuse-core - 2.0 - AppFuse archetype for creating a jar application with Hibernate and Spring and XFire - - - org.appfuse.archetypes - appfuse-modular-jsf - 2.0 - AppFuse archetype for creating a modular application with Hibernate, Spring and JSF - - - org.appfuse.archetypes - appfuse-modular-spring - 2.0 - AppFuse archetype for creating a modular application with Hibernate, Spring and Spring MVC - - - org.appfuse.archetypes - appfuse-modular-struts - 2.0 - AppFuse archetype for creating a modular application with Hibernate, Spring and Struts 2 - - - org.appfuse.archetypes - appfuse-modular-tapestry - 2.0 - AppFuse archetype for creating a modular application with Hibernate, Spring and Tapestry 4 - - - org.makumba - makumba-archetype - RELEASE - Archetype for a simple Makumba application + org.apache.maven.archetypes + maven-archetype-archetype + 1.0 + An archetype which contains a sample archetype. org.apache.maven.archetypes maven-archetype-j2ee-simple - RELEASE - A simple J2EE Java application + 1.0 + An archetype which contains a simplifed sample J2EE application. org.apache.maven.archetypes - maven-archetype-marmalade-mojo - RELEASE - A Maven plugin development project using marmalade + maven-archetype-plugin + 1.2 + An archetype which contains a sample Maven plugin. org.apache.maven.archetypes - maven-archetype-mojo - RELEASE - A Maven Java plugin development project + maven-archetype-plugin-site + 1.1 + An archetype which contains a sample Maven plugin site. + This archetype can be layered upon an existing Maven plugin project. org.apache.maven.archetypes maven-archetype-portlet - RELEASE - A simple portlet application + 1.0.1 + An archetype which contains a sample JSR-268 Portlet. org.apache.maven.archetypes maven-archetype-profiles - RELEASE + 1.0-alpha-4 org.apache.maven.archetypes maven-archetype-quickstart - RELEASE - + 1.1 + An archetype which contains a sample Maven project. org.apache.maven.archetypes - maven-archetype-site-simple - RELEASE - A simple site generation project + maven-archetype-site + 1.1 + An archetype which contains a sample Maven si
svn commit: r1468090 - /maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
Author: andham
Date: Mon Apr 15 14:17:42 2013
New Revision: 1468090
URL: http://svn.apache.org/r1468090
Log:
Formatting
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java?rev=1468090&r1=1468089&r2=1468090&view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
Mon Apr 15 14:17:42 2013
@@ -51,12 +51,14 @@ public interface ArchetypeManager
/**
* Gives the catalog of archetypes internal to the plugin.
+ *
* @return the catalog.
*/
ArchetypeCatalog getInternalCatalog();
/**
* Gives the catalog of archetypes located in
${user.home}/.m2/repository/archetype-catalog.xml.
+ *
* @return the catalog.
*/
ArchetypeCatalog getDefaultLocalCatalog();
@@ -65,6 +67,7 @@ public interface ArchetypeManager
* Gives the catalog of archetypes located in the given path.
* if path is a file, it used as is.
* if path is a directory, archetype-catalog.xml is appended to it.
+ *
* @param path the catalog file path or directory containing the catalog
file.
* @return the catalog.
*/
@@ -72,6 +75,7 @@ public interface ArchetypeManager
/**
* Gives the catalog of archetypes located at
http://repo.maven.apache.org/maven2/archetype-catalog.xml.
+ *
* @return the catalog.
*/
ArchetypeCatalog getRemoteCatalog();
@@ -79,6 +83,7 @@ public interface ArchetypeManager
/**
* Gives the catalog of archetypes located at the given url.
* if the url doesn't define a catalog, then
'archetype-catalog.xml' is appended to it for search.
+ *
* @param url the catalog url or base url containing the catalog file.
* @return the catalog.
*/
@@ -92,7 +97,6 @@ public interface ArchetypeManager
* @param finalName
* @return The File to the generated jar
* @throws org.apache.maven.artifact.DependencyResolutionRequiredException
- *
* @throws java.io.IOException
*/
File archiveArchetype( File archetypeDirectory, File outputDirectory,
String finalName )
svn commit: r1466372 - /maven/site/trunk/content/apt/guides/introduction/introduction-to-the-pom.apt
Author: andham Date: Wed Apr 10 08:12:36 2013 New Revision: 1466372 URL: http://svn.apache.org/r1466372 Log: CMS commit to maven by andham Modified: maven/site/trunk/content/apt/guides/introduction/introduction-to-the-pom.apt Modified: maven/site/trunk/content/apt/guides/introduction/introduction-to-the-pom.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/introduction/introduction-to-the-pom.apt?rev=1466372&r1=1466371&r2=1466372&view=diff == --- maven/site/trunk/content/apt/guides/introduction/introduction-to-the-pom.apt (original) +++ maven/site/trunk/content/apt/guides/introduction/introduction-to-the-pom.apt Wed Apr 10 08:12:36 2013 @@ -322,7 +322,7 @@ Introduction to the POM +-+ In the revised com.mycompany.app:my-app:1, the packaging section and the modules sections were added. For - the packaging, it's value was set to "pom", and for the modules section, we have the element + the packaging, its value was set to "pom", and for the modules section, we have the element <<<\my-module\>>>. The value of <<<\>>> is the relative path from the com.mycompany.app:my-app:1 to com.mycompany.app:my-module:1's POM ().
svn commit: r1466370 - /maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Author: andham
Date: Wed Apr 10 08:11:25 2013
New Revision: 1466370
URL: http://svn.apache.org/r1466370
Log:
CMS commit to maven by andham
Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt?rev=1466370&r1=1466369&r2=1466370&view=diff
==
--- maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
(original)
+++ maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Wed Apr 10 08:11:25 2013
@@ -88,6 +88,6 @@ mvn site
Publish content
- * Verify staging content has been build with buildbot job
{{http://ci.apache.org/builders/maven-site-staging}} and
{{http://maven.staging.apache.org/plugins/}}
+ * Verify that the staging content has been build with buildbot job
({{http://ci.apache.org/builders/maven-site-staging}}) to
{{http://maven.staging.apache.org}}
- * Build finish, publish modifications using
{{https://cms.apache.org/maven/publish}}
\ No newline at end of file
+ * If everything is good, publish modifications using
{{https://cms.apache.org/maven/publish}}
\ No newline at end of file
svn commit: r1466358 - /maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Author: andham
Date: Wed Apr 10 07:38:41 2013
New Revision: 1466358
URL: http://svn.apache.org/r1466358
Log:
CMS commit to maven by andham
Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Modified:
maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt?rev=1466358&r1=1466357&r2=1466358&view=diff
==
--- maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
(original)
+++ maven/site/trunk/content/apt/developers/website/deploy-maven-website.apt
Wed Apr 10 07:38:41 2013
@@ -62,11 +62,11 @@ How it works
* Go to {{{https://cms.apache.org/maven/}https://cms.apache.org/maven/}}.
- * Click link "Get maven Working Copy"
+ * Click link "Get maven Working Copy".
- * Now navigate to the content you want to modify
+ * Now navigate to the content you want to modify.
- * Once you have modify the content, you can now commit with the button
"Submit".
+ * Once you have modified the content, you can now commit with the button
"Submit".
[]
svn commit: r1451600 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Author: andham
Date: Fri Mar 1 14:34:12 2013
New Revision: 1451600
URL: http://svn.apache.org/r1451600
Log:
Some clean ups
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1451600&r1=1451599&r2=1451600&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Fri Mar 1 14:34:12 2013
@@ -661,7 +661,7 @@ public abstract class AbstractInvokerMoj
catch ( IOException e )
{
throw new MojoExecutionException(
-"Failed to discover projectsDirectory from pom File
parameter." + " Reason: " + e.getMessage(), e );
+"Failed to discover projectsDirectory from pom File
parameter. Reason: " + e.getMessage(), e );
}
buildJobs = new BuildJob[]{ new BuildJob( pom.getName(),
BuildJob.Type.NORMAL ) };
@@ -675,7 +675,7 @@ public abstract class AbstractInvokerMoj
catch ( final IOException e )
{
throw new MojoExecutionException(
-"Error retrieving POM list from includes, excludes, " +
"and projects directory. Reason: "
+"Error retrieving POM list from includes, excludes, and
projects directory. Reason: "
+ e.getMessage(), e );
}
}
@@ -1161,7 +1161,6 @@ public abstract class AbstractInvokerMoj
getLog().debug(
"Created temporary file for invoker settings.xml: " +
mergedSettingsFile.getAbsolutePath() );
}
-
}
catch ( IOException e )
{
@@ -1199,7 +1198,6 @@ public abstract class AbstractInvokerMoj
{
executorService.execute( new Runnable()
{
-
public void run()
{
try
@@ -1224,7 +1222,6 @@ public abstract class AbstractInvokerMoj
{
throw new MojoExecutionException( e.getMessage(), e );
}
-
}
else
{
@@ -1244,7 +1241,6 @@ public abstract class AbstractInvokerMoj
{
mergedSettingsFile.delete();
}
-
}
}
@@ -1390,7 +1386,6 @@ public abstract class AbstractInvokerMoj
if ( executed )
{
-
buildJob.setResult( BuildJob.Result.SUCCESS );
if ( !suppressSummaries )
@@ -1756,7 +1751,7 @@ public abstract class AbstractInvokerMoj
logger = new FileLogger( outputLog );
}
-getLog().debug( "build log initialized in: " + outputLog );
+getLog().debug( "Build log initialized in: " + outputLog );
}
catch ( IOException e )
{
@@ -1965,7 +1960,10 @@ public abstract class AbstractInvokerMoj
}
BuildJob[] setupPoms = scanProjectsDirectory( setupIncludes,
excludes, BuildJob.Type.SETUP );
-getLog().debug( "Setup projects: " + Arrays.asList( setupPoms ) );
+if ( getLog().isDebugEnabled() )
+{
+getLog().debug( "Setup projects: " + Arrays.asList( setupPoms
) );
+}
BuildJob[] normalPoms = scanProjectsDirectory( pomIncludes,
excludes, BuildJob.Type.NORMAL );
svn commit: r1448947 - in /maven/plugins/trunk/maven-invoker-plugin/src: main/java/org/apache/maven/plugin/invoker/InvokerProperties.java test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTes
Author: andham
Date: Fri Feb 22 08:56:29 2013
New Revision: 1448947
URL: http://svn.apache.org/r1448947
Log:
Made class more Java 5 (switched to enum)
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java?rev=1448947&r1=1448946&r2=1448947&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
Fri Feb 22 08:56:29 2013
@@ -36,57 +36,36 @@ import org.codehaus.plexus.util.StringUt
class InvokerProperties
{
-/**
- * The invoker properties being wrapped, never null.
- */
-private final Properties properties;
-
-/**
- * The constant for the invoker property.
- */
-private static final String PROJECT = "invoker.project";
-
-/**
- * The constant for the invoker property.
- */
-private static final String GOALS = "invoker.goals";
-
-/**
- * The constant for the invoker property.
- */
-private static final String PROFILES = "invoker.profiles";
-
-/**
- * The constant for the invoker property.
- */
-private static final String MAVEN_OPTS = "invoker.mavenOpts";
-
-/**
- * The constant for the invoker property.
- */
-private static final String FAILURE_BEHAVIOR = "invoker.failureBehavior";
-
-/**
- * The constant for the invoker property.
- */
-private static final String NON_RECURSIVE = "invoker.nonRecursive";
-
-/**
- * The constant for the invoker property.
- */
-private static final String OFFLINE = "invoker.offline";
-
-/**
- * The constant for the invoker property.
- */
-private static final String SYSTEM_PROPERTIES_FILE =
"invoker.systemPropertiesFile";
+private enum InvocationProperty
+{
+PROJECT( "invoker.project" ),
+GOALS( "invoker.goals" ),
+PROFILES( "invoker.profiles" ),
+MAVEN_OPTS ( "invoker.mavenOpts" ),
+FAILURE_BEHAVIOR( "invoker.failureBehavior" ),
+NON_RECURSIVE( "invoker.nonRecursive" ),
+OFFLINE( "invoker.offline" ),
+SYSTEM_PROPERTIES_FILE( "invoker.systemPropertiesFile" ),
+DEBUG( "invoker.debug" );
+
+private final String key;
+
+private InvocationProperty(final String s)
+{
+this.key = s;
+}
+@Override
+public String toString() {
+return key;
+}
+}
/**
- * The constant for the invoker property.
+ * The invoker properties being wrapped.
*/
-private static final String DEBUG = "invoker.debug";
-
+private final Properties properties;
+
/**
* Creates a new facade for the specified invoker properties. The
properties will not be copied, so any changes to
* them will be reflected by the facade.
@@ -167,11 +146,9 @@ class InvokerProperties
*/
public boolean isInvocationDefined( int index )
{
-String[] keys =
-{ PROJECT, GOALS, PROFILES, MAVEN_OPTS, FAILURE_BEHAVIOR,
NON_RECURSIVE, OFFLINE, SYSTEM_PROPERTIES_FILE, DEBUG };
-for ( int i = 0; i < keys.length; i++ )
+for ( InvocationProperty prop : InvocationProperty.values() )
{
-if ( properties.getProperty( keys[i] + '.' + index ) != null )
+if ( properties.getProperty( prop.toString() + '.' + index ) !=
null )
{
return true;
}
@@ -188,7 +165,7 @@ class InvokerProperties
*/
public void configureInvocation( InvocationRequest request, int index )
{
-String project = get( PROJECT, index );
+String project = get( InvocationProperty.PROJECT, index );
if ( project != null )
{
File file = new File( request.getBaseDirectory(), project );
@@ -204,43 +181,43 @@ class InvokerProperties
}
}
-String goals = get( GOALS, index );
+String goals = get( InvocationProperty.GOALS, index );
if ( goals != null )
{
request.setGoals( new ArrayList( Arrays.asList
svn commit: r1448639 - /maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-project/verify.bsh
Author: andham
Date: Thu Feb 21 13:54:13 2013
New Revision: 1448639
URL: http://svn.apache.org/r1448639
Log:
Fixed typo
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-project/verify.bsh
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-project/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-project/verify.bsh?rev=1448639&r1=1448638&r2=1448639&view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-project/verify.bsh
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-project/verify.bsh
Thu Feb 21 13:54:13 2013
@@ -9,7 +9,7 @@ String[] unexpectedPaths =
for ( String path : unexpectedPaths )
{
File file = new File( new File( basedir, "target/it/project" ), path);
-System.out.println( "Creating for absence of: " + file );
+System.out.println( "Checking for absence of: " + file );
if ( file.exists() )
{
throw new IOException( "Unexpected path found: " + file );
@@ -25,7 +25,7 @@ String[] expectedPaths =
for ( String path : expectedPaths )
{
File file = new File( new File( basedir, "target/it/project" ), path);
-System.out.println( "Creating for existence of: " + file );
+System.out.println( "Checking for existence of: " + file );
if ( !file.exists() )
{
throw new IOException( "Expected path not found: " + file );
svn commit: r1448603 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/script-additional-vars/ it/script-additional-vars/src/ it/script-additional-vars/src/it/ it/script-additional-vars/src/it/be
Author: andham
Date: Thu Feb 21 11:43:55 2013
New Revision: 1448603
URL: http://svn.apache.org/r1448603
Log:
[MINVOKER-119] Allow access to properties in pre- and postBuild scripts
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/postbuild.bsh
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/prebuild.bsh
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/selector.bsh
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/groovy/
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/groovy/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/groovy/postbuild.groovy
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/groovy/prebuild.groovy
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/groovy/selector.groovy
(with props)
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml?rev=1448603&view=auto
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml
Thu Feb 21 11:43:55 2013
@@ -0,0 +1,68 @@
+
+
+
+
+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
+
+ org.apache.maven.plugins.invoker
+ script-additional-vars
+ 1.0-SNAPSHOT
+ pom
+
+
+Test to check for usage of additional hook script variables.
+
+
+
+UTF-8
+
+
+
+
+
+org.apache.maven.plugins
+maven-invoker-plugin
+@pom.version@
+
+
+*/pom.xml
+
+
+world
+${project.version}
+
+
+validate
+
+
+
+
+integration-test
+initialize
+
+ run
+
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml
--
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/pom.xml
--
svn:mime-type = text/plain
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/pom.xml?rev=1448603&view=auto
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/pom.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/pom.xml
Thu Feb 21 11:43:55 2013
@@ -0,0 +1,32 @@
+
+
+
+
+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
+ test
+ beanshell
+ 0.1-SNAPSHOT
+ pom
+
+
+UTF-8
+
+
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/script-additional-vars/src/it/beanshell/pom.xml
-
svn commit: r1448570 - /maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-scripts.apt.vm
Author: andham Date: Thu Feb 21 10:51:28 2013 New Revision: 1448570 URL: http://svn.apache.org/r1448570 Log: Fixed typo errors. Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-scripts.apt.vm Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-scripts.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-scripts.apt.vm?rev=1448570&r1=1448569&r2=1448570&view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-scripts.apt.vm (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-scripts.apt.vm Thu Feb 21 10:51:28 2013 @@ -29,7 +29,7 @@ Selector Scripts Starting with plugin version 1.5, a custom script can be used to skip individual projects based on - whatever critria are expressed in the script as illustrated in the following example. Assume the + whatever criteria expressed in the script as illustrated in the following example. Assume the following directory structure: +-- @@ -82,7 +82,7 @@ Selector Scripts If the check-assumptions.bsh script returns <<>> or does not return a value, then the project will be executed. - If the script returns any value other than <<>>, then the project will be executed. + If the script returns any value other than <<>>, then the project will not be executed. If the script throws an exception, then the project will be marked as being in ERROR.
svn commit: r1445572 - in /maven/archetype/trunk/maven-archetype-plugin/src/it: build-archetype/ create-from-project/ property-setting-cli/
Author: andham
Date: Wed Feb 13 12:37:25 2013
New Revision: 1445572
URL: http://svn.apache.org/r1445572
Log:
Replaced deprecated goals.txt with invoker.properties in ITs
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties
(with props)
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties
(with props)
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties
(with props)
Removed:
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/goals.txt
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/goals.txt
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/goals.txt
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties?rev=1445572&view=auto
==
---
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties
(added)
+++
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties
Wed Feb 13 12:37:25 2013
@@ -0,0 +1 @@
+invoker.goals = clean integration-test
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties
--
svn:eol-style = native
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties
--
svn:keywords = Author Date Id Revision
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/invoker.properties
--
svn:mime-type = text/plain
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties?rev=1445572&view=auto
==
---
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties
(added)
+++
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties
Wed Feb 13 12:37:25 2013
@@ -0,0 +1 @@
+invoker.goals = clean
org.apache.maven.plugins:maven-archetype-plugin:${project.version}:create-from-project
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties
--
svn:eol-style = native
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties
--
svn:keywords = Author Date Id Revision
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/create-from-project/invoker.properties
--
svn:mime-type = text/plain
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties?rev=1445572&view=auto
==
---
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties
(added)
+++
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties
Wed Feb 13 12:37:25 2013
@@ -0,0 +1 @@
+invoker.goals = clean integration-test
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties
--
svn:eol-style = native
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties
--
svn:keywords = Author Date Id Revision
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/invoker.properties
--
svn:mime-type = text/plain
svn commit: r1445571 - /maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy
Author: andham Date: Wed Feb 13 12:36:05 2013 New Revision: 1445571 URL: http://svn.apache.org/r1445571 Log: Added IT setup script which cleans any already created project Added: maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy (with props) Added: maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy?rev=1445571&view=auto == --- maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy (added) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy Wed Feb 13 12:36:05 2013 @@ -0,0 +1,24 @@ + +/* + * 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. + */ + +// We can't run "mvn clean" as there is no pom. So we need to remove any already +// created project before executing. +directory = new File(basedir, "project") +directory.deleteDir() Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy -- svn:eol-style = native Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/setup.groovy -- svn:keywords = Author Date Id Revision
svn commit: r1445175 - in /maven/archetype/trunk/maven-archetype-plugin: pom.xml src/it/generate-basic/ src/it/generate-basic/invoker.properties src/it/generate-basic/verify.bsh
Author: andham
Date: Tue Feb 12 14:08:48 2013
New Revision: 1445175
URL: http://svn.apache.org/r1445175
Log:
Added a basic IT for generate goal.
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties
(with props)
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/verify.bsh
(with props)
Modified:
maven/archetype/trunk/maven-archetype-plugin/pom.xml
Modified: maven/archetype/trunk/maven-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/pom.xml?rev=1445175&r1=1445174&r2=1445175&view=diff
==
--- maven/archetype/trunk/maven-archetype-plugin/pom.xml (original)
+++ maven/archetype/trunk/maven-archetype-plugin/pom.xml Tue Feb 12 14:08:48
2013
@@ -180,7 +180,7 @@ under the License.
src/it
${project.build.directory}/it
-*/pom.xml
+*
setup
verify
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties?rev=1445175&view=auto
==
---
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties
(added)
+++
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties
Tue Feb 12 14:08:48 2013
@@ -0,0 +1 @@
+invoker.goals =
org.apache.maven.plugins:maven-archetype-plugin:${project.version}:generate
-DarchetypeGroupId=org.apache.maven.archetypes
-DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.1
-DgroupId=com.company -DartifactId=project -Dversion=1.0-SNAPSHOT
-Dpackage=com.company.project
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties
--
svn:eol-style = native
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties
--
svn:keywords = Author Date Id Revision
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/invoker.properties
--
svn:mime-type = text/plain
Added:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/verify.bsh?rev=1445175&view=auto
==
---
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/verify.bsh
(added)
+++
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/verify.bsh
Tue Feb 12 14:08:48 2013
@@ -0,0 +1,29 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+
+File pom = new File( basedir, "project/pom.xml" );
+if ( !pom.isFile() )
+{
+throw new Exception( "No project created from archetype." );
+}
+
+return true;
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/verify.bsh
--
svn:eol-style = native
Propchange:
maven/archetype/trunk/maven-archetype-plugin/src/it/generate-basic/verify.bsh
--
svn:keywords = Author Date Id Revision
svn commit: r1442099 - /maven/archetype/trunk/maven-archetype-plugin/pom.xml
Author: andham Date: Mon Feb 4 13:05:21 2013 New Revision: 1442099 URL: http://svn.apache.org/viewvc?rev=1442099&view=rev Log: [ARCHETYPE-429] Removed JIRA report Modified: maven/archetype/trunk/maven-archetype-plugin/pom.xml Modified: maven/archetype/trunk/maven-archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/pom.xml?rev=1442099&r1=1442098&r2=1442099&view=diff == --- maven/archetype/trunk/maven-archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/maven-archetype-plugin/pom.xml Mon Feb 4 13:05:21 2013 @@ -168,32 +168,6 @@ under the License. - reporting - - - -org.apache.maven.plugins -maven-changes-plugin -2.4 - - Fix Version,Type,Key,Summary,Resolution - Closed - Fix Version DESC - 1000 - 16795,14604,14254 - - - - - jira-report - - - - - - - - run-its
svn commit: r1442075 - /maven/archetype/trunk/maven-archetype-plugin/src/site/apt/examples/generate-batch.apt
Author: andham Date: Mon Feb 4 11:09:49 2013 New Revision: 1442075 URL: http://svn.apache.org/viewvc?rev=1442075&view=rev Log: [ARCHETYPE-428] Improve Generate project in batch mode doc page Modified: maven/archetype/trunk/maven-archetype-plugin/src/site/apt/examples/generate-batch.apt Modified: maven/archetype/trunk/maven-archetype-plugin/src/site/apt/examples/generate-batch.apt URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/site/apt/examples/generate-batch.apt?rev=1442075&r1=1442074&r2=1442075&view=diff == --- maven/archetype/trunk/maven-archetype-plugin/src/site/apt/examples/generate-batch.apt (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/site/apt/examples/generate-batch.apt Mon Feb 4 11:09:49 2013 @@ -28,52 +28,50 @@ Generate project in batch mode - It is possible to get rid of the interactivity of the archetype plugin + It is possible to get rid of the interactivity of the Maven Archetype Plugin by setting the <<>> property to <<>> or by using the -B flag. - A couple of meaningful properties are then required. + A couple of meaningful properties are then required: - The archetypeGroupId, archetypeArtifactId and archetypeVersion defines the + * The archetypeGroupId, archetypeArtifactId and archetypeVersion defines the archetype to use for project generation. - The groupId, artifactId, version and package are the main properties to be - set. Each archetype require these properties. Some archetypes defines other - properties; refers to the appropriate archetype documentation if needed. + * The groupId, artifactId, version and package are the main properties to be + set. Each archetype require these properties. Some archetypes define other + properties; refer to the appropriate archetype's documentation if needed. + [] -+-- -$ mvn archetype:generate -B -DarchetypeGroupId=org.apache.maven.archetypes -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.0 -DgroupId=com.company -DartifactId=project -Dversion=1.0 -Dpackage=1.5 ++ +$ mvn archetype:generate -B -DarchetypeGroupId=org.apache.maven.archetypes -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.1 -DgroupId=com.company -DartifactId=project -Dversion=1.0-SNAPSHOT -Dpackage=com.company.project [INFO] Scanning for projects... -[INFO] Searching repository for plugin with prefix: 'archetype'. +[INFO] [INFO] -[INFO] Building Maven Default Project -[INFO]task-segment: [archetype:generate] (aggregator-style) +[INFO] Building Maven Stub Project (No POM) 1 [INFO] -[INFO] Preparing archetype:generate -[INFO] No goals needed for project - skipping -[INFO] Setting property: classpath.resource.loader.class => 'org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader'. -[INFO] Setting property: velocimacro.messages.on => 'false'. -[INFO] Setting property: resource.loader => 'classpath'. -[INFO] Setting property: resource.manager.logwhenfound => 'false'. -[INFO] [archetype:generate] +[INFO] +[INFO] >>> maven-archetype-plugin:2.2:generate (default-cli) @ standalone-pom >>> +[INFO] +[INFO] <<< maven-archetype-plugin:2.2:generate (default-cli) @ standalone-pom <<< +[INFO] +[INFO] --- maven-archetype-plugin:2.2:generate (default-cli) @ standalone-pom --- [INFO] Generating project in Batch mode -[INFO] Archetype repository missing. Using the one from [org.apache.maven.archetypes:maven-archetype-quickstart:RELEASE] found in catalog internal +[INFO] Archetype repository missing. Using the one from [org.apache.maven.archetypes:maven-archetype-quickstart:1.1] found in catalog remote [INFO] -[INFO] Using following parameters for creating OldArchetype: maven-archetype-quickstart:1.0 +[INFO] Using following parameters for creating project from Old (1.x) Archetype: maven-archetype-quickstart:1.1 [INFO] [INFO] Parameter: groupId, Value: com.company -[INFO] Parameter: packageName, Value: 1.5 -[INFO] Parameter: package, Value: 1.5 +[INFO] Parameter: packageName, Value: com.company.project +[INFO] Parameter: package, Value: com.company.project [INFO] Parameter: artifactId, Value: project -[INFO] Parameter: basedir, Value: /private/tmp/archetype -[INFO] Parameter: version, Value: 1.0 -[INFO] OldArchetype created in dir: /private/tmp/archetype/project +[INFO] Parameter: basedir, Value: /Users/mave
svn commit: r1442070 - /maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/pom.xml
Author: andham Date: Mon Feb 4 10:35:37 2013 New Revision: 1442070 URL: http://svn.apache.org/viewvc?rev=1442070&view=rev Log: Aligning groupId/artifactId of plugin ITs Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/pom.xml Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/pom.xml?rev=1442070&r1=1442069&r2=1442070&view=diff == --- maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/pom.xml (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/property-setting-cli/pom.xml Mon Feb 4 10:35:37 2013 @@ -23,8 +23,8 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 - com.company - archetype1 + org.apache.maven.plugins.archetype.its + property-setting-cli 1.0-SNAPSHOT maven-archetype
svn commit: r1441454 - /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
Author: andham
Date: Fri Feb 1 14:18:38 2013
New Revision: 1441454
URL: http://svn.apache.org/viewvc?rev=1441454&view=rev
Log:
Minor text output changes.
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java?rev=1441454&r1=1441453&r2=1441454&view=diff
==
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelector.java
Fri Feb 1 14:18:38 2013
@@ -93,7 +93,7 @@ public class DefaultArchetypeSelector
updateRepository( definition, archetype, catalogKey );
-getLogger().info( "Archetype repository missing. Using the one
from " + archetype + " found in catalog "
+getLogger().info( "Archetype repository not defined. Using the
one from " + archetype + " found in catalog "
+ catalogKey );
}
else
@@ -180,7 +180,7 @@ public class DefaultArchetypeSelector
{
if ( catalogs == null )
{
-throw new NullPointerException( "catalogs cannot be null" );
+throw new NullPointerException( "Catalogs cannot be null" );
}
Map> archetypes = new LinkedHashMap>();
svn commit: r1441447 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
Author: andham Date: Fri Feb 1 14:02:40 2013 New Revision: 1441447 URL: http://svn.apache.org/viewvc?rev=1441447&view=rev Log: [MPIR-260] German translation of three missing report.dependency-info.* props Submitted by: Thorsten Heit Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties?rev=1441447&r1=1441446&r2=1441447&view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties Fri Feb 1 14:02:40 2013 @@ -110,6 +110,9 @@ report.dependency-convergence.stats.read report.dependency-convergence.stats.readyrelease.success = Erfolg report.dependency-convergence.stats.snapshots = Anzahl SNAPSHOT-Artefakte (NOS): report.dependency-convergence.stats.subprojects= Anzahl Unter-Projekte: +report.dependency-info.name= Abh\u00e4ngigkeiten Information +report.dependency-info.title = Abh\u00e4ngigkeiten Information +report.dependency-info.description = In diesem Dokument sind Informationen enthalten, wie dieses Projekt als Abh\u00e4ngigkeit zu anderen Dependency-Management-Tools hinzugef\u00fcgt werden kann. report.dependency-convergence.title= Reaktor-Abh\u00e4ngigkeitskonvergenz report.index.nodescription = Derzeit existiert keine Beschreibung f\u00fcr dieses Projekt. report.index.title = Willkommen bei
svn commit: r1441031 - /maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
Author: andham
Date: Thu Jan 31 16:01:05 2013
New Revision: 1441031
URL: http://svn.apache.org/viewvc?rev=1441031&view=rev
Log:
Added missing addServer method (and deprecated incorrect one).
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java?rev=1441031&r1=1441030&r2=1441031&view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeGenerationRequest.java
Thu Jan 31 16:01:05 2013
@@ -312,8 +312,17 @@ public class ArchetypeGenerationRequest
return mirrors;
}
+/**
+ * @deprecated Use {@link #addServer(Server)} instead
+ */
+@Deprecated
public ArchetypeGenerationRequest addMirror( Server server )
{
+return addServer( server );
+}
+
+public ArchetypeGenerationRequest addServer( Server server )
+{
servers.add( server );
return this;
svn commit: r1439871 - /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
Author: andham
Date: Tue Jan 29 12:50:29 2013
New Revision: 1439871
URL: http://svn.apache.org/viewvc?rev=1439871&view=rev
Log:
Fixed some spelling errors.
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java?rev=1439871&r1=1439870&r2=1439871&view=diff
==
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
Tue Jan 29 12:50:29 2013
@@ -47,7 +47,7 @@ import java.util.List;
import java.util.Properties;
/**
- * Generates a new project from an archetype, or updated the actual project if
using a partial archetype.
+ * Generates a new project from an archetype, or updates the actual project if
using a partial archetype.
* If the project is fully generated, it is generated in a directory
corresponding to its artifactId.
* If the project is updated with a partial archetype, it is done in the
current directory.
*
@@ -98,7 +98,7 @@ public class CreateProjectFromArchetypeM
/**
* The archetype catalogs to use to build a list and let the user choose
from.
* It is a comma separated list of catalogs.
- * Catalogs use following schemes:
+ * Catalogs use the following schemes:
*
* 'file://...' with archetype-catalog.xml
automatically appended when pointing to a directory
* 'http://...' or 'https://...' with
archetype-catalog.xml always appended
@@ -126,7 +126,7 @@ public class CreateProjectFromArchetypeM
private List remoteArtifactRepositories;
/**
- * User settings use to check the interactiveMode.
+ * User settings used to check the interactiveMode.
*/
@Parameter( property = "interactiveMode", defaultValue =
"${settings.interactiveMode}", required = true )
private Boolean interactiveMode;
git commit: Fixed incorrect Maven property example.
Updated Branches:
refs/heads/master 72bdc8602 -> 77b12f962
Fixed incorrect Maven property example.
Signed-off-by: Anders Hammar
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/77b12f96
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/77b12f96
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/77b12f96
Branch: refs/heads/master
Commit: 77b12f962d002ab887dd17b5aeef198fd410be8f
Parents: 72bdc86
Author: Anders Hammar
Authored: Mon Jan 7 11:35:57 2013 +0100
Committer: Anders Hammar
Committed: Mon Jan 7 11:35:57 2013 +0100
--
maven-model-builder/src/site/apt/index.apt |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/77b12f96/maven-model-builder/src/site/apt/index.apt
--
diff --git a/maven-model-builder/src/site/apt/index.apt
b/maven-model-builder/src/site/apt/index.apt
index de62edc..1943d7b 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -88,7 +88,7 @@ Maven Model Builder
<<>> ()\
<<<*>>> () | POM content (see {{{../maven-model/maven.html}POM
reference}}) | <<<$\{project.version\}>>>\
| | <<<$\{project.build.finalName\}>>>\
- | | <<<$\{project.build.artifactId\}>>>\
+ | | <<<$\{project.artifactId\}>>>\
| | <<<$\{project.build.directory\}>>> |
*+--+--+
| <<>>\
svn commit: r1424930 - /maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
Author: andham Date: Fri Dec 21 14:13:25 2012 New Revision: 1424930 URL: http://svn.apache.org/viewvc?rev=1424930&view=rev Log: Fixed typo Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=1424930&r1=1424929&r2=1424930&view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Fri Dec 21 14:13:25 2012 @@ -495,8 +495,8 @@ false If set to true, this property will unpack all dependencies -into the specified output directory. When set to false -dependencies will be includes as archives (jars). Can only unpack +into the specified output directory. When set to false, +dependencies will be included as archives (jars). Can only unpack jar, zip, tar.gz, and tar.bz archives. Default value is false.
