You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/11/23 13:05:31 UTC
[11/11] maven git commit: Trimmed trailing whitespace
Trimmed trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0343c526
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0343c526
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0343c526
Branch: refs/heads/trailing-whitespace
Commit: 0343c52601f7623415511e4f05fc79b03c283455
Parents: 365066f
Author: Michael Osipov <mi...@apache.org>
Authored: Sun Nov 23 13:00:59 2014 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Nov 23 13:04:30 2014 +0100
----------------------------------------------------------------------
apache-maven/src/conf/settings.xml | 26 ++--
.../maven/settings/GlobalSettingsTest.java | 2 +-
maven-aether-provider/pom.xml | 2 +-
.../internal/ArtifactDescriptorUtils.java | 2 +-
.../repository/internal/DefaultModelCache.java | 2 +-
.../internal/DefaultModelResolver.java | 2 +-
.../internal/MavenRepositorySystemUtils.java | 8 +-
.../DefaultArtifactDescriptorReaderTest.java | 16 +--
.../internal/RepositorySystemTest.java | 2 +-
.../org/apache/maven/artifact/Artifact.java | 2 +-
.../artifact/metadata/ArtifactMetadata.java | 2 +-
.../artifact/repository/Authentication.java | 16 +--
.../AbstractArtifactResolutionException.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 2 +-
.../artifact/versioning/VersionRangeTest.java | 2 +-
.../installer/DefaultArtifactInstaller.java | 4 +-
.../repository/metadata/MetadataBridge.java | 2 +-
.../repository/metadata/MetadataUtils.java | 2 +-
.../resolver/DefaultArtifactResolver.java | 30 ++--
.../filter/InversionArtifactFilter.java | 6 +-
.../resolver/filter/OrArtifactFilter.java | 10 +-
.../resolver/filter/TypeArtifactFilter.java | 6 +-
.../execution/DefaultRuntimeInformation.java | 2 +-
.../maven/profiles/ProfilesConversionUtils.java | 6 +-
.../OperatingSystemProfileActivator.java | 20 +--
.../BuildTimestampValueSource.java | 4 +-
.../RegexBasedModelInterpolator.java | 2 +-
.../project/validation/ModelValidator.java | 2 +-
.../apache/maven/repository/MirrorSelector.java | 4 +-
.../repository/UserLocalArtifactRepository.java | 10 +-
.../repository/legacy/DefaultWagonManager.java | 12 +-
.../plugin-expressions/project.paramdoc.xml | 10 +-
.../plugin-expressions/rootless.paramdoc.xml | 4 +-
.../AbstractArtifactComponentTestCase.java | 10 +-
.../maven/artifact/ArtifactUtilsTest.java | 2 +-
.../factory/DefaultArtifactFactoryTest.java | 8 +-
.../artifact/metadata/TestMetadataSource.java | 6 +-
.../repository/MavenArtifactRepositoryTest.java | 2 +-
.../ArtifactResolutionExceptionTest.java | 2 +-
.../artifact/resolver/ArtifactResolverTest.java | 2 +-
.../maven/artifact/resolver/TestFileWagon.java | 24 ++--
.../resolver/filter/AndArtifactFilterTest.java | 2 +-
.../resolver/filter/FilterHashEqualsTest.java | 2 +-
.../resolver/filter/OrArtifactFilterTest.java | 2 +-
.../filter/ScopeArtifactFilterTest.java | 2 +-
.../manager/DefaultProfileManagerTest.java | 2 +-
.../project/AbstractMavenProjectTestCase.java | 12 +-
.../maven/project/EmptyLifecycleExecutor.java | 2 +-
.../maven/project/ProjectClasspathTest.java | 4 +-
.../maven/project/TestProjectBuilder.java | 8 +-
.../inheritance/t02/ProjectInheritanceTest.java | 22 +--
.../repository/DefaultMirrorSelectorTest.java | 38 ++---
.../repository/LegacyRepositoryLayout.java | 2 +-
.../repository/LegacyRepositorySystemTest.java | 38 ++---
.../legacy/DefaultUpdateCheckManagerTest.java | 16 +--
.../legacy/LegacyRepositorySystemTest.java | 6 +-
.../maven/repository/legacy/StringWagon.java | 6 +-
.../apache/maven/repository/legacy/WagonA.java | 2 +-
.../apache/maven/repository/legacy/WagonB.java | 2 +-
.../apache/maven/repository/legacy/WagonC.java | 2 +-
.../maven/repository/legacy/WagonMock.java | 2 +-
.../conflict/AbstractConflictResolverTest.java | 36 ++---
.../conflict/FarthestConflictResolverTest.java | 12 +-
.../conflict/NearestConflictResolverTest.java | 12 +-
.../conflict/NewestConflictResolverTest.java | 12 +-
.../conflict/OldestConflictResolverTest.java | 12 +-
.../DefaultClasspathTransformationTest.java | 4 +-
...efaultGraphConflictResolutionPolicyTest.java | 2 +-
.../DefaultGraphConflictResolverTest.java | 4 +-
.../repository/metadata/TestMetadataSource.java | 6 +-
.../inheritance-repo/t12/p0/p1/pom.xml | 4 +-
.../resources/inheritance-repo/t12/p0/pom.xml | 6 +-
.../t12scm/p0/modules/p1/pom.xml | 2 +-
.../inheritance-repo/t12scm/p0/pom.xml | 4 +-
maven-core/lifecycle-executor.txt | 6 +-
maven-core/plugin-manager.txt | 41 +++---
.../AbstractMavenLifecycleParticipant.java | 2 +-
.../maven/DefaultArtifactFilterManager.java | 2 +-
.../java/org/apache/maven/DefaultMaven.java | 26 ++--
.../apache/maven/DuplicateProjectException.java | 6 +-
.../maven/FilteredProjectDependencyGraph.java | 4 +-
.../apache/maven/InternalErrorException.java | 2 +-
.../src/main/java/org/apache/maven/Maven.java | 2 +-
.../java/org/apache/maven/ReactorReader.java | 8 +-
.../java/org/apache/maven/RepositoryUtils.java | 2 +-
.../java/org/apache/maven/SessionScoped.java | 2 +-
.../repository/DefaultRepositoryRequest.java | 4 +-
.../LegacyLocalRepositoryManager.java | 2 +-
.../repository/MavenArtifactRepository.java | 2 +-
.../artifact/repository/RepositoryCache.java | 6 +-
.../artifact/repository/RepositoryRequest.java | 18 +--
.../metadata/AbstractRepositoryMetadata.java | 4 +-
.../metadata/io/DefaultMetadataReader.java | 2 +-
.../metadata/io/MetadataParseException.java | 10 +-
.../resolver/ArtifactResolutionRequest.java | 36 ++---
.../resolver/filter/AndArtifactFilter.java | 10 +-
.../filter/CumulativeScopeArtifactFilter.java | 6 +-
.../resolver/filter/ExclusionSetFilter.java | 6 +-
.../resolver/filter/IncludesArtifactFilter.java | 6 +-
.../maven/bridge/MavenRepositorySystem.java | 8 +-
.../maven/classrealm/ClassRealmConstituent.java | 14 +-
.../maven/classrealm/ClassRealmManager.java | 12 +-
.../classrealm/ClassRealmManagerDelegate.java | 2 +-
.../maven/classrealm/ClassRealmRequest.java | 12 +-
.../classrealm/DefaultClassRealmManager.java | 4 +-
.../BasedirBeanConfigurationPathTranslator.java | 4 +-
.../BeanConfigurationException.java | 2 +-
.../BeanConfigurationPathTranslator.java | 4 +-
.../configuration/BeanConfigurationRequest.java | 32 ++---
.../BeanConfigurationValuePreprocessor.java | 4 +-
.../maven/configuration/BeanConfigurator.java | 4 +-
.../DefaultBeanConfigurationRequest.java | 4 +-
.../internal/DefaultBeanConfigurator.java | 2 +-
.../org/apache/maven/eventspy/EventSpy.java | 6 +-
.../maven/exception/ExceptionHandler.java | 2 +-
.../apache/maven/execution/BuildFailure.java | 6 +-
.../apache/maven/execution/BuildSuccess.java | 4 +-
.../apache/maven/execution/BuildSummary.java | 8 +-
.../execution/DefaultMavenExecutionRequest.java | 2 +-
.../DefaultMavenExecutionRequestPopulator.java | 4 +-
.../apache/maven/execution/ExecutionEvent.java | 12 +-
.../maven/execution/ExecutionListener.java | 2 +-
.../maven/execution/MavenExecutionRequest.java | 16 +--
.../MavenExecutionRequestPopulator.java | 6 +-
.../maven/execution/MavenExecutionResult.java | 2 +-
.../apache/maven/execution/MavenSession.java | 10 +-
.../maven/execution/MojoExecutionEvent.java | 2 +-
.../maven/execution/MojoExecutionListener.java | 2 +-
.../maven/execution/ProjectDependencyGraph.java | 8 +-
.../maven/execution/ProjectExecutionEvent.java | 2 +-
.../execution/ProjectExecutionListener.java | 2 +-
.../execution/scope/MojoExecutionScoped.java | 2 +-
.../scope/WeakMojoExecutionListener.java | 2 +-
.../lifecycle/LifecycleExecutionException.java | 4 +-
.../lifecycle/LifecycleMappingDelegate.java | 2 +-
.../lifecycle/LifecycleNotFoundException.java | 6 +-
.../LifecyclePhaseNotFoundException.java | 6 +-
.../lifecycle/MissingProjectException.java | 4 +-
.../lifecycle/NoGoalSpecifiedException.java | 4 +-
.../internal/DefaultExecutionEvent.java | 2 +-
.../internal/DefaultExecutionEventCatapult.java | 2 +-
...DefaultLifecycleExecutionPlanCalculator.java | 2 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 2 +-
.../lifecycle/internal/DependencyContext.java | 2 +-
.../internal/ExecutionEventCatapult.java | 2 +-
.../lifecycle/internal/ExecutionPlanItem.java | 2 +-
.../maven/lifecycle/internal/GoalTask.java | 2 +-
.../internal/LifecycleDebugLogger.java | 2 +-
.../internal/LifecycleDependencyResolver.java | 2 +-
.../internal/LifecycleModuleBuilder.java | 4 +-
.../lifecycle/internal/LifecycleStarter.java | 2 +-
.../maven/lifecycle/internal/LifecycleTask.java | 2 +-
.../LifecycleTaskSegmentCalculator.java | 2 +-
.../internal/MojoDescriptorCreator.java | 2 +-
.../maven/lifecycle/internal/MojoExecutor.java | 2 +-
.../lifecycle/internal/ProjectBuildList.java | 2 +-
.../maven/lifecycle/internal/ProjectIndex.java | 2 +-
.../lifecycle/internal/ProjectSegment.java | 2 +-
.../lifecycle/internal/ReactorBuildStatus.java | 2 +-
.../lifecycle/internal/ReactorContext.java | 2 +-
.../maven/lifecycle/internal/TaskSegment.java | 2 +-
.../lifecycle/internal/builder/Builder.java | 10 +-
.../ConcurrencyDependencyGraph.java | 10 +-
.../multithreaded/MultiThreadedBuilder.java | 4 +-
.../lifecycle/mapping/LifecycleMapping.java | 2 +-
.../DefaultLifecycleBindingsInjector.java | 2 +-
.../maven/monitor/event/EventMonitor.java | 6 +-
.../org/apache/maven/plugin/CacheUtils.java | 4 +-
.../CycleDetectedInPluginGraphException.java | 2 +-
.../plugin/DebugConfigurationListener.java | 2 +-
.../maven/plugin/DefaultBuildPluginManager.java | 6 +-
.../plugin/DefaultPluginDescriptorCache.java | 2 +-
.../maven/plugin/ExtensionRealmCache.java | 4 +-
.../InvalidPluginDescriptorException.java | 2 +-
.../org/apache/maven/plugin/LegacySupport.java | 8 +-
.../apache/maven/plugin/MavenPluginManager.java | 14 +-
.../org/apache/maven/plugin/MojoExecution.java | 28 ++--
.../maven/plugin/PluginArtifactsCache.java | 6 +-
.../maven/plugin/PluginDescriptorCache.java | 2 +-
.../org/apache/maven/plugin/PluginManager.java | 4 +-
.../maven/plugin/PluginParameterException.java | 6 +-
.../PluginParameterExpressionEvaluator.java | 2 +-
.../apache/maven/plugin/PluginRealmCache.java | 4 +-
.../plugin/internal/DefaultLegacySupport.java | 2 +-
.../internal/DefaultMavenPluginManager.java | 2 +-
.../DefaultPluginDependenciesResolver.java | 2 +-
.../plugin/internal/PlexusUtilsInjector.java | 2 +-
.../internal/PluginDependenciesResolver.java | 6 +-
.../PluginDependencyResolutionListener.java | 2 +-
.../ValidatingConfigurationListener.java | 2 +-
.../maven/plugin/internal/WagonExcluder.java | 2 +-
.../prefix/DefaultPluginPrefixRequest.java | 4 +-
.../plugin/prefix/PluginPrefixRequest.java | 22 +--
.../plugin/prefix/PluginPrefixResolver.java | 4 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 8 +-
.../internal/DefaultPluginPrefixResolver.java | 2 +-
.../internal/DefaultPluginPrefixResult.java | 2 +-
.../version/DefaultPluginVersionRequest.java | 6 +-
.../plugin/version/PluginVersionRequest.java | 22 +--
.../plugin/version/PluginVersionResolver.java | 4 +-
.../plugin/version/PluginVersionResult.java | 6 +-
.../internal/DefaultPluginVersionResolver.java | 2 +-
.../internal/DefaultPluginVersionResult.java | 2 +-
.../project/DefaultMavenProjectHelper.java | 2 +-
.../project/DefaultModelBuildingListener.java | 4 +-
.../maven/project/DefaultProjectBuilder.java | 6 +-
.../project/DefaultProjectBuildingHelper.java | 4 +-
.../project/DefaultProjectBuildingRequest.java | 2 +-
.../project/DefaultProjectBuildingResult.java | 6 +-
.../project/DependencyResolutionRequest.java | 14 +-
.../project/DependencyResolutionResult.java | 14 +-
.../maven/project/ExtensionDescriptor.java | 2 +-
.../project/ExtensionDescriptorBuilder.java | 4 +-
.../org/apache/maven/project/MavenProject.java | 42 +++---
.../apache/maven/project/ProjectBuilder.java | 12 +-
.../maven/project/ProjectBuildingRequest.java | 34 ++---
.../maven/project/ProjectBuildingResult.java | 12 +-
.../project/ProjectDependenciesResolver.java | 4 +-
.../maven/project/ProjectModelResolver.java | 2 +-
.../apache/maven/project/ProjectRealmCache.java | 4 +-
.../apache/maven/project/ReactorModelCache.java | 2 +-
.../apache/maven/project/ReactorModelPool.java | 2 +-
.../project/artifact/DefaultMetadataSource.java | 2 +-
.../project/artifact/MavenMetadataSource.java | 2 +-
.../properties/internal/EnvironmentUtils.java | 4 +-
.../properties/internal/SystemProperties.java | 2 +-
.../maven/repository/ArtifactTransferEvent.java | 2 +-
.../repository/ArtifactTransferResource.java | 12 +-
.../DelegatingLocalArtifactRepository.java | 2 +-
.../repository/LocalArtifactRepository.java | 4 +-
.../LocalRepositoryNotAccessibleException.java | 2 +-
.../maven/repository/RepositorySystem.java | 2 +-
.../ArtifactMetadataRetrievalException.java | 2 +-
.../DefaultMetadataResolutionRequest.java | 2 +-
.../metadata/MetadataResolutionRequest.java | 22 +--
.../apache/maven/rtinfo/RuntimeInformation.java | 6 +-
.../session/scope/internal/SessionScope.java | 2 +-
.../maven/toolchain/DefaultToolchain.java | 12 +-
.../toolchain/DefaultToolchainManager.java | 2 +-
.../org/apache/maven/toolchain/Toolchain.java | 4 +-
.../maven/toolchain/ToolchainFactory.java | 2 +-
.../maven/toolchain/ToolchainManager.java | 2 +-
.../toolchain/ToolchainManagerPrivate.java | 6 +-
.../maven/toolchain/ToolchainsBuilder.java | 4 +-
.../maven/toolchain/java/JavaToolchain.java | 2 +-
.../toolchain/java/JavaToolchainFactory.java | 4 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 2 +-
maven-core/src/main/mdo/toolchains.mdo | 10 +-
.../META-INF/plexus/artifact-handlers.xml | 18 +--
.../META-INF/plexus/default-bindings.xml | 28 ++--
.../maven/messages/messages_pl.properties | 4 +-
.../src/site/apt/configuration-management.apt | 10 +-
maven-core/src/site/apt/default-bindings.apt.vm | 3 +-
.../getting-to-container-configured-mojos.apt | 8 +-
maven-core/src/site/apt/inheritance.apt | 22 +--
maven-core/src/site/apt/lifecycles.apt.vm | 2 +-
maven-core/src/site/apt/offline-mode.apt | 78 +++++------
.../src/site/apt/plugin-execution-isolation.apt | 8 +-
.../apt/scripting-support/marmalade-support.apt | 140 +++++++++----------
.../AbstractCoreMavenComponentTestCase.java | 78 +++++------
.../maven/MavenLifecycleParticipantTest.java | 4 +-
.../maven/ProjectDependenciesResolverTest.java | 12 +-
.../execution/DefaultMavenExecutionTest.java | 2 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 4 +-
.../apache/maven/plugin/PluginManagerTest.java | 82 +++++------
.../plugin/PluginParameterExceptionTest.java | 68 ++++-----
.../project/AbstractMavenProjectTestCase.java | 12 +-
.../project/DefaultMavenProjectBuilderTest.java | 2 +-
.../maven/project/EmptyLifecycleExecutor.java | 4 +-
.../project/EmptyProjectBuildingHelper.java | 2 +-
.../project/ExtensionDescriptorBuilderTest.java | 2 +-
.../apache/maven/project/MavenProjectTest.java | 8 +-
.../maven/project/PomConstructionTest.java | 136 +++++++++---------
.../maven/project/ProjectBuilderTest.java | 10 +-
.../maven/project/TestMetadataSource.java | 6 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 2 +-
.../harness/Xpp3DomAttributeIterator.java | 2 +-
.../harness/Xpp3DomAttributePointer.java | 2 +-
.../project/harness/Xpp3DomNodeIterator.java | 2 +-
.../project/harness/Xpp3DomNodePointer.java | 2 +-
.../project/harness/Xpp3DomPointerFactory.java | 2 +-
.../repository/LegacyRepositoryLayout.java | 2 +-
.../maven/repository/TestArtifactHandler.java | 2 +-
.../maven/repository/TestRepositorySystem.java | 4 +-
.../maven/toolchain/DefaultToolchainTest.java | 8 +-
.../mojo-configuration/pom.xml | 2 +-
.../pom.xml | 4 +-
.../org/apache/maven/lifecycle/test/App.java | 2 +-
.../apache/maven/lifecycle/test/AppTest.java | 2 +-
.../project-with-inheritance/pom.xml | 22 +--
.../pom.xml | 2 +-
.../pom.xml | 4 +-
.../project-with-inheritance/pom.xml | 22 +--
.../pom.xml | 2 +-
.../sub/pom.xml | 2 +-
.../projects/project-builder/it0063/pom.xml | 2 +-
.../project-builder/mng-3023/consumer/pom.xml | 2 +-
.../project-builder/mng-3023/dependency/pom.xml | 4 +-
.../projects/project-builder/mng-3023/pom.xml | 4 +-
.../it0063/pom.xml | 2 +-
.../basedir-aligned-interpolation/pom.xml | 2 +-
.../pom-with-unusual-name.xml | 2 +-
.../baseurl-interpolation/pom.xml | 2 +-
.../boolean-interpolation/pom.xml | 4 +-
.../build-extension-inheritance/pom.xml | 2 +-
.../build-extension-inheritance/sub/pom.xml | 2 +-
.../complete-model/w-parent/sub/pom.xml | 2 +-
.../complete-model/wo-parent/pom.xml | 2 +-
.../dependency-inheritance/sub/pom.xml | 2 +-
.../dependency-order/w-plugin-mngt/pom.xml | 2 +-
.../dependency-order/wo-plugin-mngt/pom.xml | 2 +-
.../distribution-management/pom.xml | 2 +-
.../dual-execution-ids/sub/pom.xml | 2 +-
.../equal-plugin-deps/pom.xml | 2 +-
.../equal-plugin-exec-ids/pom.xml | 2 +-
.../execution-configuration-join/pom.xml | 2 +-
.../full-interpolation/pom.xml | 2 +-
.../pom.xml | 2 +-
.../sub/pom.xml | 2 +-
.../limited-inheritance/pom.xml | 2 +-
.../managed-profile-dependency/pom.xml | 2 +-
.../managed-profile-dependency/sub/pom.xml | 2 +-
.../merged-filter-order/pom.xml | 2 +-
.../merged-filter-order/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../micromailer/pom.xml | 2 +-
.../nested-build-dir-interpolation/pom.xml | 2 +-
.../platform-file-separator/pom.xml | 2 +-
.../plugin-config-append/no-profile/pom.xml | 2 +-
.../plugin-config-append/with-profile/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../plugin-config-attributes/w-profile/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-config-merging/child/pom.xml | 2 +-
.../plugin-config-merging/pom.xml | 2 +-
.../plugin-config-order/w-plugin-mngt/pom.xml | 2 +-
.../plugin-config-order/wo-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/sub/pom.xml | 2 +-
.../plugin-exec-merging/w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../plugin-exec-merging/wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../plugin-exec-order-with-lifecycle/pom.xml | 2 +-
.../plugin-exec-order/w-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-order/wo-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-inheritance-order/child/pom.xml | 2 +-
.../plugin-inheritance-order/pom.xml | 2 +-
.../plugin-management-inheritance/pom.xml | 2 +-
.../pom-encoding/latin-1/pom.xml | 2 +-
.../pom-encoding/utf-8/pom.xml | 2 +-
.../pom-inheritance/pom.xml | 2 +-
.../pom.xml | 2 +-
.../profile-injected-dependencies/pom.xml | 2 +-
.../profile-injection-order/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/sub/pom.xml | 2 +-
.../profile-plugins/pom.xml | 2 +-
.../repo-inheritance/pom.xml | 4 +-
.../jetty-parent.xml | 2 +-
.../child/pom.xml | 2 +-
.../unprefixed-expression-interpolation/pom.xml | 2 +-
.../url-append/parent/pom.xml | 2 +-
.../url-inheritance/pom.xml | 2 +-
.../url-no-decoding/pom.xml | 2 +-
.../xml-coalesce-text/pom.xml | 2 +-
.../xml-markup-interpolation/pom.xml | 2 +-
.../xml-whitespace/sub/pom.xml | 2 +-
.../settings-no-pom/settings.xml | 6 +-
.../test-pom-and-settings-interpolation/pom.xml | 2 +-
.../resources/META-INF/plexus/components.xml | 2 +-
.../resources/distributionManagement-pom.xml | 4 +-
.../org/apache/maven/lifecycle/pom.xml | 22 +--
.../project/workspace/buildFromFile/pom.xml | 4 +-
.../project/workspace/buildModelLineage/pom.xml | 2 +-
.../childAndParent/child/pom.xml | 2 +-
.../resolveParentPom/childAndParent/pom.xml | 2 +-
.../project/workspace/resolveParentPom/pom.xml | 2 +-
.../toolchain/model/toolchains-jdks-extra.xml | 2 +-
.../maven/toolchain/model/toolchains-jdks.xml | 2 +-
.../resources/project-dynamism/pom-interp.xml | 10 +-
.../resources/project-dynamism/pom-relative.xml | 16 +--
.../src/test/resources/project-dynamism/pom.xml | 16 +--
.../child-which-inherits-from-super-model.xml | 2 +-
.../projects/duplicate-plugins-merged-pom.xml | 4 +-
.../withActiveByDefaultProfile-pom.xml | 4 +-
maven-embedder/pom.xml | 4 +-
.../src/examples/simple-project/settings.xml | 2 +-
.../java/org/apache/maven/embedder/App.java | 2 +-
.../java/org/apache/maven/embedder/AppTest.java | 2 +-
.../java/org/apache/maven/cli/MavenCli.java | 50 +++----
.../cli/logging/BaseSlf4jConfiguration.java | 2 +-
.../maven/cli/logging/Slf4jConfiguration.java | 2 +-
.../apache/maven/cli/logging/Slf4jLogger.java | 2 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 8 +-
.../cli/logging/impl/Log4j2Configuration.java | 4 +-
.../cli/logging/impl/LogbackConfiguration.java | 4 +-
.../logging/impl/Slf4jSimpleConfiguration.java | 4 +-
.../UnsupportedSlf4jBindingConfiguration.java | 4 +-
.../transfer/ConsoleMavenTransferListener.java | 2 +-
maven-embedder/src/site/apt/logging.apt | 6 +-
.../src/main/java/org/apache/maven/App.java | 2 +-
.../src/test/java/org/apache/maven/AppTest.java | 2 +-
.../bad-dep-version/pom.xml | 2 +-
.../bad-ext-direct-deps/project/pom.xml | 2 +-
.../bad-ext-plugin-dep-ver/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../bad-ext-plugin-dep-ver/project/pom.xml | 4 +-
.../bad-ext-plugin-maven-ver/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../bad-ext-plugin-maven-ver/project/pom.xml | 4 +-
.../bad-maven-version/pom.xml | 2 +-
.../bad-mg-dep-version/pom.xml | 2 +-
.../bad-non-dep-version/pom.xml | 2 +-
.../bad-profile-repo/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../config-rdonly-mojo-param/project/pom.xml | 2 +-
.../deploy-repo-creation-err/pom.xml | 4 +-
.../err-loading-plugin/project/pom.xml | 4 +-
.../err-resolving-ext-plugin/project/pom.xml | 4 +-
.../err-resolving-project-dep/project/pom.xml | 4 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../ext-deps-resolve-err/project/pom.xml | 2 +-
.../ext-plugin-artifact-missing/project/pom.xml | 4 +-
.../resources/META-INF/plexus/components.xml | 2 +-
.../ext-plugin-realm-error/project/pom.xml | 2 +-
.../ext-plugin-version-err/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../ext-plugin-version-err/project/pom.xml | 4 +-
.../ext-realm-error/ext/pom.xml | 2 +-
.../ext/src/main/java/org/ext/App.java | 2 +-
.../ext-realm-error/project/pom.xml | 2 +-
.../interp-from-project/project/pom.xml | 2 +-
.../load-extern-profiles-ioex/pom.xml | 2 +-
.../load-extern-profiles-xex/pom.xml | 2 +-
.../child1/src/main/java/org/test/App.java | 2 +-
.../child1/src/test/java/org/test/AppTest.java | 2 +-
.../missing-parent-pom/pom.xml | 4 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-config-error/plugin/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-config-error/project/pom.xml | 4 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-exec-err/project/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../parent-parse-ioex/child/pom.xml | 2 +-
.../parent-parse-xex/child/pom.xml | 2 +-
.../parent-parse-xex/pom.xml | 2 +-
.../profile-activator-err/pom.xml | 2 +-
.../profile-activator-lookup-err/ext/pom.xml | 2 +-
.../ext/src/main/java/org/ext/App.java | 2 +-
.../project/pom.xml | 4 +-
.../project-collision/mod1/pom.xml | 2 +-
.../project-collision/mod2/pom.xml | 2 +-
.../project-collision/pom.xml | 2 +-
.../project-cycle/dep/pom.xml | 4 +-
.../project-cycle/pom.xml | 4 +-
.../project-dep-missing/pom.xml | 6 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../repo-creation-err/pom.xml | 4 +-
.../eventing-projects/read-with-deps/pom.xml | 2 +-
.../extensions/META-INF/plexus/components.xml | 2 +-
.../org/apache/maven/cli/CLIManagerTest.java | 2 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 14 +-
.../main/java/org/codehaus/m2eclipse/App.java | 2 +-
.../java/org/codehaus/m2eclipse/AppTest.java | 2 +-
.../settings.xml | 4 +-
.../src/test/projects/optional-dep/pom.xml | 4 +-
.../readProject-missingModuleIgnored/pom.xml | 2 +-
.../readProject-withScmInheritance/pom.xml | 4 +-
.../test/resources/settings/valid-settings.xml | 2 +-
.../building/AbstractModelBuildingListener.java | 2 +-
.../building/DefaultModelBuilderFactory.java | 4 +-
.../building/DefaultModelBuildingEvent.java | 2 +-
.../building/DefaultModelBuildingRequest.java | 4 +-
.../building/DefaultModelBuildingResult.java | 2 +-
.../model/building/DefaultModelProblem.java | 8 +-
.../building/DefaultModelProblemCollector.java | 2 +-
.../maven/model/building/FileModelSource.java | 6 +-
.../building/FilterModelBuildingRequest.java | 2 +-
.../maven/model/building/ModelBuilder.java | 6 +-
.../model/building/ModelBuildingEvent.java | 8 +-
.../model/building/ModelBuildingException.java | 14 +-
.../model/building/ModelBuildingListener.java | 4 +-
.../model/building/ModelBuildingRequest.java | 4 +-
.../model/building/ModelBuildingResult.java | 16 +--
.../apache/maven/model/building/ModelCache.java | 6 +-
.../apache/maven/model/building/ModelData.java | 32 ++---
.../maven/model/building/ModelProblem.java | 16 +--
.../model/building/ModelProblemCollector.java | 4 +-
.../building/ModelProblemCollectorExt.java | 2 +-
.../building/ModelProblemCollectorRequest.java | 4 +-
.../maven/model/building/ModelProblemUtils.java | 8 +-
.../maven/model/building/ModelSource.java | 6 +-
.../maven/model/building/ModelSource2.java | 2 +-
.../maven/model/building/StringModelSource.java | 8 +-
.../maven/model/building/UrlModelSource.java | 6 +-
.../DefaultDependencyManagementImporter.java | 2 +-
.../DependencyManagementImporter.java | 4 +-
.../DefaultInheritanceAssembler.java | 2 +-
.../model/inheritance/InheritanceAssembler.java | 4 +-
.../BuildTimestampValueSource.java | 2 +-
.../ProblemDetectingValueSource.java | 2 +-
.../UrlNormalizingPostProcessor.java | 2 +-
.../maven/model/io/DefaultModelReader.java | 2 +-
.../maven/model/io/DefaultModelWriter.java | 2 +-
.../maven/model/io/ModelParseException.java | 10 +-
.../org/apache/maven/model/io/ModelWriter.java | 8 +-
.../model/locator/DefaultModelLocator.java | 2 +-
.../maven/model/locator/ModelLocator.java | 4 +-
.../DependencyManagementInjector.java | 4 +-
.../management/PluginManagementInjector.java | 4 +-
.../normalization/DefaultModelNormalizer.java | 2 +-
.../model/normalization/ModelNormalizer.java | 6 +-
.../model/path/DefaultModelPathTranslator.java | 2 +-
.../model/path/DefaultModelUrlNormalizer.java | 2 +-
.../maven/model/path/DefaultPathTranslator.java | 2 +-
.../maven/model/path/DefaultUrlNormalizer.java | 2 +-
.../maven/model/path/ModelPathTranslator.java | 4 +-
.../maven/model/path/ModelUrlNormalizer.java | 4 +-
.../apache/maven/model/path/PathTranslator.java | 4 +-
.../apache/maven/model/path/UrlNormalizer.java | 4 +-
.../DefaultPluginConfigurationExpander.java | 2 +-
.../DefaultReportConfigurationExpander.java | 2 +-
.../model/plugin/DefaultReportingConverter.java | 2 +-
.../model/plugin/LifecycleBindingsInjector.java | 4 +-
.../plugin/PluginConfigurationExpander.java | 4 +-
.../plugin/ReportConfigurationExpander.java | 4 +-
.../maven/model/plugin/ReportingConverter.java | 4 +-
.../model/profile/DefaultProfileInjector.java | 2 +-
.../model/profile/DefaultProfileSelector.java | 2 +-
.../model/profile/ProfileActivationContext.java | 12 +-
.../maven/model/profile/ProfileInjector.java | 4 +-
.../maven/model/profile/ProfileSelector.java | 4 +-
.../activation/FileProfileActivator.java | 2 +-
.../activation/JdkVersionProfileActivator.java | 2 +-
.../OperatingSystemProfileActivator.java | 2 +-
.../profile/activation/ProfileActivator.java | 4 +-
.../activation/PropertyProfileActivator.java | 2 +-
.../resolution/InvalidRepositoryException.java | 8 +-
.../resolution/UnresolvableModelException.java | 12 +-
.../maven/model/superpom/SuperPomProvider.java | 4 +-
.../model/validation/DefaultModelValidator.java | 2 +-
.../maven/model/validation/ModelValidator.java | 6 +-
.../model/building/SimpleProblemCollector.java | 2 +-
.../StringSearchModelInterpolatorTest.java | 16 +--
.../AbstractProfileActivatorTest.java | 2 +-
.../JdkVersionProfileActivatorTest.java | 2 +-
.../PropertyProfileActivatorTest.java | 2 +-
.../validation/DefaultModelValidatorTest.java | 4 +-
.../invalid-aggregator-packaging-pom.xml | 2 +-
.../maven/model/io/xpp3/package-info.java | 2 +-
.../apache/maven/model/ActivationFileTest.java | 2 +-
.../apache/maven/model/ActivationOSTest.java | 2 +-
.../maven/model/ActivationPropertyTest.java | 2 +-
.../org/apache/maven/model/ActivationTest.java | 2 +-
.../java/org/apache/maven/model/BuildTest.java | 2 +-
.../apache/maven/model/CiManagementTest.java | 2 +-
.../org/apache/maven/model/ContributorTest.java | 2 +-
.../maven/model/DependencyManagementTest.java | 2 +-
.../org/apache/maven/model/DependencyTest.java | 2 +-
.../maven/model/DeploymentRepositoryTest.java | 2 +-
.../org/apache/maven/model/DeveloperTest.java | 2 +-
.../maven/model/DistributionManagementTest.java | 2 +-
.../org/apache/maven/model/ExclusionTest.java | 2 +-
.../org/apache/maven/model/ExtensionTest.java | 2 +-
.../apache/maven/model/IssueManagementTest.java | 2 +-
.../org/apache/maven/model/LicenseTest.java | 2 +-
.../org/apache/maven/model/MailingListTest.java | 2 +-
.../java/org/apache/maven/model/ModelTest.java | 2 +-
.../org/apache/maven/model/NotifierTest.java | 2 +-
.../apache/maven/model/OrganizationTest.java | 2 +-
.../java/org/apache/maven/model/ParentTest.java | 2 +-
.../maven/model/PluginConfigurationTest.java | 2 +-
.../apache/maven/model/PluginContainerTest.java | 2 +-
.../apache/maven/model/PluginExecutionTest.java | 2 +-
.../maven/model/PluginManagementTest.java | 2 +-
.../java/org/apache/maven/model/PluginTest.java | 2 +-
.../apache/maven/model/PrerequisitesTest.java | 2 +-
.../org/apache/maven/model/ProfileTest.java | 2 +-
.../org/apache/maven/model/RelocationTest.java | 2 +-
.../apache/maven/model/ReportPluginTest.java | 2 +-
.../org/apache/maven/model/ReportSetTest.java | 2 +-
.../org/apache/maven/model/ReportingTest.java | 2 +-
.../maven/model/RepositoryPolicyTest.java | 2 +-
.../org/apache/maven/model/RepositoryTest.java | 2 +-
.../org/apache/maven/model/ResourceTest.java | 2 +-
.../java/org/apache/maven/model/ScmTest.java | 2 +-
.../java/org/apache/maven/model/SiteTest.java | 2 +-
.../maven/plugin/MojoNotFoundException.java | 4 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 2 +-
.../plugin/descriptor/PluginDescriptor.java | 2 +-
.../descriptor/PluginDescriptorBuilderTest.java | 2 +-
maven-plugin-api/src/test/resources/plugin.xml | 2 +-
.../building/DefaultSettingsBuilder.java | 2 +-
.../building/DefaultSettingsBuilderFactory.java | 4 +-
.../DefaultSettingsBuildingRequest.java | 2 +-
.../building/DefaultSettingsBuildingResult.java | 2 +-
.../building/DefaultSettingsProblem.java | 4 +-
.../DefaultSettingsProblemCollector.java | 2 +-
.../settings/building/FileSettingsSource.java | 6 +-
.../settings/building/SettingsBuilder.java | 4 +-
.../building/SettingsBuildingException.java | 6 +-
.../building/SettingsBuildingRequest.java | 26 ++--
.../building/SettingsBuildingResult.java | 6 +-
.../settings/building/SettingsProblem.java | 16 +--
.../building/SettingsProblemCollector.java | 4 +-
.../maven/settings/building/SettingsSource.java | 6 +-
.../settings/building/StringSettingsSource.java | 8 +-
.../settings/building/UrlSettingsSource.java | 6 +-
.../crypto/DefaultSettingsDecrypter.java | 2 +-
.../DefaultSettingsDecryptionRequest.java | 8 +-
.../crypto/DefaultSettingsDecryptionResult.java | 2 +-
.../settings/crypto/SettingsDecrypter.java | 4 +-
.../crypto/SettingsDecryptionRequest.java | 10 +-
.../crypto/SettingsDecryptionResult.java | 12 +-
.../settings/io/DefaultSettingsReader.java | 2 +-
.../settings/io/DefaultSettingsWriter.java | 2 +-
.../settings/io/SettingsParseException.java | 10 +-
.../maven/settings/io/SettingsReader.java | 8 +-
.../maven/settings/io/SettingsWriter.java | 8 +-
.../settings/validation/SettingsValidator.java | 4 +-
pom.xml | 10 +-
641 files changed, 1844 insertions(+), 1846 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/apache-maven/src/conf/settings.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml
index 204e334..19d7a97 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -22,7 +22,7 @@ under the License.
<!--
| This is the configuration file for Maven. It can be specified at two levels:
|
- | 1. User Level. This settings.xml file provides configuration for a single user,
+ | 1. User Level. This settings.xml file provides configuration for a single user,
| and is normally provided in ${user.home}/.m2/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
@@ -31,7 +31,7 @@ under the License.
|
| 2. Global Level. This settings.xml file provides configuration for all Maven
| users on a machine (assuming they're all using the same Maven
- | installation). It's normally provided in
+ | installation). It's normally provided in
| ${maven.home}/conf/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
@@ -43,8 +43,8 @@ under the License.
| values (values used when the setting is not specified) are provided.
|
|-->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
@@ -112,8 +112,8 @@ under the License.
<!-- server
| Specifies the authentication information to use when connecting to a particular server, identified by
| a unique name within the system (referred to by the 'id' attribute below).
- |
- | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+ |
+ | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
| used together.
|
<server>
@@ -122,7 +122,7 @@ under the License.
<password>repopwd</password>
</server>
-->
-
+
<!-- Another sample, using keys to authenticate.
<server>
<id>siteServer</id>
@@ -134,13 +134,13 @@ under the License.
<!-- mirrors
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
- |
+ |
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
| However, this repository may have problems with heavy traffic at times, so people have mirrored
| it to several places.
|
| That repository definition will have a unique id, so we can create a mirror reference for that
- | repository, to be used as an alternate download site. The mirror site will be the preferred
+ | repository, to be used as an alternate download site. The mirror site will be the preferred
| server for that repository.
|-->
<mirrors>
@@ -157,20 +157,20 @@ under the License.
</mirror>
-->
</mirrors>
-
+
<!-- profiles
| This is a list of profiles which can be activated in a variety of ways, and which can modify
| the build process. Profiles provided in the settings.xml are intended to provide local machine-
| specific paths and repository locations which allow the build to work in the local environment.
|
| For example, if you have an integration testing plugin - like cactus - that needs to know where
- | your Tomcat instance is installed, you can provide a variable here such that the variable is
+ | your Tomcat instance is installed, you can provide a variable here such that the variable is
| dereferenced during the build process to configure the cactus plugin.
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
| section of this document (settings.xml) - will be discussed later. Another way essentially
| relies on the detection of a system property, either matching a particular value for the property,
- | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+ | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
| Finally, the list of active profiles can be specified directly from the command line.
|
@@ -219,7 +219,7 @@ under the License.
| <plugin>
| <groupId>org.myco.myplugins</groupId>
| <artifactId>myplugin</artifactId>
- |
+ |
| <configuration>
| <tomcatLocation>${tomcatPath}</tomcatLocation>
| </configuration>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
----------------------------------------------------------------------
diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index ffca5c3..b728be3 100644
--- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -30,7 +30,7 @@ import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
/**
* Tests that the global settings.xml shipped with the distribution is in good state.
- *
+ *
* @author Benjamin Bentmann
*/
public class GlobalSettingsTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 16e2f64..0533d71 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -114,7 +114,7 @@ under the License.
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
index 8515803..7d4ede8 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
@@ -28,7 +28,7 @@ import org.eclipse.aether.repository.RepositoryPolicy;
/**
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
* of the public API. In particular, this class can be changed or deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public class ArtifactDescriptorUtils
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
index 2d4fa7d..f13495d 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
@@ -25,7 +25,7 @@ import org.eclipse.aether.RepositorySystemSession;
/**
* A model builder cache backed by the repository system cache.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultModelCache
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index bb5bf3c..7cd4747 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -52,7 +52,7 @@ import org.eclipse.aether.resolution.VersionRangeResult;
/**
* A model resolver to assist building of dependency POMs. This resolver gives priority to those repositories that have
* been initially specified and repositories discovered in dependency POMs are recessively merged into the search chain.
- *
+ *
* @author Benjamin Bentmann
* @see DefaultArtifactDescriptorReader
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index dbc4b86..5b240ef 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -52,7 +52,7 @@ import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
* A utility class to assist in setting up a Maven-like repository system. <em>Note:</em> This component is meant to
* assist those clients that employ the repository system outside of an IoC container, Maven plugins should instead
* always use regular dependency injection to acquire the repository system.
- *
+ *
* @author Benjamin Bentmann
*/
public final class MavenRepositorySystemUtils
@@ -66,7 +66,7 @@ public final class MavenRepositorySystemUtils
/**
* Creates a new service locator that already knows about all service implementations included in this library. To
* acquire a complete repository system, clients need to add some repository connectors for remote transfers.
- *
+ *
* @return The new service locator, never {@code null}.
*/
public static DefaultServiceLocator newServiceLocator()
@@ -85,7 +85,7 @@ public final class MavenRepositorySystemUtils
* Maven-based resolution. In more detail, this method configures settings relevant for the processing of dependency
* graphs, most other settings remain at their generic default value. Use the various setters to further configure
* the session with authentication, mirror, proxy and other information required for your environment.
- *
+ *
* @return The new repository system session, never {@code null}.
*/
public static DefaultRepositorySystemSession newSession()
@@ -126,7 +126,7 @@ public final class MavenRepositorySystemUtils
session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) );
- // MNG-5670 guard against ConcurrentModificationException
+ // MNG-5670 guard against ConcurrentModificationException
Properties sysProps = new Properties();
for ( String key : System.getProperties().stringPropertyNames() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
index a7b1db2..e873138 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
@@ -39,19 +39,19 @@ public class DefaultArtifactDescriptorReaderTest
{
// prepare
DefaultArtifactDescriptorReader reader = (DefaultArtifactDescriptorReader) lookup( ArtifactDescriptorReader.class );
-
+
RepositoryEventDispatcher eventDispatcher = mock( RepositoryEventDispatcher.class );
-
+
ArgumentCaptor<RepositoryEvent> event = ArgumentCaptor.forClass( RepositoryEvent.class );
-
+
reader.setRepositoryEventDispatcher( eventDispatcher );
ArtifactDescriptorRequest request = new ArtifactDescriptorRequest();
-
+
request.addRepository( newTestRepository() );
-
+
request.setArtifact( new DefaultArtifact( "org.apache.maven.its", "dep-mng5459", "jar", "0.4.0-SNAPSHOT" ) );
-
+
// execute
reader.readArtifactDescriptor( session, request );
@@ -59,7 +59,7 @@ public class DefaultArtifactDescriptorReaderTest
verify( eventDispatcher ).dispatch( event.capture() );
boolean missingArtifactDescriptor = false;
-
+
for( RepositoryEvent evt : event.getAllValues() )
{
if ( EventType.ARTIFACT_DESCRIPTOR_MISSING.equals( evt.getType() ) )
@@ -68,7 +68,7 @@ public class DefaultArtifactDescriptorReaderTest
missingArtifactDescriptor = true;
}
}
-
+
if( !missingArtifactDescriptor )
{
fail( "Expected missing artifact descriptor for org.apache.maven.its:dep-mng5459:pom:0.4.0-20130404.090532-2" );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
index 36bb9c5..db77a44 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
@@ -59,7 +59,7 @@ public class RepositorySystemTest
ArtifactDescriptorRequest request = new ArtifactDescriptorRequest();
request.setArtifact( artifact );
request.addRepository( newTestRepository() );
-
+
ArtifactDescriptorResult result = system.readArtifactDescriptor( session, request );
List<Dependency> deps = result.getDependencies();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
index b26ad9f..6cc0022 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
@@ -34,7 +34,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
/**
* Maven Artifact interface. Notice that it mixes artifact definition concepts (groupId, artifactId, version)
- * with dependency information (version range, scope).
+ * with dependency information (version range, scope).
*/
public interface Artifact
extends Comparable<Artifact>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
index f73b104..452c9f4 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
@@ -23,5 +23,5 @@ package org.apache.maven.artifact.metadata;
public interface ArtifactMetadata
extends org.apache.maven.repository.legacy.metadata.ArtifactMetadata
{
- void merge( ArtifactMetadata metadata );
+ void merge( ArtifactMetadata metadata );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
index ff28907..323fb25 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
@@ -44,7 +44,7 @@ public class Authentication
/**
* Get the user's password which is used when connecting to the repository.
- *
+ *
* @return password of user
*/
public String getPassword()
@@ -54,7 +54,7 @@ public class Authentication
/**
* Set the user's password which is used when connecting to the repository.
- *
+ *
* @param password password of the user
*/
public void setPassword( String password )
@@ -64,7 +64,7 @@ public class Authentication
/**
* Get the username used to access the repository.
- *
+ *
* @return username at repository
*/
public String getUsername()
@@ -74,7 +74,7 @@ public class Authentication
/**
* Set username used to access the repository.
- *
+ *
* @param userName the username used to access repository
*/
public void setUsername( final String userName )
@@ -85,7 +85,7 @@ public class Authentication
/**
* Get the passphrase of the private key file. The passphrase is used only when host/protocol supports
* authentication via exchange of private/public keys and private key was used for authentication.
- *
+ *
* @return passphrase of the private key file
*/
public String getPassphrase()
@@ -95,7 +95,7 @@ public class Authentication
/**
* Set the passphrase of the private key file.
- *
+ *
* @param passphrase passphrase of the private key file
*/
public void setPassphrase( final String passphrase )
@@ -105,7 +105,7 @@ public class Authentication
/**
* Get the absolute path to the private key file.
- *
+ *
* @return absolute path to private key
*/
public String getPrivateKey()
@@ -115,7 +115,7 @@ public class Authentication
/**
* Set the absolute path to private key file.
- *
+ *
* @param privateKey path to private key in local file system
*/
public void setPrivateKey( final String privateKey )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
index 75192d0..66e147c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
@@ -44,7 +44,7 @@ public class AbstractArtifactResolutionException
private String classifier;
- private Artifact artifact;
+ private Artifact artifact;
private List<ArtifactRepository> remoteRepositories;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 508f79c..c83cbd1 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -31,7 +31,7 @@ import java.util.Stack;
/**
* Generic implementation of version comparison.
- *
+ *
* <p>Features:
* <ul>
* <li>mixing of '<code>-</code>' (dash) and '<code>.</code>' (dot) separators,</li>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index e155941..14b16cb 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -53,7 +53,7 @@ public class VersionRangeTest
throws InvalidVersionSpecificationException, OverConstrainedVersionException
{
Artifact artifact = null;
-
+
VersionRange range = VersionRange.createFromVersionSpec( "(,1.0]" );
List<Restriction> restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
index aa924e8..a252975 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
@@ -54,10 +54,10 @@ public class DefaultArtifactInstaller
@Requirement
private RepositorySystem repoSystem;
-
+
@Requirement
private LegacySupport legacySupport;
-
+
/** @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly. */
@Deprecated
public void install( String basedir, String finalName, Artifact artifact, ArtifactRepository localRepository )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
index 4ee80ec..bf19921 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@ -35,7 +35,7 @@ import org.eclipse.aether.metadata.Metadata;
/**
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
* of the public API. In particular, this class can be changed or deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public final class MetadataBridge
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
index 9130796..bdc4a79 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
@@ -21,7 +21,7 @@ package org.apache.maven.artifact.repository.metadata;
/**
* Assists in handling repository metadata.
- *
+ *
* @author Benjamin Bentmann
*/
class MetadataUtils
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 17ca487..1631a01 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -74,7 +74,7 @@ import org.eclipse.aether.resolution.ArtifactResult;
public class DefaultArtifactResolver
implements ArtifactResolver, Disposable
{
- @Requirement
+ @Requirement
private Logger logger;
@Requirement
@@ -88,7 +88,7 @@ public class DefaultArtifactResolver
@Requirement
private ArtifactMetadataSource source;
-
+
@Requirement
private PlexusContainer container;
@@ -169,7 +169,7 @@ public class DefaultArtifactResolver
{
return;
}
-
+
if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
File systemFile = artifact.getFile();
@@ -190,7 +190,7 @@ public class DefaultArtifactResolver
}
artifact.setResolved( true );
-
+
return;
}
@@ -322,7 +322,7 @@ public class DefaultArtifactResolver
.setArtifact( originatingArtifact )
.setResolveRoot( false )
// This is required by the surefire plugin
- .setArtifactDependencies( artifacts )
+ .setArtifactDependencies( artifacts )
.setManagedVersionMap( managedVersions )
.setLocalRepository( localRepository )
.setRemoteRepositories( remoteRepositories )
@@ -358,10 +358,10 @@ public class DefaultArtifactResolver
Set<Artifact> artifacts = request.getArtifactDependencies();
Map<String, Artifact> managedVersions = request.getManagedVersionMap();
List<ResolutionListener> listeners = request.getListeners();
- ArtifactFilter collectionFilter = request.getCollectionFilter();
+ ArtifactFilter collectionFilter = request.getCollectionFilter();
ArtifactFilter resolutionFilter = request.getResolutionFilter();
RepositorySystemSession session = getSession( request.getLocalRepository() );
-
+
//TODO: hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the workspace
if ( source == null )
{
@@ -393,9 +393,9 @@ public class DefaultArtifactResolver
// This is often an artifact like a POM that is taken from disk and we already have hold of the
// file reference. But this may be a Maven Plugin that we need to resolve from a remote repository
// as well as its dependencies.
-
+
if ( request.isResolveRoot() /* && rootArtifact.getFile() == null */ )
- {
+ {
try
{
resolve( rootArtifact, request.getRemoteRepositories(), session );
@@ -470,7 +470,7 @@ public class DefaultArtifactResolver
return result;
}
}
-
+
if ( artifacts == null || artifacts.isEmpty() )
{
if ( request.isResolveRoot() )
@@ -478,13 +478,13 @@ public class DefaultArtifactResolver
result.addArtifact( rootArtifact );
}
return result;
- }
+ }
// After the collection we will have the artifact object in the result but they will not be resolved yet.
result =
artifactCollector.collect( artifacts, rootArtifact, managedVersions, collectionRequest, source,
collectionFilter, listeners, null );
-
+
// We have metadata retrieval problems, or there are cycles that have been detected
// so we give this back to the calling code and let them deal with this information
// appropriately.
@@ -528,14 +528,14 @@ public class DefaultArtifactResolver
// We want to send the root artifact back in the result but we need to do this after the other dependencies
// have been resolved.
if ( request.isResolveRoot() )
- {
+ {
// Add the root artifact (as the first artifact to retain logical order of class path!)
Set<Artifact> allArtifacts = new LinkedHashSet<Artifact>();
allArtifacts.add( rootArtifact );
allArtifacts.addAll( result.getArtifacts() );
result.setArtifacts( allArtifacts );
- }
-
+ }
+
return result;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
index d7006ec..0499db5 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
@@ -51,14 +51,14 @@ public class InversionArtifactFilter
{
return true;
}
-
+
if ( !( obj instanceof InversionArtifactFilter ) )
{
return false;
}
-
+
InversionArtifactFilter other = (InversionArtifactFilter) obj;
-
+
return toInvert.equals( other.toInvert );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
index d8499c4..8cd02cc 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
@@ -27,7 +27,7 @@ import org.apache.maven.artifact.Artifact;
/**
* Apply multiple filters, accepting an artifact if at least one of the filters accepts it.
- *
+ *
* @author Benjamin Bentmann
*/
public class OrArtifactFilter
@@ -79,15 +79,15 @@ public class OrArtifactFilter
{
return true;
}
-
+
if ( !( obj instanceof OrArtifactFilter ) )
{
return false;
}
-
+
OrArtifactFilter other = (OrArtifactFilter) obj;
-
+
return filters.equals( other.filters );
}
-
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
index 6750372..76c39ec 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
@@ -52,14 +52,14 @@ public class TypeArtifactFilter
{
return true;
}
-
+
if ( !( obj instanceof TypeArtifactFilter ) )
{
return false;
}
-
+
TypeArtifactFilter other = (TypeArtifactFilter) obj;
-
+
return type.equals( other.type );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java b/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
index b5759c7..7767aff 100644
--- a/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* Describes runtime information about the application.
- *
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
index 0427d71..72527b0 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
@@ -64,9 +64,9 @@ public class ProfilesConversionUtils
activation.setProperty( prop );
}
-
+
ActivationOS profileOs = profileActivation.getOs();
-
+
if ( profileOs != null )
{
org.apache.maven.model.ActivationOS os = new org.apache.maven.model.ActivationOS();
@@ -78,7 +78,7 @@ public class ProfilesConversionUtils
activation.setOs( os );
}
-
+
org.apache.maven.profiles.ActivationFile profileFile = profileActivation.getFile();
if ( profileFile != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
index 49e8b4b..7464a30 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
@@ -70,15 +70,15 @@ public class OperatingSystemProfileActivator
{
String test = version;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
test = test.substring( 1 );
}
-
+
boolean result = Os.isVersion( test );
-
+
if ( reverse )
{
return !result;
@@ -93,15 +93,15 @@ public class OperatingSystemProfileActivator
{
String test = arch;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
test = test.substring( 1 );
}
-
+
boolean result = Os.isArch( test );
-
+
if ( reverse )
{
return !result;
@@ -116,7 +116,7 @@ public class OperatingSystemProfileActivator
{
String test = name;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
@@ -139,15 +139,15 @@ public class OperatingSystemProfileActivator
{
String test = family;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
test = test.substring( 1 );
}
-
+
boolean result = Os.isFamily( test );
-
+
if ( reverse )
{
return !result;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
index ab270c5..f6319fa 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
@@ -35,7 +35,7 @@ public class BuildTimestampValueSource
private final Date startTime;
private final String format;
-
+
private String formattedDate;
public BuildTimestampValueSource( Date startTime, String format )
@@ -53,7 +53,7 @@ public class BuildTimestampValueSource
{
formattedDate = new SimpleDateFormat( format ).format( startTime );
}
-
+
return formattedDate;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
index a34bf50..4e251ae 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
@@ -41,7 +41,7 @@ public class RegexBasedModelInterpolator
throws IOException
{
}
-
+
public RegexBasedModelInterpolator( PathTranslator pathTranslator )
{
super( pathTranslator );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
index 239de76..54fd04c 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
@@ -23,7 +23,7 @@ import org.apache.maven.model.Model;
/**
* Checks the model for missing or invalid values.
- *
+ *
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
index 09fcb24..c15899e 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
@@ -26,7 +26,7 @@ import org.apache.maven.settings.Mirror;
/**
* Handles the selection of mirrors for repositories.
- *
+ *
* @author Benjamin Bentmann
*/
public interface MirrorSelector
@@ -34,7 +34,7 @@ public interface MirrorSelector
/**
* Determines the mirror for the specified repository.
- *
+ *
* @param repository The repository to determine the mirror for, must not be {@code null}.
* @param mirrors The available mirrors, may be {@code null}.
* @return The mirror specification for the repository or {@code null} if no mirror matched.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
index 3d7be9b..70d3e0a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
@@ -29,18 +29,18 @@ public class UserLocalArtifactRepository
extends LocalArtifactRepository
{
private ArtifactRepository localRepository;
-
+
public UserLocalArtifactRepository( ArtifactRepository localRepository )
{
this.localRepository = localRepository;
setLayout( localRepository.getLayout() );
}
-
+
@Override
public Artifact find( Artifact artifact )
{
File artifactFile = new File( localRepository.getBasedir(), pathOf( artifact ) );
-
+
// We need to set the file here or the resolver will fail with an NPE, not fully equipped to deal
// with multiple local repository implementations yet.
artifact.setFile( artifactFile );
@@ -53,13 +53,13 @@ public class UserLocalArtifactRepository
{
return localRepository.getId();
}
-
+
@Override
public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository )
{
return localRepository.pathOfLocalRepositoryMetadata( metadata, repository );
}
-
+
@Override
public String pathOf( Artifact artifact )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 0c796ae..78898a9 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -79,8 +79,8 @@ public class DefaultWagonManager
@Requirement
private LegacySupport legacySupport;
-
-
+
+
//
// Retriever
//
@@ -235,12 +235,12 @@ public class DefaultWagonManager
private void connectWagon( Wagon wagon, ArtifactRepository repository )
throws ConnectionException, AuthenticationException
{
- // MNG-5509
+ // MNG-5509
// See org.eclipse.aether.connector.wagon.WagonRepositoryConnector.connectWagon(Wagon)
if( legacySupport.getRepositorySession() != null )
{
Properties headers = new Properties();
-
+
headers.put( "User-Agent", ConfigUtils.getString( legacySupport.getRepositorySession(), "Maven",
ConfigurationProperties.USER_AGENT ) );
try
@@ -257,7 +257,7 @@ public class DefaultWagonManager
logger.debug( "Could not set user agent for wagon " + wagon.getClass().getName() + ": " + e );
}
}
-
+
if ( repository.getProxy() != null && logger.isDebugEnabled() )
{
logger.debug( "Using proxy " + repository.getProxy().getHost() + ":" + repository.getProxy().getPort()
@@ -802,7 +802,7 @@ public class DefaultWagonManager
throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: "
+ protocol, e );
}
-
+
return wagon;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
index 0db2a6d..9acebef 100644
--- a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
+++ b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
@@ -88,8 +88,8 @@ under the License.
<![CDATA[
This is a set of Artifact instances resolved from the set of dependencies for
the current project.
-
- NOTE: This will likely contain much more than the direct dependencies of the
+
+ NOTE: This will likely contain much more than the direct dependencies of the
current POM, since Maven uses transitive, or chained, dependency resolution.
]]></description>
</expression>
@@ -120,7 +120,7 @@ under the License.
<![CDATA[
This is the list of Artifact instances for plugins used in the current build
for this project.
-
+
NOTE: This list may contain plugin Artifacts which are implied by the current POM's
packaging and the lifecycle phase being built.
]]></description>
@@ -137,7 +137,7 @@ under the License.
<![CDATA[
This is a list of ArtifactRepository instances used to resolve the Artifacts associated
with the current POM.
-
+
NOTE: This list will contain entries for repositories specified by ancestor POMs, including
the default built-in super-POM, which is the parent of all POMs.
]]></description>
@@ -154,7 +154,7 @@ under the License.
<![CDATA[
This is a list of ArtifactRepository instances used to resolve the Artifacts associated
with plugins used in building the current POM.
-
+
NOTE: This list will contain entries for repositories specified by ancestor POMs, including
the default built-in super-POM, which is the parent of all POMs.
]]></description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
index 19dc065..27f0343 100644
--- a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
+++ b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
@@ -27,8 +27,8 @@ under the License.
<configuration>
<![CDATA[
Inside ~/.m2/settings.xml:
-
- <localRepository>/path/to/local/repository</localRepository>
+
+ <localRepository>/path/to/local/repository</localRepository>
]]></configuration>
<description>The ArtifactRepository instance referencing the local artifact
repository.</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 91265db..010c566 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -85,7 +85,7 @@ public abstract class AbstractArtifactComponentTestCase
throws Exception
{
super.setUp();
- artifactFactory = lookup( ArtifactFactory.class);
+ artifactFactory = lookup( ArtifactFactory.class);
artifactRepositoryFactory = lookup( ArtifactRepositoryFactory.class );
RepositorySystemSession repoSession = initRepoSession();
@@ -96,13 +96,13 @@ public abstract class AbstractArtifactComponentTestCase
LegacySupport legacySupport = lookup(LegacySupport.class);
legacySupport.setSession( session );
}
-
+
@Override
protected void tearDown()
throws Exception
{
release( artifactFactory );
-
+
super.tearDown();
}
@@ -110,7 +110,7 @@ public abstract class AbstractArtifactComponentTestCase
/**
* Return an existing file, not a directory - causes creation to fail.
- *
+ *
* @throws Exception
*/
protected ArtifactRepository badLocalRepository()
@@ -314,7 +314,7 @@ public abstract class AbstractArtifactComponentTestCase
throws Exception
{
Artifact a = artifactFactory.createBuildArtifact( groupId, artifactId, version, type );
-
+
return a;
}