You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/08/10 14:25:42 UTC
[01/22] git commit: o moved to the wiki:
https://cwiki.apache.org/confluence/display/MAVEN/Compatibility+with+Maven+2.x
Updated Branches:
refs/heads/guice-from-google [created] d0abbad1c
o moved to the wiki: https://cwiki.apache.org/confluence/display/MAVEN/Compatibility+with+Maven+2.x
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c6e0b717
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c6e0b717
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c6e0b717
Branch: refs/heads/guice-from-google
Commit: c6e0b717a6430693ce5d692649bca5f140f6d9f6
Parents: d525912
Author: Jason van Zyl <ja...@tesla.io>
Authored: Sun Jul 21 14:03:25 2013 -0400
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:49 2013 +1000
----------------------------------------------------------------------
maven-compat/compatibility.cfl | 79 -------------------------------------
1 file changed, 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c6e0b717/maven-compat/compatibility.cfl
----------------------------------------------------------------------
diff --git a/maven-compat/compatibility.cfl b/maven-compat/compatibility.cfl
deleted file mode 100644
index d02d54b..0000000
--- a/maven-compat/compatibility.cfl
+++ /dev/null
@@ -1,79 +0,0 @@
-This document outlines some of the steps that are being taken to ensure as much backward compatibility with tools and plugins
-that are currently written against Maven 2.0.x.
-
-h1. Affected Plugins
-
-h2. Maven Remote Resources Plugin
-* org.apache.maven.project.inheritance.ModelInheritanceAssembler#assembleModelInheritance: used to walk the POMs to find out all the license information. This
- functionality has been superceded by the model properties-based system for POM construction. We provide the same functionality using the model
- properties-based system but have just placed the component as-is in the maven-compat package to ensure the default lifecycle functions.
-* org.apache.maven.project.ProjectUtils: placed in the maven-compat package.
-* org.apache.maven.project.MissingRepositoryElementException ... used by ProjectUtils
-
-h2. Maven Help Plugin
-* org.apache.maven.project.path.PathTranslator: used as a parameter in the EvaluateMojo. The path translator has been replaced the model builder
- and PomTransformer.
-
-h1. Affected Components & Classes
-
-h2. Maven Artifact
-
-Maven Artifact will be entirely extricated from the core of Maven 3.x and replaced with Mercury, but we will make a best effort to
-ensure the compatibility of plugins that use Maven Artifact. There are, however, components and classes that are just so broken or conflict
-with standard ways of doing resolution and conflict reduction that we can't support them.
-
-h3. Supported Compatibility
-* org.apache.maven.artifact.deployer.ArtifactDeployer
-* org.apache.maven.artifact.factory.ArtifactFactory
-* org.apache.maven.artifact.handler.ArtifactHandler
-* org.apache.maven.artifact.installer.ArtifactInstaller
-* org.apache.maven.artifact.manager.WagonManager (1)
-* org.apache.maven.artifact.repository.ArtifactRepository
-* org.apache.maven.artifact.repository.ArtifactRepositoryPolicy
-* org.apache.maven.artifact.repository.ArtifactRepositoryFactory
-* org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout
-* org.apache.maven.artifact.resolver.ArtifactResolver
-* org.apache.maven.artifact.resolver.filter.ArtifactFilter
-* org.apache.maven.artifact.resolver.filter.Artifact
-
-(1) In r746285 various methods have been removed from the WagonManager which breaks the maven-project-info-reports-plugin, the
-maven-site-plugin and the maven-stage-plugin, e.g. due to a linkage error on getAuthentaticationInfo().
-
-h3. Unsupported Compatibility
-* org.apache.maven.artifact.metadata.ArtifactMetadataSource
-* org.apache.maven.artifact.metadata.ResolutionGroup
-* org.apache.maven.artifact.repository.metadata.*
-* org.apache.maven.artifact.resolver.ResolutionNode
-* org.apache.maven.artifact.resolver.ResolutionListener
-* org.apache.maven.artifact.resolver.metadata.*
-* org.apache.maven.artifact.resolver.transform.*
-* org.apache.maven.artifact.resolver.versioning.*
-
-h2. Settings
-
-The settings are historically a CLI-based mechanism for setting preferences. It should have never gone beyond the core into plugins
-or other tools. Unfortunately we allowed the ${settings} expression in plugins and from there it made its way into components like
-the release manager. The release manager in turn never evolved to decouple itself from the settings and it requires a recreation
-of the entire Maven environment to work and grabs the RuntimeInfo info class from the settings in order to do this. Other plugins
-may require this and we'll have to find them them and push them toward using the Invoker where the Maven environment is taken care
-of and restrict/forbid the use of settings in plugins. Everything required is in the exeution request and therefore the session and
-that's all plugins should need.
-
-The changes made relate to MNG-3954, where the RuntimeInfo class needed to be partially rescurrected in order to make the release
-plugin happy.
-
-h2. Changes to the CLI
-* Log file support has been added i.e mvn -l log.txt clean install
-* Plugin registry option has not been supported in the core and it lagged around in the CLI
-
-h2. Repositories
-
-Support for non-unique SNAPSHOT deployments will be dropped.
-
-h2. Profiles
-
-Support for the profiles.xml will be dropped.
-
-h2. Maven 1.x
-
-Support for the legacy repositories has been dropped.
[20/22] git commit: more explanations on logger names
Posted by ol...@apache.org.
more explanations on logger names
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/68ac7074
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/68ac7074
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/68ac7074
Branch: refs/heads/guice-from-google
Commit: 68ac70742c18c038bc9c57c7206742876f6c98fc
Parents: 2a4c518
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Aug 2 10:05:27 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
maven-embedder/src/site/apt/logging.apt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/68ac7074/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index 033c275..46db06d 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -97,7 +97,8 @@ public class MyClass
* Logger Name
- Before Maven 3.1.0, with logging implementation done in Maven, logger name wasn't used: they are as-is, without clear definition.
+ Before Maven 3.1.0, with logging implementation done in Maven, logger name wasn't used by basic console logging implementation:
+ they are as-is, without clear convention on when to pass logger from class to class or when to create a new logger.
Starting with Maven 3.1.0, logging implementation can be of greatest use if logger names are well defined. This definition still
needs to be defined and implemented:
[03/22] git commit: [MNG-5500] tracking file is now
_remote.repositories (was _maven.repositories in Maven 3.0.x)
Posted by ol...@apache.org.
[MNG-5500] tracking file is now _remote.repositories (was
_maven.repositories in Maven 3.0.x)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ddd26620
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ddd26620
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ddd26620
Branch: refs/heads/guice-from-google
Commit: ddd2662064cb3cbc2f5f007996c3c07a7e550ede
Parents: 6065d29
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Jul 28 18:35:31 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ddd26620/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index 5ca56d8..dfa317b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -135,7 +135,7 @@ public class CLIManager
options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasArg().withDescription( "Encrypt server password" ).create( ENCRYPT_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) );
- options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _maven.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
+ options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
// Adding this back in for compatibility with the verifier that hard codes this option.
options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );
[10/22] git commit: o remove exception for rat plugin
Posted by ol...@apache.org.
o remove exception for rat plugin
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a148d4ae
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a148d4ae
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a148d4ae
Branch: refs/heads/guice-from-google
Commit: a148d4aee92ba27e0fa077b3417ef3d31d206730
Parents: c6e0b71
Author: Jason van Zyl <ja...@tesla.io>
Authored: Sun Jul 21 14:04:11 2013 -0400
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-compat/pom.xml | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a148d4ae/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index f1d0964..9e7374e 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -84,19 +84,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>compatibility.cfl</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
[02/22] git commit: update slf4j-api to latest
Posted by ol...@apache.org.
update slf4j-api to latest
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3641991e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3641991e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3641991e
Branch: refs/heads/guice-from-google
Commit: 3641991e012555a77a3d71438ff703c526b84051
Parents: cbbb884
Author: Hervé Boutemy <hb...@apache.org>
Authored: Thu Aug 1 20:02:34 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3641991e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a4535a..39cfbf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<modelloVersion>1.7</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>0.9.0.M2</aetherVersion>
- <slf4jVersion>1.7.4</slf4jVersion>
+ <slf4jVersion>1.7.5</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
[13/22] git commit: added links to toolchains descriptor reference
Posted by ol...@apache.org.
added links to toolchains descriptor reference
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c261bc5c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c261bc5c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c261bc5c
Branch: refs/heads/guice-from-google
Commit: c261bc5cb72ddd92c97e8ba335f12c3f00b53962
Parents: 56d6bbc
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Jul 27 23:10:34 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-core/src/site/apt/index.apt | 10 +++++++---
src/site/site.xml | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c261bc5c/maven-core/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt
index 1877a37..0c63bc2 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -20,13 +20,12 @@
-----
Hervé Boutemy
-----
- 2012-09-29
+ 2013-07-27
-----
Maven Core
- Maven Core classes, providing <<<Maven>>> component ({{{./apidocs/org/apache/maven/Maven.html}javadoc}}),
- with its <<<DefaultMaven>>> implementation ({{{./xref/org/apache/maven/DefaultMaven.html}source}}).
+ Maven Core classes managing the whole build process.
* Useful entry points
@@ -34,6 +33,11 @@ Maven Core
* {{{./artifact-handlers.html}default artifact handlers}},
+ * {{{./toolchains.html}Toolchains descriptor reference}},
+
+ * <<<Maven>>> component ({{{./apidocs/org/apache/maven/Maven.html}javadoc}}),
+ with its <<<DefaultMaven>>> implementation ({{{./xref/org/apache/maven/DefaultMaven.html}source}}),
+
* <<<ProjectBuilder>>> component ({{{./apidocs/org/apache/maven/project/ProjectBuilder.html}javadoc}}),
with its <<<DefaultProjectBuilder>>> implementation
({{{./xref/org/apache/maven/project/DefaultProjectBuilder.html}source}}),
http://git-wip-us.apache.org/repos/asf/maven/blob/c261bc5c/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 291d8ce..bcc6103 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -54,6 +54,7 @@ under the License.
<menu name="Descriptors Reference">
<item name="POM" href="./maven-model/maven.html"/>
<item name="Settings" href="./maven-settings/settings.html"/>
+ <item name="Toolchains" href="./maven-core/toolchains.html"/>
</menu>
<menu name="Reference">
[09/22] git commit: o update to sisu 0.0.0.M5
Posted by ol...@apache.org.
o update to sisu 0.0.0.M5
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/417fb1f3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/417fb1f3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/417fb1f3
Branch: refs/heads/guice-from-google
Commit: 417fb1f3d7e6946553469c02f2bb930f51a5b808
Parents: a148d4a
Author: Jason van Zyl <ja...@tesla.io>
Authored: Fri Jul 26 20:59:54 2013 -0400
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/417fb1f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3a54c85..4a4535a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<!-- last Java5 release of Guava -->
<guavaVersion>11.0.2</guavaVersion>
<guiceVersion>3.1.3</guiceVersion>
- <sisuInjectVersion>0.0.0.M2a</sisuInjectVersion>
+ <sisuInjectVersion>0.0.0.M5</sisuInjectVersion>
<wagonVersion>2.4</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
[07/22] git commit: javadoc improvement
Posted by ol...@apache.org.
javadoc improvement
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c74a5846
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c74a5846
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c74a5846
Branch: refs/heads/guice-from-google
Commit: c74a58466f35f64a057e201446cb20c0d46a798a
Parents: 03489ff
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Aug 2 01:28:45 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
.../org/apache/maven/cli/logging/Slf4jConfigurationFactory.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c74a5846/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java
index f396133..a5a79a8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java
@@ -29,7 +29,8 @@ import org.slf4j.ILoggerFactory;
/**
* Slf4jConfiguration factory, loading implementations from <code>META-INF/maven/slf4j-configuration.properties</code>
- * configuration files in class loader.
+ * configuration files in class loader: key is the class name of the ILoggerFactory, value is the class name of
+ * the corresponding Slf4jConfiguration.
*
* @author Hervé Boutemy
* @since 3.1.0
[04/22] git commit: improved javadoc
Posted by ol...@apache.org.
improved javadoc
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6065d292
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6065d292
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6065d292
Branch: refs/heads/guice-from-google
Commit: 6065d292dc0dc518fae2d6c772395dea3f42e539
Parents: ae8c2e4
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Jul 28 14:08:13 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
.../apache/maven/exception/ExceptionHandler.java | 5 +++++
.../apache/maven/exception/ExceptionSummary.java | 17 ++++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6065d292/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
index 4dec0ee..945edf6 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
@@ -19,6 +19,11 @@ package org.apache.maven.exception;
* under the License.
*/
+/**
+ * Transform an exception into useful end-user message.
+ *
+ * @since 3.0-alpha-3
+ */
public interface ExceptionHandler
{
ExceptionSummary handleException( Throwable e );
http://git-wip-us.apache.org/repos/asf/maven/blob/6065d292/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java b/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
index 048698e..2b7f27b 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
@@ -22,13 +22,16 @@ package org.apache.maven.exception;
import java.util.Collections;
import java.util.List;
-// provide a
-// - the exception
-// - useful message
-// - useful reference to a solution, or set of solutions
-// - the configuration gleaned for examination
-// - plugin repositories
-
+/**
+ * Provide a summary of the exception, containing:<ul>
+ * <li>the exception itself,</li>
+ * <li>useful end-user message,</li>
+ * <li>useful reference to a solution, or set of solutions: this is usually a wiki page url in
+ * <a href="http://cwiki.apache.org/confluence/display/MAVEN/">http://cwiki.apache.org/confluence/display/MAVEN/</a>,
+ * </li>
+ * <li>child exception summaries.</li>
+ * </ul>
+ */
public class ExceptionSummary
{
[06/22] git commit: o change the scope of org.eclipse.sisu to test in
the maven-aether-provider to prevent it from leaking out to clients.
Posted by ol...@apache.org.
o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0ea3f724
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0ea3f724
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0ea3f724
Branch: refs/heads/guice-from-google
Commit: 0ea3f724fb5d40a4138fce7679a89094012b20d6
Parents: 417fb1f
Author: Jason van Zyl <ja...@tesla.io>
Authored: Fri Jul 26 21:09:50 2013 -0400
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0ea3f724/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 910fab6..9235f1c 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -63,20 +63,6 @@ under the License.
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
@@ -96,6 +82,22 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-wagon</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
[08/22] git commit: improved logging documentation
Posted by ol...@apache.org.
improved logging documentation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/03489ffa
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/03489ffa
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/03489ffa
Branch: refs/heads/guice-from-google
Commit: 03489ffa549dd5466a8c674879e579fab49e7fc8
Parents: 3641991
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Aug 2 01:27:07 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-embedder/src/site/apt/logging.apt | 32 ++++++++++++++++++++++------
1 file changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/03489ffa/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index 1f1c4ed..0e84041 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -20,22 +20,39 @@
-----
Hervé Boutemy
-----
- 2012-04-29
+ 2013-08-02
-----
Maven Logging
+ End-user logging documentation is available {{{/maven-logging.html}in Maven site}}.
+ This documentation is focused on internal implementation details.
+
+* Logging API
+
Maven uses
{{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus
Container logging API}}, like any other Plexus components, ie
{{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}}
/ {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}.
- Starting with Maven 3.1.0, instead of implementing the API itself,
- Maven maps to {{{http://slf4j.org/apidocs/}SLF4J API}}'s {{{http://slf4j.org/apidocs/org/slf4j/ILoggerFactory.html}ILoggerFactory}}
- / {{{http://slf4j.org/apidocs/org/slf4j/Logger.html}Logger}} through
- {{{./apidocs/org/apache/maven/cli/logging/Slf4jLoggerManager.html}Slf4jLoggerManager}}
- / {{{./apidocs/org/apache/maven/cli/logging/Slf4jLogger.html}Slf4jLogger}}.
+ Starting with Maven 3.1.0:
+
+ * Maven supports SLF4J API logging API too, ie {{{http://slf4j.org/apidocs/org/slf4j/LoggerFactory.html}LoggerFactory}} /
+ {{{http://slf4j.org/apidocs/org/slf4j/Logger.html}Logger}},
+
+ * instead of implementing Plexus logging API itself with basic output to console, Maven implements it using SLF4J API in
+ {{{./apidocs/org/apache/maven/cli/logging/Slf4jLoggerManager.html}Slf4jLoggerManager}}
+ / {{{./apidocs/org/apache/maven/cli/logging/Slf4jLogger.html}Slf4jLogger}}.
+
+
+* Logging Implementation
+
+ Maven 3.1.0 ships bundled with {{{http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html}SLF4J simple logger}},
+ but is ready to use other logging implementations:
+ {{{./apidocs/org/apache/maven/cli/logging/Slf4jConfigurationFactory.html}Slf4jConfigurationFactory}} /
+ {{{./apidocs/org/apache/maven/cli/logging/Slf4jConfiguration.html}Slf4jConfiguration}} brings extensions to slf4j API
+ necessary to Maven.
* Getting Logger Instance
@@ -59,7 +76,8 @@ public class DefaultMyComponent
+------+
Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course, this will only work when run under
- Maven 3.1.0, then this technique can be used safely only in Maven core components.
+ Maven 3.1.0, then this technique can be used safely only in Maven core components or in plugins/component not requiring
+ compatibility with previous Maven versions.
+-----+
import org.slf4j.Logger;
[19/22] git commit: more details on logging implementation
Posted by ol...@apache.org.
more details on logging implementation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2a4c5180
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2a4c5180
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2a4c5180
Branch: refs/heads/guice-from-google
Commit: 2a4c5180b79a0687c0fba300d5a7fefd5777a63e
Parents: fcb5201
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Aug 2 09:58:43 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
maven-embedder/src/site/apt/logging.apt | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/2a4c5180/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index 0e84041..033c275 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -49,10 +49,16 @@ Maven Logging
* Logging Implementation
Maven 3.1.0 ships bundled with {{{http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html}SLF4J simple logger}},
- but is ready to use other logging implementations:
+ but is ready to use other logging implementations.
+
+ Logging configuration loading is actually done by logging implementation, without any Maven extensions to support merging
+ Maven installation configuration with per-user configuration for example:
+ `${maven.home}/conf/logging` directory was added to core's classpath (see `${maven.home}/bin/m2.conf`).
+
+ During Maven initialization, Maven tweaks default root logging level to match CLI verbosity choice. Since such feature isn't available
+ in SLF4J API, logging implementation specific extensions need to be added into Maven to support these CLI options: see
{{{./apidocs/org/apache/maven/cli/logging/Slf4jConfigurationFactory.html}Slf4jConfigurationFactory}} /
- {{{./apidocs/org/apache/maven/cli/logging/Slf4jConfiguration.html}Slf4jConfiguration}} brings extensions to slf4j API
- necessary to Maven.
+ {{{./apidocs/org/apache/maven/cli/logging/Slf4jConfiguration.html}Slf4jConfiguration}}.
* Getting Logger Instance
[14/22] git commit: Updated p-u
Posted by ol...@apache.org.
Updated p-u
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9738dd27
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9738dd27
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9738dd27
Branch: refs/heads/guice-from-google
Commit: 9738dd2744de3edfd59bcf96b67b70e406f9e3ed
Parents: 4cf2fa3
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Tue Aug 6 16:16:41 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9738dd27/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8578c28..b3e7684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
<plexusInterpolationVersion>1.16</plexusInterpolationVersion>
- <plexusUtilsVersion>3.0.10</plexusUtilsVersion>
+ <plexusUtilsVersion>3.0.13</plexusUtilsVersion>
<!-- last Java5 release of Guava -->
<guavaVersion>11.0.2</guavaVersion>
<guiceVersion>3.1.3</guiceVersion>
[05/22] git commit: Add missing license header.
Posted by ol...@apache.org.
Add missing license header.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cbbb884f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cbbb884f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cbbb884f
Branch: refs/heads/guice-from-google
Commit: cbbb884ffd19d4f15808a425c2dec675613e3957
Parents: ddd2662
Author: Dennis Lundberg <de...@apache.org>
Authored: Sun Jul 28 21:49:05 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-plugin-api/src/test/resources/plugin.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cbbb884f/maven-plugin-api/src/test/resources/plugin.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/test/resources/plugin.xml b/maven-plugin-api/src/test/resources/plugin.xml
index c5d4e8a..49db316 100644
--- a/maven-plugin-api/src/test/resources/plugin.xml
+++ b/maven-plugin-api/src/test/resources/plugin.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<plugin>
<description>plugin-description</description>
<groupId>org.apache.maven.plugins</groupId>
[22/22] git commit: use guice 4.0-beta from google
Posted by ol...@apache.org.
use guice 4.0-beta from google
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d0abbad1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0abbad1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0abbad1
Branch: refs/heads/guice-from-google
Commit: d0abbad1c22e7d10bfa401f8896b8a6439902850
Parents: dc90e60
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Aug 10 22:25:26 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 22:25:26 2013 +1000
----------------------------------------------------------------------
apache-maven/pom.xml | 4 ++++
maven-aether-provider/pom.xml | 11 ++---------
maven-core/pom.xml | 4 ++++
maven-model-builder/pom.xml | 6 +++++-
pom.xml | 39 +++++++++++++++++++++++++++++---------
5 files changed, 45 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 4b8c579..8452a07 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -48,6 +48,10 @@
<artifactId>maven-compat</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 9235f1c..9bc35fd 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -71,16 +71,9 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <classifier>no_aop</classifier>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Testing -->
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 9041da0..d0e38a7 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -76,6 +76,10 @@
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 57cdd8c..67eb5c9 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -41,7 +41,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f82b9a7..56f4683 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,20 +185,20 @@
<version>${guavaVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <version>${guiceVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <version>${guiceVersion}</version>
- <classifier>no_aop</classifier>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>4.0-beta</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>${sisuInjectVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -448,6 +448,27 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.sonatype.sisu:sisu-guice</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.6</version>
[18/22] git commit: give coordinates of plexus configuration files
used to define content
Posted by ol...@apache.org.
give coordinates of plexus configuration files used to define content
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4cf2fa36
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4cf2fa36
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4cf2fa36
Branch: refs/heads/guice-from-google
Commit: 4cf2fa36821bea9cb684a0132eac768b3fce1e50
Parents: 86c330c
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Aug 2 15:24:11 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
maven-core/src/site/apt/artifact-handlers.apt | 4 ++--
maven-core/src/site/apt/default-bindings.apt.vm | 4 ++--
maven-core/src/site/apt/lifecycles.apt.vm | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4cf2fa36/maven-core/src/site/apt/artifact-handlers.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/artifact-handlers.apt b/maven-core/src/site/apt/artifact-handlers.apt
index ee111ff..916161b 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -20,13 +20,13 @@
---
Hervé Boutemy
---
- 2012-08-13
+ 2013-08-02
---
Default Artifact Handlers Reference
Some artifact handlers (see {{{../maven-artifact/apidocs/org/apache/maven/artifact/handler/ArtifactHandler.html} API}})
- are defined by default:
+ are configured by default in <<<META-INF/plexus/artifact-handlers.xml>>>:
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
|| type || extension || packaging || classifier || language || added to classpath || includesDependencies ||
http://git-wip-us.apache.org/repos/asf/maven/blob/4cf2fa36/maven-core/src/site/apt/default-bindings.apt.vm
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/default-bindings.apt.vm b/maven-core/src/site/apt/default-bindings.apt.vm
index 3e3143c..607f244 100644
--- a/maven-core/src/site/apt/default-bindings.apt.vm
+++ b/maven-core/src/site/apt/default-bindings.apt.vm
@@ -20,13 +20,13 @@
---
Hervé Boutemy
---
- 2011-09-12
+ 2013-08-02
---
Plugin Bindings for <<<default>>> Lifecycle Reference
The {{{./lifecycles.html}<<<default>>> lifecycle}} is defined without any plugin binding; plugin bindings are defined separately
- because they are specific for each packaging:
+ in <<<META-INF/plexus/default-bindings.xml>>> because they are specific for each packaging:
%{toc|fromDepth=2}
http://git-wip-us.apache.org/repos/asf/maven/blob/4cf2fa36/maven-core/src/site/apt/lifecycles.apt.vm
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/lifecycles.apt.vm b/maven-core/src/site/apt/lifecycles.apt.vm
index a7842a3..584a77d 100644
--- a/maven-core/src/site/apt/lifecycles.apt.vm
+++ b/maven-core/src/site/apt/lifecycles.apt.vm
@@ -20,12 +20,12 @@
-----
Hervé Boutemy
-----
- 2011-09-12
+ 2013-08-02
-----
Lifecycles Reference
- Maven defines 3 lifecycles:
+ Maven defines 3 lifecycles in <<<META-INF/plexus/components.xml>>>:
%{toc|fromDepth=2}
[16/22] git commit: Modello 1.8, p-int 1.18
Posted by ol...@apache.org.
Modello 1.8, p-int 1.18
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9270eff1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9270eff1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9270eff1
Branch: refs/heads/guice-from-google
Commit: 9270eff1e1d1123b16a3faf821274df52e06de2a
Parents: 9738dd2
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Tue Aug 6 19:39:18 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9270eff1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b3e7684..4f0b4d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
- <plexusInterpolationVersion>1.16</plexusInterpolationVersion>
+ <plexusInterpolationVersion>1.18</plexusInterpolationVersion>
<plexusUtilsVersion>3.0.13</plexusUtilsVersion>
<!-- last Java5 release of Guava -->
<guavaVersion>11.0.2</guavaVersion>
@@ -56,7 +56,7 @@
<wagonVersion>2.4</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
- <modelloVersion>1.7</modelloVersion>
+ <modelloVersion>1.8</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>0.9.0.M2</aetherVersion>
<slf4jVersion>1.7.5</slf4jVersion>
[12/22] git commit: prefer DuplicatProjectException in same package
and explicit package for org.apache.maven.project.DuplicatProjectException
Posted by ol...@apache.org.
prefer DuplicatProjectException in same package and explicit package for
org.apache.maven.project.DuplicatProjectException
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/56d6bbc0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/56d6bbc0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/56d6bbc0
Branch: refs/heads/guice-from-google
Commit: 56d6bbc0d1afdf9abf7fd416731159f6fc2d09fe
Parents: 0ea3f72
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Jul 27 19:16:52 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/56d6bbc0/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index aaddef0..68e4011 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -53,7 +53,6 @@ import org.apache.maven.model.building.ModelProblemUtils;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.model.building.UrlModelSource;
import org.apache.maven.plugin.LegacySupport;
-import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -255,7 +254,7 @@ public class DefaultMaven
repoSession.setWorkspaceReader( ChainedWorkspaceReader.newInstance( reactorRepository,
repoSession.getWorkspaceReader() ) );
}
- catch ( org.apache.maven.DuplicateProjectException e )
+ catch ( DuplicateProjectException e )
{
return addExceptionToResult( result, e );
}
@@ -299,7 +298,7 @@ public class DefaultMaven
return addExceptionToResult( result, error );
}
- catch ( DuplicateProjectException e )
+ catch ( org.apache.maven.project.DuplicateProjectException e )
{
return addExceptionToResult( result, e );
}
@@ -589,7 +588,7 @@ public class DefaultMaven
}
private Map<String, MavenProject> getProjectMap( List<MavenProject> projects )
- throws org.apache.maven.DuplicateProjectException
+ throws DuplicateProjectException
{
Map<String, MavenProject> index = new LinkedHashMap<String, MavenProject>();
Map<String, List<File>> collisions = new LinkedHashMap<String, List<File>>();
@@ -622,7 +621,7 @@ public class DefaultMaven
if ( !collisions.isEmpty() )
{
- throw new org.apache.maven.DuplicateProjectException( "Two or more projects in the reactor"
+ throw new DuplicateProjectException( "Two or more projects in the reactor"
+ " have the same identifier, please make sure that <groupId>:<artifactId>:<version>"
+ " is unique for each project: " + collisions, collisions );
}
[15/22] git commit: Updated to latest p-u and p-int
Posted by ol...@apache.org.
Updated to latest p-u and p-int
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/dc90e60e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/dc90e60e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/dc90e60e
Branch: refs/heads/guice-from-google
Commit: dc90e60ea2816120e7f2fc7bd8a0e2749e01d170
Parents: 9270eff
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Wed Aug 7 07:45:12 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/dc90e60e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f0b4d5..f82b9a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
- <plexusInterpolationVersion>1.18</plexusInterpolationVersion>
- <plexusUtilsVersion>3.0.13</plexusUtilsVersion>
+ <plexusInterpolationVersion>1.19</plexusInterpolationVersion>
+ <plexusUtilsVersion>3.0.14</plexusUtilsVersion>
<!-- last Java5 release of Guava -->
<guavaVersion>11.0.2</guavaVersion>
<guiceVersion>3.1.3</guiceVersion>
[17/22] git commit: link to SLF4J documentation on switching SLF4J
binding
Posted by ol...@apache.org.
link to SLF4J documentation on switching SLF4J binding
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/86c330cb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/86c330cb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/86c330cb
Branch: refs/heads/guice-from-google
Commit: 86c330cbf77c8fa7c22f6515122beb377b2fbd8e
Parents: 68ac707
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Aug 2 10:58:06 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
maven-embedder/src/site/apt/logging.apt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/86c330cb/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index 46db06d..b903f8c 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -49,11 +49,13 @@ Maven Logging
* Logging Implementation
Maven 3.1.0 ships bundled with {{{http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html}SLF4J simple logger}},
- but is ready to use other logging implementations.
+ but is ready to use other logging implementations: SLF4J is responsible for loading the implementation, referred to as
+ {{{http://www.slf4j.org/manual.html#swapping}"SLF4J bindings"}}.
Logging configuration loading is actually done by logging implementation, without any Maven extensions to support merging
Maven installation configuration with per-user configuration for example:
- `${maven.home}/conf/logging` directory was added to core's classpath (see `${maven.home}/bin/m2.conf`).
+ `${maven.home}/conf/logging` directory was added to core's classpath (see `${maven.home}/bin/m2.conf`). See your implementation
+ documentation for details on file names, formats, and so on.
During Maven initialization, Maven tweaks default root logging level to match CLI verbosity choice. Since such feature isn't available
in SLF4J API, logging implementation specific extensions need to be added into Maven to support these CLI options: see
[21/22] git commit: avoid warning when running 'mvn site' without
reporting profile
Posted by ol...@apache.org.
avoid warning when running 'mvn site' without reporting profile
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fcb5201c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fcb5201c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fcb5201c
Branch: refs/heads/guice-from-google
Commit: fcb5201c29aa2299395b3c6f9c69c01967428720
Parents: c74a584
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Aug 2 01:30:31 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:51 2013 +1000
----------------------------------------------------------------------
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fcb5201c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 39cfbf6..8578c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,6 +498,16 @@
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
<id>apache-release</id>
[11/22] git commit: added a link to ExceptionHandler in the "useful
entry points" section
Posted by ol...@apache.org.
added a link to ExceptionHandler in the "useful entry points" section
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ae8c2e48
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ae8c2e48
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ae8c2e48
Branch: refs/heads/guice-from-google
Commit: ae8c2e485d591a573cdb3b640acbb830364de3ec
Parents: c261bc5
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Jul 28 13:46:14 2013 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 21:46:50 2013 +1000
----------------------------------------------------------------------
maven-core/src/site/apt/index.apt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ae8c2e48/maven-core/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt
index 0c63bc2..f66e577 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -53,4 +53,9 @@ Maven Core
({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}),
with its <<<DefaultClassRealmManager>>> implementation
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using
- {{{http://plexus.codehaus.org/plexus-classworlds/}Plexus Classworlds}}.
+ {{{http://plexus.codehaus.org/plexus-classworlds/}Plexus Classworlds}},
+
+ * <<<ExceptionHandler>>> component ({{{./apidocs/org/apache/maven/exception/ExceptionHandler.html}javadoc}}),
+ with its <<<DefaultExceptionHandler>>> implementation
+ ({{{./xref/org/apache/maven/exception/DefaultExceptionHandler.html}source}}), use to transform exception into useful end-user messages.
+
\ No newline at end of file