maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject [47/50] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven into trunk
Date Thu, 14 Mar 2013 20:04:18 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven into trunk


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8181e7c7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8181e7c7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8181e7c7

Branch: refs/heads/eclipse-aether
Commit: 8181e7c7fa2ba104187710175c02ad2d042504b9
Parents: 39d063a b1b526a
Author: Jason van Zyl <jason@tesla.io>
Authored: Thu Feb 14 21:13:42 2013 -0500
Committer: Jason van Zyl <jason@tesla.io>
Committed: Thu Feb 14 21:13:42 2013 -0500

----------------------------------------------------------------------
 .gitattributes                                     |   10 +-
 .gitignore                                         |    2 +
 apache-maven/NOTICE.txt                            |    2 +-
 apache-maven/README.txt                            |   14 +-
 build.xml                                          |    6 +-
 .../internal/DefaultArtifactDescriptorReader.java  |    1 -
 .../internal/DefaultVersionRangeResolver.java      |   52 +--
 .../internal/DefaultVersionResolver.java           |  263 ++++++-------
 .../repository/internal/LocalSnapshotMetadata.java |   66 +---
 .../maven/repository/internal/MavenMetadata.java   |    6 +-
 .../repository/internal/MavenSnapshotMetadata.java |  100 +++++
 .../internal/RemoteSnapshotMetadata.java           |   72 +----
 .../repository/internal/VersionsMetadata.java      |   13 +-
 .../internal/AbstractRepositoryTestCase.java       |  152 ++++----
 .../internal/DefaultVersionResolverTest.java       |  192 +++++-----
 .../07.20.3-SNAPSHOT/maven-metadata.xml            |   96 +++---
 .../java/org/apache/maven/artifact/Artifact.java   |    4 +
 .../repository/ArtifactRepositoryPolicy.java       |    1 -
 .../artifact/versioning/ComparableVersion.java     |   18 +-
 .../versioning/DefaultArtifactVersion.java         |    2 +-
 .../apache/maven/artifact/ArtifactScopeEnum.java   |    2 +-
 .../metadata/DefaultRepositoryMetadataManager.java |   30 +-
 .../repository/metadata/MetadataBridge.java        |    1 -
 .../artifact/resolver/DefaultArtifactResolver.java |  108 ++++--
 .../maven/profiles/DefaultProfileManager.java      |    5 -
 .../activation/SystemPropertyProfileActivator.java |    2 +-
 .../AbstractStringBasedModelInterpolator.java      |    6 +-
 .../project/validation/DefaultModelValidator.java  |    4 -
 .../apache/maven/repository/MetadataGraphNode.java |    4 +-
 .../DefaultArtifactRepositoryFactory.java          |    2 +-
 .../resolver/DefaultLegacyArtifactCollector.java   |    4 +-
 .../resolver/transform/ArtifactTransformation.java |   11 +-
 .../transform/ArtifactTransformationManager.java   |    1 -
 .../repository/metadata/ArtifactMetadata.java      |   16 +-
 .../maven/repository/metadata/MetadataGraph.java   |    2 +-
 .../repository/metadata/MetadataGraphEdge.java     |   10 +-
 .../repository/metadata/MetadataResolution.java    |    2 +-
 maven-core/pom.xml                                 |  115 +++---
 .../main/java/org/apache/maven/DefaultMaven.java   |   25 ++-
 .../execution/DefaultMavenExecutionRequest.java    |   12 +
 .../execution/DefaultMavenExecutionResult.java     |    3 +-
 .../maven/execution/MavenExecutionRequest.java     |   38 ++-
 .../maven/lifecycle/internal/BuilderCommon.java    |   10 +-
 .../lifecycle/internal/CurrentPhaseForThread.java  |    7 +-
 .../DefaultLifecycleExecutionPlanCalculator.java   |   40 +-
 .../internal/DefaultLifecyclePluginAnalyzer.java   |    4 +-
 .../lifecycle/internal/ExecutionPlanItem.java      |    4 +-
 .../internal/LifecycleDependencyResolver.java      |   37 ++-
 .../lifecycle/internal/LifecycleModuleBuilder.java |    6 +-
 .../lifecycle/internal/LifecycleWeaveBuilder.java  |   18 +-
 .../lifecycle/internal/ThreadLockedArtifact.java   |   10 +-
 .../plugin/DefaultLifecycleBindingsInjector.java   |    6 +-
 .../apache/maven/plugin/BuildPluginManager.java    |   28 +-
 .../maven/plugin/DefaultBuildPluginManager.java    |   30 +-
 .../plugin/PluginParameterExpressionEvaluator.java |    4 +-
 .../plugin/internal/DefaultLegacySupport.java      |   25 +-
 .../plugin/internal/DefaultMavenPluginManager.java |    7 +-
 .../internal/PluginDependenciesResolver.java       |    2 +-
 .../maven/plugin/prefix/PluginPrefixResult.java    |    6 +-
 .../project/DefaultModelBuildingListener.java      |   18 +-
 .../maven/project/DefaultProjectBuilder.java       |   28 +-
 .../org/apache/maven/project/MavenProject.java     |   30 +-
 .../maven/project/ProjectBuildingRequest.java      |    2 +-
 .../apache/maven/repository/RepositorySystem.java  |   12 +-
 .../main/resources/META-INF/plexus/components.xml  |    4 +-
 .../resources/META-INF/plexus/default-bindings.xml |    2 +-
 maven-core/src/site/apt/artifact-handlers.apt      |   82 ++--
 maven-core/src/site/apt/index.apt                  |    8 +-
 .../artifact/handler/ArtifactHandlerTest.java      |  178 +++++-----
 .../exception/DefaultExceptionHandlerTest.java     |  120 +++---
 .../plugin/internal/DefaultLegacySupportTest.java  |   74 ++++
 maven-embedder/pom.xml                             |   10 +
 .../main/java/org/apache/maven/cli/CLIManager.java |    4 +-
 .../org/apache/maven/cli/CLIReportingUtils.java    |   14 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |   81 +++--
 .../maven/cli/event/ExecutionEventLogger.java      |    9 +-
 .../maven/cli/logging/BaseSlf4jConfiguration.java  |   44 ++
 .../maven/cli/logging/PrintStreamLogger.java       |  187 ---------
 .../maven/cli/logging/Slf4jConfiguration.java      |   43 ++
 .../cli/logging/Slf4jConfigurationFactory.java     |   81 ++++
 .../org/apache/maven/cli/logging/Slf4jLogger.java  |    4 +-
 .../maven/cli/logging/Slf4jStdoutLogger.java       |  303 +++++++++++++++
 .../cli/logging/impl/Log4j2Configuration.java      |   58 +++
 .../cli/logging/impl/LogbackConfiguration.java     |   60 +++
 .../cli/logging/impl/Slf4jSimpleConfiguration.java |   62 +++
 .../cli/transfer/Slf4jMavenTransferListener.java   |    9 +-
 .../src/main/java/org/slf4j/MavenSlf4jFriend.java  |   35 ++
 .../org/slf4j/impl/MavenSlf4jSimpleFriend.java     |   32 ++
 .../META-INF/maven/slf4j-configuration.properties  |    5 +
 maven-embedder/src/site/apt/logging.apt            |    5 +-
 .../maven/model/building/DefaultModelBuilder.java  |  128 ++++---
 .../maven/model/building/DefaultModelProblem.java  |    3 +-
 .../building/DefaultModelProblemCollector.java     |    7 +-
 .../apache/maven/model/building/ModelProblem.java  |    3 +-
 .../model/building/ModelProblemCollector.java      |    3 -
 .../building/ModelProblemCollectorRequest.java     |   44 ++-
 .../inheritance/DefaultInheritanceAssembler.java   |   19 +-
 .../AbstractStringBasedModelInterpolator.java      |    4 +-
 .../interpolation/ProblemDetectingValueSource.java |    3 +-
 .../StringSearchModelInterpolator.java             |   10 +-
 .../DefaultDependencyManagementInjector.java       |    2 +-
 .../DefaultPluginManagementInjector.java           |    2 +-
 .../apache/maven/model/merge/MavenModelMerger.java |   31 +-
 .../normalization/DefaultModelNormalizer.java      |    2 +-
 .../model/plugin/DefaultReportingConverter.java    |    6 +-
 .../profile/DefaultProfileActivationContext.java   |   61 +++-
 .../model/profile/DefaultProfileInjector.java      |    2 +-
 .../model/profile/DefaultProfileSelector.java      |    8 +-
 .../model/profile/ProfileActivationContext.java    |    7 +
 .../profile/activation/FileProfileActivator.java   |    2 +
 .../activation/JdkVersionProfileActivator.java     |    2 +-
 .../model/validation/DefaultModelValidator.java    |   10 +-
 .../resources/org/apache/maven/model/pom-4.0.0.xml |    6 +-
 maven-model-builder/src/site/apt/index.apt         |   28 +-
 .../org/apache/maven/model/merge/ModelMerger.java  |   71 ++--
 .../maven/plugin/descriptor/MojoDescriptor.java    |   16 +-
 pom.xml                                            |   82 ++---
 src/site/site.xml                                  |    2 +-
 118 files changed, 2357 insertions(+), 1530 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/8181e7c7/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --cc maven-embedder/src/site/apt/logging.apt
index 22fa1ac,fc3834e..bdab9b2
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@@ -22,13 -22,9 +22,13 @@@ Maven Loggin
  
  * Getting Logger Instance
  
-  Plexus Logger can be injected in Plexus component using Plexus annotations
+  Plexus Logger and LoggerManager can be injected in Plexus component using Plexus annotations
  
 +<<<<<<< HEAD
 ++------
 +=======
  +------+
 +>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
  import org.codehaus.plexus.logging.Logger;
  import org.codehaus.plexus.component.annotations.Component;
  import org.codehaus.plexus.component.annotations.Requirement;
@@@ -39,12 -35,11 +39,15 @@@ public class DefaultMyComponen
  {
      @Requirement
      private Logger logger;
+ 
+     @Requirement
+     private LoggerManager loggerManager;
  }
 +<<<<<<< HEAD
 ++------
 +=======
  +------+
 +>>>>>>> fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2
  
   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.


Mime
View raw message