Author: khmarbaise
Date: Sat Mar 14 00:15:02 2015
New Revision: 1666621
URL: http://svn.apache.org/r1666621
Log:
Updated several parts of the docs.
Updated plugin versions being used in the examples.
Removed Maven 2 only options.
Modified:
maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt
maven/site/trunk/content/apt/guides/mini/guide-archive-configuration.apt
maven/site/trunk/content/apt/guides/mini/guide-assemblies.apt
maven/site/trunk/content/apt/guides/mini/guide-attached-tests.apt
maven/site/trunk/content/apt/guides/mini/guide-multiple-modules.apt
Modified:
maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt?rev=1666621&r1=1666620&r2=1666621&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-3rd-party-jars-remote.apt
Sat Mar 14 00:15:02 2015
@@ -80,5 +80,8 @@ mvn deploy:deploy-file -DpomFile=<path-t
* Deploying Source Jars
+~~ TODO: Check the following, cause i don't this is true anymore. I assume
packaging should be jar
+~~Â and the classifier should be set to source.
+
To deploy a 3rd party source jar, packaging should be set to
<<<java-source>>>, and
generatePom should be set to <<<false>>>.
Modified:
maven/site/trunk/content/apt/guides/mini/guide-archive-configuration.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-archive-configuration.apt?rev=1666621&r1=1666620&r2=1666621&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-archive-configuration.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-archive-configuration.apt
Sat Mar 14 00:15:02 2015
@@ -47,7 +47,7 @@ Guide to Configuring Archive Plugins
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
Modified: maven/site/trunk/content/apt/guides/mini/guide-assemblies.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-assemblies.apt?rev=1666621&r1=1666620&r2=1666621&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-assemblies.apt (original)
+++ maven/site/trunk/content/apt/guides/mini/guide-assemblies.apt Sat Mar 14
00:15:02 2015
@@ -48,10 +48,19 @@ Guide to creating assemblies
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.3</version>
<configuration>
<descriptor>src/assembly/dep.xml</descriptor>
</configuration>
+ <executions>
+ <execution>
+ <id>create-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -185,8 +194,6 @@ Guide to creating assemblies
You can now create the defined distribution packages via command line like
this:
+----+
-mvn assembly:single
+mvn package
+----+
- But the best solution is to create such distribution package within the
- life-cycle.
Modified: maven/site/trunk/content/apt/guides/mini/guide-attached-tests.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-attached-tests.apt?rev=1666621&r1=1666620&r2=1666621&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-attached-tests.apt (original)
+++ maven/site/trunk/content/apt/guides/mini/guide-attached-tests.apt Sat Mar
14 00:15:02 2015
@@ -41,7 +41,7 @@ Guide to using attached tests
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.6</version>
<executions>
<execution>
<goals>
@@ -101,9 +101,3 @@ mvn deploy
+----+
- Note that previous editions of this guide suggested to use
<<<\<classifier\>tests\</classifier\>>>> instead of
- <<<\<type\>test-jar\</type\>>>>. While this currently works for some cases,
it does not properly work during a
- reactor build of the test JAR module and any consumer if a lifecycle phase
prior to <<<install>>> is invoked. In such
- a scenario, Maven will not resolve the test JAR from the output of the
reactor build but from the local/remote
- repository. Apparently, the JAR from the repositories could be outdated or
completely missing, causing a build
- failure (cf. {{{http://jira.codehaus.org/browse/MNG-2045}MNG-2045}}).
Modified: maven/site/trunk/content/apt/guides/mini/guide-multiple-modules.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-multiple-modules.apt?rev=1666621&r1=1666620&r2=1666621&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/mini/guide-multiple-modules.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-multiple-modules.apt Sat Mar
14 00:15:02 2015
@@ -2,8 +2,9 @@
Guide to Working with Multiple Modules
------
Brett Porter
+ Karl Heinz Marbaise
------
- 2009-02-04
+ 2015-03-13
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -64,8 +65,6 @@ Guide to Working with Multiple Modules
The following command line switches are available:
- * <<<-r>>> - ignore the modules declared in the current project, and
instead build the list of projects listed after the <<<-r>>> switch (which may
include wildcards)
-
* <<<--resume-from>>> - resumes a reactor the specified project (e.g. when
it fails in the middle)
* <<<--also-make>>> - build the specified projects, and any of their
dependencies in the reactor
@@ -80,11 +79,6 @@ Guide to Working with Multiple Modules
Refer to the Maven command line interface reference for more information on
these switches.
-** The Reactor Plugin
-
- For versions of Maven prior to Maven 2.1, or for additional capabilities
with the reactor such as building only the modules with SCM changes, the
Reactor plugin can be used to further customize the execution of the projects.
- For information on how to use this, refer to the
{{{/plugins/maven-reactor-plugin/index.html} Reactor Plugin documentation}}.
-
* More information
* {{{http://www.sonatype.com/books/mvnex-book/reference/multimodule.html}
Chapter 8. A Multi-module Project (Maven by Example)}}
