[maven2-core] 37/38: Merge tag 'upstream/2.2.1'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Feb 27 13:24:22 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven2-core.

commit 191df3de6c6a3b4f76622c109527a0e21b9b81e9
Merge: db86a13 2c9423f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 27 11:51:27 2015 +0100

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 README.txt                                         |   40 +
 build.xml                                          |  322 ++
 maven-artifact-manager/pom.xml                     |   95 +
 .../artifact/deployer/DefaultArtifactDeployer.java |  132 +
 .../installer/DefaultArtifactInstaller.java        |  126 +
 .../artifact/manager/ChecksumFailedException.java  |   41 +
 .../artifact/manager/DefaultWagonManager.java      | 1291 ++++++++
 .../manager/DefaultWagonProviderMapping.java       |   46 +
 .../manager/WagonComponentConfigurator.java        |   47 +
 .../manager/WagonConfigurationException.java       |   60 +
 .../maven/artifact/manager/WagonManager.java       |  129 +
 .../artifact/manager/WagonProviderMapping.java     |   31 +
 .../repository/DefaultArtifactRepository.java      |  157 +
 .../DefaultArtifactRepositoryFactory.java          |  103 +
 .../metadata/AbstractRepositoryMetadata.java       |  202 ++
 .../metadata/ArtifactRepositoryMetadata.java       |   88 +
 .../metadata/DefaultRepositoryMetadataManager.java |  465 +++
 .../metadata/GroupRepositoryMetadata.java          |  112 +
 .../repository/metadata/RepositoryMetadata.java    |   62 +
 .../metadata/RepositoryMetadataManager.java        |   55 +
 .../SnapshotArtifactRepositoryMetadata.java        |   88 +
 .../artifact/resolver/DebugResolutionListener.java |  158 +
 .../artifact/resolver/DefaultArtifactResolver.java |  478 +++
 .../resolver/WarningResolutionListener.java        |   88 +
 .../transform/AbstractVersionTransformation.java   |  109 +
 .../DefaultArtifactTransformationManager.java      |   80 +
 .../transform/LatestArtifactTransformation.java    |   72 +
 .../transform/ReleaseArtifactTransformation.java   |   99 +
 .../artifact/transform/SnapshotTransformation.java |  179 +
 .../main/resources/META-INF/plexus/components.xml  |  192 ++
 maven-artifact-manager/src/site/site.xml           |    6 +
 .../AbstractArtifactComponentTestCase.java         |  289 ++
 .../artifact/deployer/ArtifactDeployerTest.java    |   62 +
 .../artifact/installer/ArtifactInstallerTest.java  |   62 +
 .../artifact/manager/DefaultWagonManagerTest.java  |  621 ++++
 .../apache/maven/artifact/manager/StringWagon.java |   95 +
 .../org/apache/maven/artifact/manager/WagonA.java  |   36 +
 .../manager/WagonAWithImplementationHint.java      |   36 +
 .../org/apache/maven/artifact/manager/WagonB.java  |   36 +
 .../org/apache/maven/artifact/manager/WagonC.java  |   36 +
 .../apache/maven/artifact/manager/WagonMock.java   |   51 +
 .../metadata/AbstractRepositoryMetadataTest.java   |  181 +
 .../artifact/resolver/ArtifactResolverTest.java    |  465 +++
 .../maven/artifact/testutils/MockManager.java      |   58 +
 .../maven/artifact/testutils/TestFileManager.java  |  250 ++
 .../artifact/deployer/ArtifactDeployerTest.xml     |   27 +
 .../artifact/installer/ArtifactInstallerTest.xml   |   27 +
 .../artifact/manager/DefaultWagonManagerTest.xml   |   57 +
 .../artifact/resolver/ArtifactResolverTest.xml     |   27 +
 maven-artifact-manager/src/test/resources/pom.xml  |  136 +
 maven-artifact-test/pom.xml                        |   60 +
 .../maven/artifact/test/ArtifactTestCase.java      |   76 +
 maven-artifact-test/src/site/site.xml              |    6 +
 maven-artifact/pom.xml                             |   43 +
 .../java/org/apache/maven/artifact/Artifact.java   |  180 +
 .../org/apache/maven/artifact/ArtifactStatus.java  |  126 +
 .../org/apache/maven/artifact/ArtifactUtils.java   |  161 +
 .../org/apache/maven/artifact/DefaultArtifact.java |  634 ++++
 .../DependencyResolutionRequiredException.java     |   36 +
 .../maven/artifact/InvalidArtifactRTException.java |   91 +
 .../maven/artifact/InvalidRepositoryException.java |   35 +
 .../maven/artifact/deployer/ArtifactDeployer.java  |   59 +
 .../deployer/ArtifactDeploymentException.java      |   43 +
 .../maven/artifact/factory/ArtifactFactory.java    |   58 +
 .../artifact/factory/DefaultArtifactFactory.java   |  166 +
 .../maven/artifact/handler/ArtifactHandler.java    |   43 +
 .../artifact/handler/DefaultArtifactHandler.java   |  110 +
 .../handler/manager/ArtifactHandlerManager.java    |   37 +
 .../manager/DefaultArtifactHandlerManager.java     |   59 +
 .../installer/ArtifactInstallationException.java   |   43 +
 .../artifact/installer/ArtifactInstaller.java      |   60 +
 .../metadata/AbstractArtifactMetadata.java         |   66 +
 .../maven/artifact/metadata/ArtifactMetadata.java  |   87 +
 .../ArtifactMetadataRetrievalException.java        |   70 +
 .../artifact/metadata/ArtifactMetadataSource.java  |   61 +
 .../maven/artifact/metadata/ResolutionGroup.java   |   58 +
 .../artifact/repository/ArtifactRepository.java    |   61 +
 .../repository/ArtifactRepositoryFactory.java      |   41 +
 .../repository/ArtifactRepositoryPolicy.java       |  140 +
 .../layout/ArtifactRepositoryLayout.java           |   38 +
 .../repository/layout/DefaultRepositoryLayout.java |   98 +
 .../repository/layout/LegacyRepositoryLayout.java  |   79 +
 .../RepositoryMetadataDeploymentException.java     |   40 +
 .../RepositoryMetadataInstallationException.java   |   40 +
 .../metadata/RepositoryMetadataReadException.java  |   38 +
 .../RepositoryMetadataResolutionException.java     |   40 +
 .../metadata/RepositoryMetadataStoreException.java |   40 +
 .../AbstractArtifactResolutionException.java       |  297 ++
 .../maven/artifact/resolver/ArtifactCollector.java |   49 +
 .../resolver/ArtifactNotFoundException.java        |   75 +
 .../resolver/ArtifactResolutionException.java      |   64 +
 .../resolver/ArtifactResolutionResult.java         |   74 +
 .../maven/artifact/resolver/ArtifactResolver.java  |   98 +
 .../resolver/CyclicDependencyException.java        |   45 +
 .../resolver/DefaultArtifactCollector.java         |  595 ++++
 .../MultipleArtifactsNotFoundException.java        |  118 +
 .../artifact/resolver/ResolutionListener.java      |  106 +
 .../resolver/ResolutionListenerForDepMgmt.java     |   39 +
 .../maven/artifact/resolver/ResolutionNode.java    |  247 ++
 .../resolver/conflict/ConflictResolver.java        |   29 +
 .../resolver/conflict/DefaultConflictResolver.java |   29 +
 .../resolver/filter/AndArtifactFilter.java         |   57 +
 .../artifact/resolver/filter/ArtifactFilter.java   |   31 +
 .../resolver/filter/ExcludesArtifactFilter.java    |   45 +
 .../resolver/filter/ExclusionSetFilter.java        |   56 +
 .../resolver/filter/IncludesArtifactFilter.java    |   58 +
 .../resolver/filter/InversionArtifactFilter.java   |   40 +
 .../resolver/filter/ScopeArtifactFilter.java       |  107 +
 .../resolver/filter/TypeArtifactFilter.java        |   41 +
 .../artifact/transform/ArtifactTransformation.java |   73 +
 .../transform/ArtifactTransformationManager.java   |   71 +
 .../maven/artifact/versioning/ArtifactVersion.java |   43 +
 .../versioning/DefaultArtifactVersion.java         |  273 ++
 .../InvalidVersionSpecificationException.java      |   35 +
 .../artifact/versioning/ManagedVersionMap.java     |   52 +
 .../OverConstrainedVersionException.java           |   46 +
 .../maven/artifact/versioning/Restriction.java     |  197 ++
 .../maven/artifact/versioning/VersionRange.java    |  583 ++++
 .../main/resources/META-INF/plexus/components.xml  |  223 ++
 maven-artifact/src/site/site.xml                   |    6 +
 .../apache/maven/artifact/ArtifactUtilsTest.java   |   82 +
 .../apache/maven/artifact/DefaultArtifactTest.java |  116 +
 .../factory/DefaultArtifactFactoryTest.java        |   49 +
 .../artifact/handler/ArtifactHandlerMock.java      |  100 +
 .../resolver/ArtifactResolutionExceptionTest.java  |   69 +
 .../resolver/DefaultArtifactCollectorTest.java     | 1073 ++++++
 .../versioning/DefaultArtifactVersionTest.java     |  326 ++
 .../artifact/versioning/VersionRangeTest.java      |  661 ++++
 maven-compat/pom.xml                               |  103 +
 .../apache/maven/cli/compat/CompatibleMain.java    |   62 +
 maven-core-it-runner/pom.xml                       |  175 +
 maven-core-it-runner/src/site/site.xml             |    6 +
 .../src/test/java/org/apache/maven/its/Suite.java  |   16 +
 maven-core/checkstyle-license.txt                  |   18 +
 maven-core/pom.xml                                 |  369 +++
 .../org/apache/maven/BuildFailureException.java    |   40 +
 .../maven/ConfigurationInterpolationException.java |   19 +
 .../apache/maven/ConfigurationInterpolator.java    |   14 +
 .../main/java/org/apache/maven/DefaultMaven.java   | 1158 +++++++
 .../src/main/java/org/apache/maven/Maven.java      |   39 +
 .../apache/maven/MavenArtifactFilterManager.java   |   96 +
 .../maven/ReflectionConfigurationInterpolator.java |   28 +
 .../maven/SettingsConfigurationException.java      |   64 +
 .../maven/cli/AbstractConsoleDownloadMonitor.java  |  132 +
 .../apache/maven/cli/BatchModeDownloadMonitor.java |   51 +
 .../main/java/org/apache/maven/cli/CLIManager.java |  352 ++
 .../apache/maven/cli/ConsoleDownloadMonitor.java   |  131 +
 .../main/java/org/apache/maven/cli/MavenCli.java   |  795 +++++
 .../org/apache/maven/container/ContainerUtils.java |   72 +
 .../org/apache/maven/execution/BuildFailure.java   |   57 +
 .../org/apache/maven/execution/BuildSuccess.java   |   51 +
 .../execution/DefaultMavenExecutionRequest.java    |  258 ++
 .../maven/execution/DefaultRuntimeInformation.java |   84 +
 .../maven/execution/MavenExecutionRequest.java     |   94 +
 .../org/apache/maven/execution/MavenSession.java   |  226 ++
 .../org/apache/maven/execution/ReactorManager.java |  240 ++
 .../apache/maven/execution/RuntimeInformation.java |   33 +
 .../maven/extension/DefaultExtensionManager.java   |  378 +++
 .../apache/maven/extension/ExtensionManager.java   |   46 +
 .../maven/lifecycle/DefaultLifecycleExecutor.java  | 2063 ++++++++++++
 .../java/org/apache/maven/lifecycle/Lifecycle.java |  101 +
 .../lifecycle/LifecycleExecutionException.java     |   43 +
 .../apache/maven/lifecycle/LifecycleExecutor.java  |   45 +
 .../lifecycle/mapping/DefaultLifecycleMapping.java |  103 +
 .../apache/maven/lifecycle/mapping/Lifecycle.java  |   83 +
 .../maven/lifecycle/mapping/LifecycleMapping.java  |   36 +
 .../maven/monitor/event/DefaultEventMonitor.java   |   47 +
 .../apache/maven/monitor/logging/DefaultLog.java   |  131 +
 .../maven/plugin/DebugConfigurationListener.java   |   91 +
 .../apache/maven/plugin/DefaultPluginManager.java  | 1644 ++++++++++
 .../maven/plugin/DefaultPluginMappingManager.java  |  131 +
 .../maven/plugin/InvalidPluginException.java       |   35 +
 .../apache/maven/plugin/MavenPluginCollector.java  |  109 +
 .../apache/maven/plugin/MavenPluginDiscoverer.java |   54 +
 .../apache/maven/plugin/MavenPluginValidator.java  |   78 +
 .../org/apache/maven/plugin/MojoExecution.java     |  119 +
 .../maven/plugin/PluginConfigurationException.java |  285 ++
 .../org/apache/maven/plugin/PluginManager.java     |   96 +
 .../maven/plugin/PluginManagerException.java       |   40 +
 .../apache/maven/plugin/PluginMappingManager.java  |   37 +
 .../maven/plugin/PluginNotFoundException.java      |   39 +
 .../maven/plugin/PluginParameterException.java     |  126 +
 .../plugin/PluginParameterExpressionEvaluator.java |  366 +++
 .../java/org/apache/maven/plugin/PluginUtils.java  |   79 +
 .../version/DefaultPluginVersionManager.java       |  766 +++++
 .../apache/maven/plugin/version/IntervalUtils.java |  132 +
 .../maven/plugin/version/PluginVersionManager.java |   39 +
 .../version/PluginVersionNotFoundException.java    |   47 +
 .../version/PluginVersionResolutionException.java  |   64 +
 .../maven/reactor/MavenExecutionException.java     |   47 +
 .../maven/usability/ArtifactNotFoundDiagnoser.java |   62 +
 .../maven/usability/ArtifactResolverDiagnoser.java |   68 +
 .../maven/usability/InvalidArtifactDiagnoser.java  |   65 +
 .../usability/MojoExecutionExceptionDiagnoser.java |   83 +
 .../usability/MojoFailureExceptionDiagnoser.java   |   65 +
 .../usability/PluginConfigurationDiagnoser.java    |   59 +
 .../usability/ProfileActivationDiagnoser.java      |   60 +
 .../maven/usability/ProjectBuildDiagnoser.java     |   69 +
 .../org/apache/maven/usability/SystemWarnings.java |   31 +
 .../plugin/ExpressionDocumentationException.java   |   37 +
 .../usability/plugin/ExpressionDocumenter.java     |  173 +
 .../maven/plugin-expressions/project.paramdoc.xml  |  172 +
 .../maven/plugin-expressions/rootless.paramdoc.xml |   48 +
 .../maven/plugin-expressions/settings.paramdoc.xml |   53 +
 .../main/resources/META-INF/plexus/components.xml  |  654 ++++
 .../src/main/resources/META-INF/plexus/plexus.xml  |   37 +
 .../org/apache/maven/messages/build.properties     |    3 +
 .../org/apache/maven/messages/messages.properties  |   34 +
 .../apache/maven/messages/messages_de.properties   |   34 +
 .../apache/maven/messages/messages_el.properties   |   33 +
 .../apache/maven/messages/messages_en.properties   |   23 +
 .../apache/maven/messages/messages_es.properties   |   33 +
 .../apache/maven/messages/messages_fr.properties   |   34 +
 .../apache/maven/messages/messages_ja.properties   |   34 +
 .../apache/maven/messages/messages_ko.properties   |   34 +
 .../apache/maven/messages/messages_nl.properties   |   33 +
 .../apache/maven/messages/messages_no.properties   |   33 +
 .../apache/maven/messages/messages_pl.properties   |   34 +
 .../maven/messages/messages_zh_CN.properties       |   34 +
 maven-core/src/site/site.xml                       |    6 +
 .../test/java/org/apache/maven/MavenTestUtils.java |   59 +
 .../java/org/apache/maven/WagonSelectorTest.java   |  229 ++
 .../cli/AbstractConsoleDownloadMonitorTest.java    |  128 +
 .../maven/cli/BatchModeDownloadMonitorTest.java    |   38 +
 .../maven/cli/ConsoleDownloadMonitorTest.java      |   82 +
 .../java/org/apache/maven/cli/MavenCliTest.java    |   88 +
 .../PluginParameterExpressionEvaluatorTest.java    |  300 ++
 .../maven/plugin/version/IntervalUtilsTest.java    |  106 +
 .../usability/ArtifactResolverDiagnoserTest.java   |   53 +
 .../usability/InvalidArtifactDiagnoserTest.java    |   92 +
 .../MojoExecutionExceptionDiagnoserTest.java       |   30 +
 .../MojoFailureExceptionDiagnoserTest.java         |   30 +
 .../maven/usability/PluginErrorDiagnoserTest.java  |  281 ++
 .../org/apache/maven/WagonSelectorTest.xml         |   27 +
 .../PluginParameterExpressionEvaluatorTest.xml     |   53 +
 maven-core/src/test/resources/pom.xml              |   48 +
 .../src/test/resources/projects/bad-project.xml    |   20 +
 .../src/test/resources/projects/build.properties   |   18 +
 .../child-which-inherits-from-super-model.xml      |   28 +
 .../resources/projects/child-with-bogus-parent.xml |   29 +
 maven-core/src/test/resources/projects/child.xml   |   33 +
 .../resources/projects/fully-populated-child.xml   |  168 +
 maven-core/src/test/resources/projects/project.xml |  162 +
 .../maven-test/jars/maven-test-b-1.0.jar.md5       |    1 +
 .../maven-test/poms/maven-test-b-1.0.pom           |   21 +
 ...en-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version |    1 +
 ...en-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version |    1 +
 ...en-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version |    1 +
 maven-error-diagnostics/pom.xml                    |   41 +
 .../usability/diagnostics/DiagnosisUtils.java      |  108 +
 .../usability/diagnostics/ErrorDiagnoser.java      |   30 +
 .../usability/diagnostics/ErrorDiagnostics.java    |  141 +
 .../main/resources/META-INF/plexus/components.xml  |   28 +
 maven-error-diagnostics/src/site/site.xml          |    6 +
 maven-integration-tests/pom.xml                    |   83 +
 maven-model/maven.xml                              |   39 +
 maven-model/pom.xml                                |  104 +
 maven-model/project.properties                     |   34 +
 maven-model/project.xml                            |   42 +
 maven-model/src/main/mdo/maven.mdo                 | 3469 ++++++++++++++++++++
 maven-model/src/site/apt/index.apt                 |   20 +
 maven-model/src/site/site.xml                      |    6 +
 .../org/apache/maven/model/ActivationFileTest.java |   57 +
 .../org/apache/maven/model/ActivationOSTest.java   |   57 +
 .../apache/maven/model/ActivationPropertyTest.java |   57 +
 .../org/apache/maven/model/ActivationTest.java     |   57 +
 .../java/org/apache/maven/model/BuildTest.java     |   57 +
 .../org/apache/maven/model/CiManagementTest.java   |   57 +
 .../org/apache/maven/model/ContributorTest.java    |   57 +
 .../maven/model/DependencyManagementTest.java      |   57 +
 .../org/apache/maven/model/DependencyTest.java     |   57 +
 .../maven/model/DeploymentRepositoryTest.java      |   57 +
 .../java/org/apache/maven/model/DeveloperTest.java |   57 +
 .../maven/model/DistributionManagementTest.java    |   57 +
 .../java/org/apache/maven/model/ExclusionTest.java |   57 +
 .../java/org/apache/maven/model/ExtensionTest.java |   57 +
 .../apache/maven/model/IssueManagementTest.java    |   57 +
 .../java/org/apache/maven/model/LicenseTest.java   |   57 +
 .../org/apache/maven/model/MailingListTest.java    |   57 +
 .../java/org/apache/maven/model/ModelTest.java     |   57 +
 .../java/org/apache/maven/model/NotifierTest.java  |   57 +
 .../org/apache/maven/model/OrganizationTest.java   |   57 +
 .../java/org/apache/maven/model/ParentTest.java    |   57 +
 .../maven/model/PluginConfigurationTest.java       |   57 +
 .../apache/maven/model/PluginContainerTest.java    |   57 +
 .../apache/maven/model/PluginExecutionTest.java    |   57 +
 .../apache/maven/model/PluginManagementTest.java   |   57 +
 .../java/org/apache/maven/model/PluginTest.java    |   57 +
 .../org/apache/maven/model/PrerequisitesTest.java  |   57 +
 .../java/org/apache/maven/model/ProfileTest.java   |   57 +
 .../org/apache/maven/model/RelocationTest.java     |   57 +
 .../org/apache/maven/model/ReportPluginTest.java   |   93 +
 .../java/org/apache/maven/model/ReportSetTest.java |   57 +
 .../java/org/apache/maven/model/ReportingTest.java |   57 +
 .../apache/maven/model/RepositoryPolicyTest.java   |   57 +
 .../org/apache/maven/model/RepositoryTest.java     |   57 +
 .../java/org/apache/maven/model/ResourceTest.java  |   57 +
 .../test/java/org/apache/maven/model/ScmTest.java  |   57 +
 .../test/java/org/apache/maven/model/SiteTest.java |   57 +
 maven-monitor/pom.xml                              |   31 +
 .../event/AbstractSelectiveEventMonitor.java       |   81 +
 .../monitor/event/DefaultEventDispatcher.java      |   67 +
 .../maven/monitor/event/EventDispatcher.java       |   36 +
 .../apache/maven/monitor/event/EventMonitor.java   |   34 +
 .../apache/maven/monitor/event/MavenEvents.java    |   46 +
 maven-monitor/src/site/site.xml                    |    6 +
 maven-plugin-api/pom.xml                           |   40 +
 .../java/org/apache/maven/plugin/AbstractMojo.java |  198 ++
 .../plugin/AbstractMojoExecutionException.java     |   54 +
 .../org/apache/maven/plugin/ContextEnabled.java    |   46 +
 .../main/java/org/apache/maven/plugin/Mojo.java    |   73 +
 .../maven/plugin/MojoExecutionException.java       |   80 +
 .../apache/maven/plugin/MojoFailureException.java  |   69 +
 .../java/org/apache/maven/plugin/logging/Log.java  |  159 +
 .../maven/plugin/logging/SystemStreamLog.java      |  197 ++
 maven-plugin-api/src/site/site.xml                 |    6 +
 maven-plugin-descriptor/pom.xml                    |   61 +
 .../DuplicateMojoDescriptorException.java          |   31 +
 .../descriptor/DuplicateParameterException.java    |   31 +
 .../descriptor/InvalidParameterException.java      |   39 +
 .../InvalidPluginDescriptorException.java          |   38 +
 .../maven/plugin/descriptor/MojoDescriptor.java    |  625 ++++
 .../apache/maven/plugin/descriptor/Parameter.java  |  190 ++
 .../maven/plugin/descriptor/PluginDescriptor.java  |  381 +++
 .../plugin/descriptor/PluginDescriptorBuilder.java |  341 ++
 .../maven/plugin/descriptor/Requirement.java       |   55 +
 maven-plugin-descriptor/src/main/mdo/lifecycle.mdo |  128 +
 maven-plugin-descriptor/src/site/site.xml          |    6 +
 .../plugin/lifecycle/LifecycleXpp3ReaderTest.java  |   58 +
 .../src/test/resources/lifecycle.xml               |   39 +
 maven-plugin-parameter-documenter/pom.xml          |   57 +
 .../src/main/mdo/paramdoc.mdo                      |  154 +
 .../src/site/site.xml                              |    6 +
 .../maven/usability/plugin/Xpp3ParseTest.java      |   60 +
 .../src/test/resources/test.paramdoc.xml           |   48 +
 maven-plugin-registry/plugin-registry.mdo          |  218 ++
 maven-plugin-registry/pom.xml                      |   57 +
 .../registry/DefaultPluginRegistryBuilder.java     |  179 +
 .../registry/MavenPluginRegistryBuilder.java       |   38 +
 .../maven/plugin/registry/PluginRegistryUtils.java |  169 +
 .../apache/maven/plugin/registry/RuntimeInfo.java  |   84 +
 .../main/resources/META-INF/plexus/components.xml  |   33 +
 maven-plugin-registry/src/site/site.xml            |    6 +
 maven-profile/pom.xml                              |   65 +
 .../apache/maven/profiles/AlwaysOnActivation.java  |   28 +
 .../profiles/DefaultMavenProfilesBuilder.java      |   89 +
 .../maven/profiles/MavenProfilesBuilder.java       |   37 +
 .../maven/profiles/ProfilesConversionUtils.java    |  153 +
 maven-profile/src/main/mdo/profiles.mdo            |  398 +++
 .../main/resources/META-INF/plexus/components.xml  |   32 +
 maven-profile/src/site/site.xml                    |    6 +
 maven-project/pom.xml                              |   78 +
 .../maven/profiles/DefaultProfileManager.java      |  364 ++
 .../org/apache/maven/profiles/ProfileManager.java  |   62 +
 .../activation/AlwaysOnProfileActivator.java       |   37 +
 .../activation/DetectedProfileActivator.java       |   34 +
 .../profiles/activation/FileProfileActivator.java  |  106 +
 .../activation/JdkPrefixProfileActivator.java      |  103 +
 .../OperatingSystemProfileActivator.java           |  160 +
 .../activation/ProfileActivationException.java     |   36 +
 .../profiles/activation/ProfileActivator.java      |   32 +
 .../activation/SystemPropertyProfileActivator.java |  112 +
 .../maven/project/DefaultMavenProjectBuilder.java  | 2518 ++++++++++++++
 .../maven/project/DefaultMavenProjectHelper.java   |  105 +
 .../DefaultProjectBuilderConfiguration.java        |   87 +
 .../maven/project/DuplicateProjectException.java   |   41 +
 .../project/InvalidProjectModelException.java      |   68 +
 .../org/apache/maven/project/MavenProject.java     | 2159 ++++++++++++
 .../apache/maven/project/MavenProjectBuilder.java  |  173 +
 .../maven/project/MavenProjectBuildingResult.java  |   81 +
 .../apache/maven/project/MavenProjectHelper.java   |   39 +
 .../maven/project/MissingProjectException.java     |   41 +
 .../java/org/apache/maven/project/ModelUtils.java  | 1594 +++++++++
 .../maven/project/ProjectBuilderConfiguration.java |   32 +
 .../maven/project/ProjectBuildingException.java    |   52 +
 .../org/apache/maven/project/ProjectSorter.java    |  396 +++
 .../org/apache/maven/project/ProjectUtils.java     |  163 +
 .../project/artifact/ActiveProjectArtifact.java    |  407 +++
 .../maven/project/artifact/AttachedArtifact.java   |  166 +
 .../InvalidDependencyVersionException.java         |   35 +
 .../project/artifact/MavenMetadataSource.java      |  535 +++
 .../project/artifact/ProjectArtifactFactory.java   |   51 +
 .../project/artifact/ProjectArtifactMetadata.java  |  152 +
 .../DefaultModelInheritanceAssembler.java          |  564 ++++
 .../inheritance/ModelInheritanceAssembler.java     |   42 +
 .../injection/DefaultModelDefaultsInjector.java    |  148 +
 .../project/injection/DefaultProfileInjector.java  |  620 ++++
 .../project/injection/ModelDefaultsInjector.java   |   35 +
 .../maven/project/injection/ProfileInjector.java   |   31 +
 .../AbstractStringBasedModelInterpolator.java      |  404 +++
 .../interpolation/BuildTimestampValueSource.java   |   63 +
 .../interpolation/ModelInterpolationException.java |   71 +
 .../project/interpolation/ModelInterpolator.java   |   65 +
 .../PathTranslatingPostProcessor.java              |   63 +
 .../interpolation/RegexBasedModelInterpolator.java |   58 +
 .../StringSearchModelInterpolator.java             |  389 +++
 .../apache/maven/project/overlay/BuildOverlay.java |  278 ++
 .../maven/project/path/DefaultPathTranslator.java  |  287 ++
 .../apache/maven/project/path/PathTranslator.java  |   41 +
 .../project/validation/DefaultModelValidator.java  |  389 +++
 .../project/validation/ModelValidationResult.java  |   93 +
 .../maven/project/validation/ModelValidator.java   |   33 +
 .../main/resources/META-INF/plexus/components.xml  |  218 ++
 .../org/apache/maven/project/pom-4.0.0.xml         |  209 ++
 maven-project/src/site/site.xml                    |    6 +
 .../maven/profiles/DefaultProfileManagerTest.java  |  277 ++
 .../activation/JdkPrefixProfileActivatorTest.java  |  158 +
 .../project/AbstractMavenProjectTestCase.java      |  131 +
 .../project/DefaultMavenProjectBuilderTest.java    |  212 ++
 .../maven/project/MavenProjectDynamismTest.java    |  690 ++++
 .../org/apache/maven/project/MavenProjectTest.java |  178 +
 .../org/apache/maven/project/ModelUtilsTest.java   |  651 ++++
 .../project/ProjectBaseDirectoryAlignmentTest.java |   56 +
 .../apache/maven/project/ProjectClasspathTest.java |  125 +
 .../apache/maven/project/ProjectSorterTest.java    |  463 +++
 .../apache/maven/project/TestArtifactResolver.java |  229 ++
 .../apache/maven/project/TestProjectBuilder.java   |   37 +
 .../project/artifact/MavenMetadataSourceTest.java  |  182 +
 .../canonical/CanonicalProjectBuilderTest.java     |  105 +
 .../imports/AbstractProjectImportsTestCase.java    |   53 +
 .../project/imports/t01/ProjectImportsTest.java    |  131 +
 .../AbstractProjectInheritanceTestCase.java        |   53 +
 .../DefaultModelInheritanceAssemblerTest.java      | 1180 +++++++
 .../inheritance/t00/ProjectInheritanceTest.java    |   94 +
 .../inheritance/t01/ProjectInheritanceTest.java    |   93 +
 .../inheritance/t02/ProjectInheritanceTest.java    |  173 +
 .../inheritance/t03/ProjectInheritanceTest.java    |   75 +
 .../inheritance/t04/ProjectInheritanceTest.java    |   83 +
 .../inheritance/t05/ProjectInheritanceTest.java    |   79 +
 .../inheritance/t06/ProjectInheritanceTest.java    |   81 +
 .../inheritance/t07/ProjectInheritanceTest.java    |   91 +
 .../inheritance/t08/ProjectInheritanceTest.java    |   81 +
 .../inheritance/t09/ProjectInheritanceTest.java    |  133 +
 .../inheritance/t10/ProjectInheritanceTest.java    |  101 +
 .../inheritance/t11/ProjectInheritanceTest.java    |   76 +
 .../inheritance/t12/ProjectInheritanceTest.java    |   65 +
 .../inheritance/t13/ProjectInheritanceTest.java    |   98 +
 .../DefaultModelDefaultsInjectorTest.java          |  437 +++
 .../injection/DefaultProfileInjectorTest.java      |  406 +++
 .../project/injection/TestProfileInjector.java     |   34 +
 .../AbstractModelInterpolatorTest.java             |  469 +++
 .../interpolation/ModelInterpolationEdgeCases.java |  233 ++
 .../RegexBasedModelInterpolatorTest.java           |   48 +
 .../StringSearchModelInterpolatorTest.java         |  336 ++
 .../project/path/DefaultPathTranslatorTest.java    |   48 +
 .../validation/DefaultModelValidatorTest.java      |  238 ++
 maven-project/src/test/resources/canonical-pom.xml |   51 +
 .../coord-expressions/alternative-encoding-pom.xml |   21 +
 .../resources/coord-expressions/invalid-pom.xml    |   27 +
 .../pom-with-build-dir-expression.xml              |   24 +
 .../coord-expressions/pom-with-comments.xml        |   21 +
 .../test/resources/dependencyManagement-pom.xml    |   41 +
 .../test/resources/distributionManagement-pom.xml  |   40 +
 .../t01/maven-test/poms/maven-test-a-1.0.pom       |   14 +
 .../t01/maven-test/poms/maven-test-a-1.1.pom       |   14 +
 .../t01/maven-test/poms/maven-test-b-1.0.pom       |    7 +
 .../t01/maven-test/poms/maven-test-b-1.1.pom       |    7 +
 .../t01/maven-test/poms/maven-test-c-1.0.pom       |    7 +
 .../t01/maven-test/poms/maven-test-c-1.1.pom       |    7 +
 .../t01/maven-test/poms/maven-test-d-1.0.pom       |    7 +
 .../t01/maven-test/poms/maven-test-d-1.1.pom       |    7 +
 .../t01/maven-test/poms/maven-test-d-1.2.pom       |    7 +
 .../test/resources/imports-repo/t01/p0/p1/pom.xml  |   45 +
 .../test/resources/imports-repo/t01/p0/p2/pom.xml  |   56 +
 .../test/resources/imports-repo/t01/p0/p3/pom.xml  |   59 +
 .../test/resources/imports-repo/t01/p0/p4/pom.xml  |   67 +
 .../src/test/resources/imports-repo/t01/p0/pom.xml |   26 +
 .../inheritance-repo/t00/maven/poms/p0-1.0.pom     |   11 +
 .../inheritance-repo/t00/maven/poms/p1-1.0.pom     |   16 +
 .../inheritance-repo/t00/maven/poms/p2-1.0.pom     |   18 +
 .../inheritance-repo/t00/maven/poms/p3-1.0.pom     |   14 +
 .../inheritance-repo/t00/maven/poms/p4-1.0.pom     |   13 +
 .../inheritance-repo/t01/maven/poms/p0-1.0.pom     |   11 +
 .../inheritance-repo/t01/maven/poms/p1-1.0.pom     |   16 +
 .../inheritance-repo/t01/maven/poms/p2-1.0.pom     |   16 +
 .../inheritance-repo/t01/maven/poms/p3-1.0.pom     |   16 +
 .../inheritance-repo/t01/maven/poms/p4-1.0.pom     |   16 +
 .../inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml |   32 +
 .../inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml    |   32 +
 .../inheritance-repo/t02/p0/p1/p2/p3/pom.xml       |   33 +
 .../inheritance-repo/t02/p0/p1/p2/pom.xml          |   37 +
 .../resources/inheritance-repo/t02/p0/p1/pom.xml   |   51 +
 .../test/resources/inheritance-repo/t02/p0/pom.xml |   30 +
 .../resources/inheritance-repo/t03/p0/p1/pom.xml   |   45 +
 .../test/resources/inheritance-repo/t03/p0/pom.xml |   30 +
 .../t04/maven-test/poms/maven-test-a-1.0.pom       |   21 +
 .../t04/maven-test/poms/maven-test-b-1.0.pom       |    7 +
 .../t04/maven-test/poms/maven-test-b-2.0.pom       |    7 +
 .../t04/maven-test/poms/maven-test-c-1.0.pom       |    7 +
 .../t04/maven-test/poms/maven-test-c-2.0.pom       |    7 +
 .../resources/inheritance-repo/t04/p0/p1/pom.xml   |   41 +
 .../test/resources/inheritance-repo/t04/p0/pom.xml |   37 +
 .../t05/maven-test/poms/maven-test-a-1.0.pom       |   23 +
 .../t05/maven-test/poms/maven-test-a-2.0.pom       |   23 +
 .../t05/maven-test/poms/maven-test-b-1.0.pom       |   24 +
 .../t05/maven-test/poms/maven-test-b-1.1.pom       |   24 +
 .../t05/maven-test/poms/maven-test-b-2.0.pom       |   24 +
 .../t05/maven-test/poms/maven-test-c-1.0.pom       |   17 +
 .../t05/maven-test/poms/maven-test-d-1.0.pom       |    7 +
 .../t05/maven-test/poms/maven-test-d-1.1.pom       |    7 +
 .../t05/maven-test/poms/maven-test-d-1.2.pom       |    7 +
 .../resources/inheritance-repo/t05/p0/p1/pom.xml   |   54 +
 .../test/resources/inheritance-repo/t05/p0/pom.xml |   36 +
 .../t06/maven-test/poms/maven-test-a-1.0.pom       |   23 +
 .../t06/maven-test/poms/maven-test-b-1.0.pom       |   24 +
 .../t06/maven-test/poms/maven-test-b-1.1.pom       |   24 +
 .../t06/maven-test/poms/maven-test-c-1.0.pom       |   17 +
 .../t06/maven-test/poms/maven-test-d-1.0.pom       |    7 +
 .../t06/maven-test/poms/maven-test-d-1.1.pom       |    7 +
 .../t06/maven-test/poms/maven-test-d-1.2.pom       |    7 +
 .../resources/inheritance-repo/t06/p0/p1/pom.xml   |   54 +
 .../test/resources/inheritance-repo/t06/p0/pom.xml |   37 +
 .../t07/maven-test/poms/maven-test-a-1.0.pom       |   23 +
 .../t07/maven-test/poms/maven-test-b-1.0.pom       |   24 +
 .../t07/maven-test/poms/maven-test-b-1.1.pom       |   24 +
 .../t07/maven-test/poms/maven-test-c-1.0.pom       |   17 +
 .../t07/maven-test/poms/maven-test-d-1.0.pom       |    7 +
 .../t07/maven-test/poms/maven-test-d-1.1.pom       |    7 +
 .../t07/maven-test/poms/maven-test-d-1.2.pom       |    7 +
 .../resources/inheritance-repo/t07/p0/p1/pom.xml   |   54 +
 .../test/resources/inheritance-repo/t07/p0/pom.xml |   37 +
 .../t08/maven-test/poms/maven-test-a-1.0.pom       |   23 +
 .../t08/maven-test/poms/maven-test-b-1.0.pom       |   24 +
 .../t08/maven-test/poms/maven-test-b-1.1.pom       |   24 +
 .../t08/maven-test/poms/maven-test-c-1.0.pom       |   17 +
 .../t08/maven-test/poms/maven-test-d-1.0.pom       |    7 +
 .../t08/maven-test/poms/maven-test-d-1.1.pom       |    7 +
 .../t08/maven-test/poms/maven-test-d-1.2.pom       |    7 +
 .../resources/inheritance-repo/t08/p0/p1/pom.xml   |   59 +
 .../test/resources/inheritance-repo/t08/p0/pom.xml |   37 +
 .../t09/maven-test/poms/maven-test-a-1.0.pom       |   24 +
 .../t09/maven-test/poms/maven-test-b-1.0.pom       |   17 +
 .../t09/maven-test/poms/maven-test-c-1.0.pom       |    7 +
 .../t09/maven-test/poms/maven-test-d-1.0.pom       |   17 +
 .../resources/inheritance-repo/t09/p0/p1/pom.xml   |   36 +
 .../resources/inheritance-repo/t09/p0/p2/pom.xml   |   42 +
 .../test/resources/inheritance-repo/t09/p0/pom.xml |   38 +
 .../t10/maven-test/poms/maven-test-a-1.0.pom       |   24 +
 .../t10/maven-test/poms/maven-test-b-1.0.pom       |    7 +
 .../t10/maven-test/poms/maven-test-c-1.0.pom       |    7 +
 .../resources/inheritance-repo/t10/p0/p1/pom.xml   |   42 +
 .../test/resources/inheritance-repo/t10/p0/pom.xml |   41 +
 .../resources/inheritance-repo/t11/p0/p1/pom.xml   |   16 +
 .../test/resources/inheritance-repo/t11/p0/pom.xml |   27 +
 .../resources/inheritance-repo/t12/p0/p1/pom.xml   |   29 +
 .../test/resources/inheritance-repo/t12/p0/pom.xml |   30 +
 .../resources/inheritance-repo/t13/p0/p1/pom.xml   |   18 +
 .../test/resources/inheritance-repo/t13/p0/pom.xml |   21 +
 .../test-from-child/0.5/test-from-child-0.5.pom    |    7 +
 .../tests/test-from-child/1/test-from-child-1.pom  |    7 +
 .../test-from-parent/1/test-from-parent-1.pom      |    7 +
 .../src/test/resources/local-repo/marker.txt       |    1 +
 .../maven-test/poms/maven-test-a-1.0.pom           |   23 +
 .../maven-test/poms/maven-test-b-1.0.pom           |   23 +
 .../maven-test/poms/maven-test-c-1.0.pom           |   16 +
 .../maven-test/poms/maven-test-d-1.1.pom           |    7 +
 .../maven-test/poms/maven-test-d-1.2.pom           |    7 +
 ...en-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version |    1 +
 ...en-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version |    1 +
 ...en-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version |    1 +
 .../poms/maven-test-snapshot-resolving-1.0.pom     |   49 +
 .../apache/maven/project/ProjectClasspathTest.xml  |   99 +
 .../canonical/CanonicalProjectBuilderTest.xml      |   99 +
 .../project-dynamism/plugin-level-dep.pom.xml      |   24 +
 .../test/resources/project-dynamism/pom-interp.xml |   28 +
 .../resources/project-dynamism/pom-plugins.xml     |   30 +
 .../resources/project-dynamism/pom-relative.xml    |   36 +
 .../project-dynamism/pom-source-roots.xml          |   17 +
 .../src/test/resources/project-dynamism/pom.xml    |   36 +
 ...oject-which-needs-directory-alignment-child.xml |   33 +
 .../project-which-needs-directory-alignment.xml    |  135 +
 ...oject-which-needs-directory-alignment-child.xml |   29 +
 .../projects/build-path-expression-pom.xml         |   14 +
 .../projects/duplicate-plugins-merged-pom.xml      |   32 +
 .../grandchild-check/child/grandchild/pom.xml      |   10 +
 .../projects/grandchild-check/child/pom.xml        |   13 +
 .../resources/projects/grandchild-check/pom.xml    |    7 +
 .../scope/project-with-scoped-dependencies.xml     |   99 +
 .../projects/scope/transitive-compile-dep.xml      |   56 +
 .../projects/scope/transitive-default-dep.xml      |   57 +
 .../projects/scope/transitive-provided-dep.xml     |   56 +
 .../projects/scope/transitive-runtime-dep.xml      |   57 +
 .../projects/scope/transitive-test-dep.xml         |   57 +
 .../invalid-aggregator-packaging-pom.xml           |   30 +
 .../test/resources/validation/invalid-ids-pom.xml  |   26 +
 .../test/resources/validation/missing-1-pom.xml    |   21 +
 .../validation/missing-artifactId-pom.xml          |   25 +
 .../missing-dependency-artifactId-pom.xml          |   32 +
 .../validation/missing-dependency-groupId-pom.xml  |   32 +
 .../missing-dependency-mgmt-artifactId-pom.xml     |   34 +
 .../missing-dependency-mgmt-groupId-pom.xml        |   34 +
 .../missing-dependency-mgmt-version-pom.xml        |   34 +
 .../validation/missing-dependency-version-pom.xml  |   32 +
 .../resources/validation/missing-groupId-pom.xml   |   25 +
 .../validation/missing-modelVersion-pom.xml        |   25 +
 .../validation/missing-plugin-artifactId-pom.xml   |   33 +
 .../validation/missing-report-artifactId-pom.xml   |   33 +
 .../validation/missing-repository-id-pom.xml       |   36 +
 .../validation/missing-resource-directory-pom.xml  |   38 +
 .../test/resources/validation/missing-type-pom.xml |   26 +
 .../resources/validation/missing-version-pom.xml   |   25 +
 maven-reporting/maven-reporting-api/pom.xml        |   54 +
 .../org/apache/maven/reporting/MavenReport.java    |  114 +
 .../maven/reporting/MavenReportException.java      |   55 +
 .../maven/reporting/MavenReportRenderer.java       |   44 +
 .../src/main/resources/default-report.xml          |   25 +
 .../maven-reporting-api/src/site/site.xml          |    6 +
 maven-reporting/pom.xml                            |   38 +
 maven-reporting/src/site/site.xml                  |    7 +
 maven-repository-metadata/pom.xml                  |   54 +
 .../src/main/mdo/metadata.mdo                      |  321 ++
 maven-repository-metadata/src/main/mdo/plugins.mdo |   81 +
 maven-repository-metadata/src/site/apt/index.apt   |   17 +
 maven-repository-metadata/src/site/site.xml        |    6 +
 maven-script/maven-script-ant/pom.xml              |   79 +
 .../maven/script/ant/AntMojoComponentFactory.java  |   39 +
 .../apache/maven/script/ant/AntMojoWrapper.java    |  378 +++
 .../apache/maven/script/ant/AntPropertyHelper.java |  207 ++
 .../main/resources/META-INF/plexus/components.xml  |   28 +
 maven-script/maven-script-ant/src/site/site.xml    |    6 +
 .../maven/script/ant/AntMojoWrapperTest.java       |  287 ++
 .../test/resources/META-INF/maven/plugin-2.0.xml   |   43 +
 .../test/resources/META-INF/maven/plugin-2.1.xml   |   69 +
 .../src/test/resources/test.build.xml              |   15 +
 maven-script/maven-script-beanshell/pom.xml        |   43 +
 .../script/beanshell/BeanshellMojoAdapter.java     |   73 +
 .../maven-script-beanshell/src/site/site.xml       |    6 +
 maven-script/pom.xml                               |   37 +
 maven-script/src/site/site.xml                     |    7 +
 maven-settings/pom.xml                             |   65 +
 .../settings/DefaultMavenSettingsBuilder.java      |  286 ++
 .../maven/settings/MavenSettingsBuilder.java       |   86 +
 .../org/apache/maven/settings/RuntimeInfo.java     |  179 +
 .../org/apache/maven/settings/SettingsUtils.java   |  311 ++
 maven-settings/src/main/mdo/settings.mdo           | 1065 ++++++
 .../main/resources/META-INF/plexus/components.xml  |   33 +
 maven-settings/src/site/apt/index.apt              |   19 +
 maven-settings/src/site/site.xml                   |    6 +
 .../org/apache/maven/settings/SettingsTest.java    |   33 +
 .../apache/maven/settings/SettingsUtilsTest.java   |   54 +
 .../apache/maven/settings/settings-no-proxies.xml  |    6 +
 .../maven/settings/settings-one-active-proxy.xml   |   15 +
 .../maven/settings/settings-one-inactive-proxy.xml |   15 +
 maven-toolchain/pom.xml                            |  102 +
 .../apache/maven/toolchain/DefaultToolchain.java   |  102 +
 .../maven/toolchain/DefaultToolchainManager.java   |  229 ++
 .../toolchain/MisconfiguredToolchainException.java |   40 +
 .../apache/maven/toolchain/RequirementMatcher.java |   30 +
 .../maven/toolchain/RequirementMatcherFactory.java |   94 +
 .../java/org/apache/maven/toolchain/Toolchain.java |   39 +
 .../apache/maven/toolchain/ToolchainFactory.java   |   45 +
 .../apache/maven/toolchain/ToolchainManager.java   |   41 +
 .../maven/toolchain/ToolchainManagerPrivate.java   |   46 +
 .../apache/maven/toolchain/ToolchainPrivate.java   |   43 +
 .../maven/toolchain/java/DefaultJavaToolChain.java |   87 +
 .../java/DefaultJavaToolchainFactory.java          |  113 +
 .../apache/maven/toolchain/java/JavaToolChain.java |   65 +
 maven-toolchain/src/main/mdo/toolchains.mdo        |   82 +
 .../main/resources/META-INF/plexus/components.xml  |   44 +
 maven-toolchain/src/site/apt/index.apt             |   17 +
 maven-toolchain/src/site/site.xml                  |    6 +
 .../toolchain/RequirementMatcherFactoryTest.java   |   61 +
 pom.xml                                            |  613 ++++
 src/site/site.xml                                  |   33 +
 664 files changed, 78194 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2-core.git



More information about the pkg-java-commits mailing list