From 0343c52601f7623415511e4f05fc79b03c283455 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sun, 23 Nov 2014 13:00:59 +0100 Subject: [PATCH] Trimmed trailing whitespace --- apache-maven/src/conf/settings.xml | 26 ++-- .../maven/settings/GlobalSettingsTest.java | 2 +- maven-aether-provider/pom.xml | 2 +- .../internal/ArtifactDescriptorUtils.java | 2 +- .../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 +- .../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 +- .../profiles/ProfilesConversionUtils.java | 6 +- .../OperatingSystemProfileActivator.java | 20 +-- .../BuildTimestampValueSource.java | 4 +- .../RegexBasedModelInterpolator.java | 2 +- .../project/validation/ModelValidator.java | 2 +- .../maven/repository/MirrorSelector.java | 4 +- .../UserLocalArtifactRepository.java | 10 +- .../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 +- .../MavenArtifactRepositoryTest.java | 2 +- .../ArtifactResolutionExceptionTest.java | 2 +- .../resolver/ArtifactResolverTest.java | 2 +- .../artifact/resolver/TestFileWagon.java | 24 +-- .../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 +- .../t02/ProjectInheritanceTest.java | 22 +-- .../repository/DefaultMirrorSelectorTest.java | 38 ++--- .../repository/LegacyRepositoryLayout.java | 2 +- .../LegacyRepositorySystemTest.java | 38 ++--- .../legacy/DefaultUpdateCheckManagerTest.java | 16 +- .../legacy/LegacyRepositorySystemTest.java | 6 +- .../maven/repository/legacy/StringWagon.java | 6 +- .../maven/repository/legacy/WagonA.java | 2 +- .../maven/repository/legacy/WagonB.java | 2 +- .../maven/repository/legacy/WagonC.java | 2 +- .../maven/repository/legacy/WagonMock.java | 2 +- .../AbstractConflictResolverTest.java | 36 ++--- .../FarthestConflictResolverTest.java | 12 +- .../conflict/NearestConflictResolverTest.java | 12 +- .../conflict/NewestConflictResolverTest.java | 12 +- .../conflict/OldestConflictResolverTest.java | 12 +- .../DefaultClasspathTransformationTest.java | 4 +- ...aultGraphConflictResolutionPolicyTest.java | 2 +- .../DefaultGraphConflictResolverTest.java | 4 +- .../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 ++-- .../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 +- .../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 +- .../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 +- .../filter/IncludesArtifactFilter.java | 6 +- .../maven/bridge/MavenRepositorySystem.java | 8 +- .../classrealm/ClassRealmConstituent.java | 14 +- .../maven/classrealm/ClassRealmManager.java | 12 +- .../classrealm/ClassRealmManagerDelegate.java | 2 +- .../maven/classrealm/ClassRealmRequest.java | 12 +- .../classrealm/DefaultClassRealmManager.java | 4 +- ...asedirBeanConfigurationPathTranslator.java | 4 +- .../BeanConfigurationException.java | 2 +- .../BeanConfigurationPathTranslator.java | 4 +- .../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 +- .../DefaultMavenExecutionRequest.java | 2 +- ...DefaultMavenExecutionRequestPopulator.java | 4 +- .../maven/execution/ExecutionEvent.java | 12 +- .../maven/execution/ExecutionListener.java | 2 +- .../execution/MavenExecutionRequest.java | 16 +- .../MavenExecutionRequestPopulator.java | 6 +- .../maven/execution/MavenExecutionResult.java | 2 +- .../apache/maven/execution/MavenSession.java | 10 +- .../maven/execution/MojoExecutionEvent.java | 2 +- .../execution/MojoExecutionListener.java | 2 +- .../execution/ProjectDependencyGraph.java | 8 +- .../execution/ProjectExecutionEvent.java | 2 +- .../execution/ProjectExecutionListener.java | 2 +- .../execution/scope/MojoExecutionScoped.java | 2 +- .../scope/WeakMojoExecutionListener.java | 2 +- .../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 +- .../DefaultExecutionEventCatapult.java | 2 +- ...faultLifecycleExecutionPlanCalculator.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 +- .../lifecycle/internal/LifecycleTask.java | 2 +- .../LifecycleTaskSegmentCalculator.java | 2 +- .../internal/MojoDescriptorCreator.java | 2 +- .../lifecycle/internal/MojoExecutor.java | 2 +- .../lifecycle/internal/ProjectBuildList.java | 2 +- .../lifecycle/internal/ProjectIndex.java | 2 +- .../lifecycle/internal/ProjectSegment.java | 2 +- .../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 +- .../plugin/DefaultBuildPluginManager.java | 6 +- .../plugin/DefaultPluginDescriptorCache.java | 2 +- .../maven/plugin/ExtensionRealmCache.java | 4 +- .../InvalidPluginDescriptorException.java | 2 +- .../apache/maven/plugin/LegacySupport.java | 8 +- .../maven/plugin/MavenPluginManager.java | 14 +- .../apache/maven/plugin/MojoExecution.java | 28 ++-- .../maven/plugin/PluginArtifactsCache.java | 6 +- .../maven/plugin/PluginDescriptorCache.java | 2 +- .../apache/maven/plugin/PluginManager.java | 4 +- .../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 +- .../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 +- .../DefaultPluginVersionResolver.java | 2 +- .../internal/DefaultPluginVersionResult.java | 2 +- .../project/DefaultMavenProjectHelper.java | 2 +- .../project/DefaultModelBuildingListener.java | 4 +- .../maven/project/DefaultProjectBuilder.java | 6 +- .../project/DefaultProjectBuildingHelper.java | 4 +- .../DefaultProjectBuildingRequest.java | 2 +- .../project/DefaultProjectBuildingResult.java | 6 +- .../project/DependencyResolutionRequest.java | 14 +- .../project/DependencyResolutionResult.java | 14 +- .../maven/project/ExtensionDescriptor.java | 2 +- .../project/ExtensionDescriptorBuilder.java | 4 +- .../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 +- .../maven/project/ProjectRealmCache.java | 4 +- .../maven/project/ReactorModelCache.java | 2 +- .../maven/project/ReactorModelPool.java | 2 +- .../artifact/DefaultMetadataSource.java | 2 +- .../project/artifact/MavenMetadataSource.java | 2 +- .../properties/internal/EnvironmentUtils.java | 4 +- .../properties/internal/SystemProperties.java | 2 +- .../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 +-- .../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 +- .../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 +- .../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 +++++----- .../site/apt/plugin-execution-isolation.apt | 8 +- .../scripting-support/marmalade-support.apt | 140 +++++++++--------- .../AbstractCoreMavenComponentTestCase.java | 78 +++++----- .../maven/MavenLifecycleParticipantTest.java | 4 +- .../ProjectDependenciesResolverTest.java | 12 +- .../execution/DefaultMavenExecutionTest.java | 2 +- .../lifecycle/LifecycleExecutorTest.java | 4 +- .../maven/plugin/PluginManagerTest.java | 82 +++++----- .../plugin/PluginParameterExceptionTest.java | 68 ++++----- .../project/AbstractMavenProjectTestCase.java | 12 +- .../DefaultMavenProjectBuilderTest.java | 2 +- .../maven/project/EmptyLifecycleExecutor.java | 4 +- .../project/EmptyProjectBuildingHelper.java | 2 +- .../ExtensionDescriptorBuilderTest.java | 2 +- .../maven/project/MavenProjectTest.java | 8 +- .../maven/project/PomConstructionTest.java | 136 ++++++++--------- .../maven/project/ProjectBuilderTest.java | 10 +- .../maven/project/TestMetadataSource.java | 6 +- .../DefaultMavenMetadataCacheTest.java | 2 +- .../harness/Xpp3DomAttributeIterator.java | 2 +- .../harness/Xpp3DomAttributePointer.java | 2 +- .../project/harness/Xpp3DomNodeIterator.java | 2 +- .../project/harness/Xpp3DomNodePointer.java | 2 +- .../harness/Xpp3DomPointerFactory.java | 2 +- .../repository/LegacyRepositoryLayout.java | 2 +- .../maven/repository/TestArtifactHandler.java | 2 +- .../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 +- .../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 +- .../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 +- .../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 +- .../sub/pom.xml | 2 +- .../plugin-exec-merging/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 +- .../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 +- .../sub/pom.xml | 2 +- .../profile-plugins/pom.xml | 2 +- .../repo-inheritance/pom.xml | 4 +- .../jetty-parent.xml | 2 +- .../child/pom.xml | 2 +- .../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 +- .../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 +- .../workspace/buildModelLineage/pom.xml | 2 +- .../childAndParent/child/pom.xml | 2 +- .../resolveParentPom/childAndParent/pom.xml | 2 +- .../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 +- .../project-dynamism/pom-relative.xml | 16 +- .../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 +- .../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 +- .../logging/impl/LogbackConfiguration.java | 4 +- .../impl/Slf4jSimpleConfiguration.java | 4 +- .../UnsupportedSlf4jBindingConfiguration.java | 4 +- .../ConsoleMavenTransferListener.java | 2 +- maven-embedder/src/site/apt/logging.apt | 6 +- .../src/main/java/org/apache/maven/App.java | 2 +- .../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 +- .../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 +- .../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 +- .../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 +- .../resources/settings/valid-settings.xml | 2 +- .../AbstractModelBuildingListener.java | 2 +- .../building/DefaultModelBuilderFactory.java | 4 +- .../building/DefaultModelBuildingEvent.java | 2 +- .../building/DefaultModelBuildingRequest.java | 4 +- .../building/DefaultModelBuildingResult.java | 2 +- .../model/building/DefaultModelProblem.java | 8 +- .../DefaultModelProblemCollector.java | 2 +- .../maven/model/building/FileModelSource.java | 6 +- .../building/FilterModelBuildingRequest.java | 2 +- .../maven/model/building/ModelBuilder.java | 6 +- .../model/building/ModelBuildingEvent.java | 8 +- .../building/ModelBuildingException.java | 14 +- .../model/building/ModelBuildingListener.java | 4 +- .../model/building/ModelBuildingRequest.java | 4 +- .../model/building/ModelBuildingResult.java | 16 +- .../maven/model/building/ModelCache.java | 6 +- .../maven/model/building/ModelData.java | 32 ++-- .../maven/model/building/ModelProblem.java | 16 +- .../model/building/ModelProblemCollector.java | 4 +- .../building/ModelProblemCollectorExt.java | 2 +- .../ModelProblemCollectorRequest.java | 4 +- .../model/building/ModelProblemUtils.java | 8 +- .../maven/model/building/ModelSource.java | 6 +- .../maven/model/building/ModelSource2.java | 2 +- .../model/building/StringModelSource.java | 8 +- .../maven/model/building/UrlModelSource.java | 6 +- .../DefaultDependencyManagementImporter.java | 2 +- .../DependencyManagementImporter.java | 4 +- .../DefaultInheritanceAssembler.java | 2 +- .../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 +- .../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 +- .../path/DefaultModelPathTranslator.java | 2 +- .../model/path/DefaultModelUrlNormalizer.java | 2 +- .../model/path/DefaultPathTranslator.java | 2 +- .../model/path/DefaultUrlNormalizer.java | 2 +- .../maven/model/path/ModelPathTranslator.java | 4 +- .../maven/model/path/ModelUrlNormalizer.java | 4 +- .../maven/model/path/PathTranslator.java | 4 +- .../maven/model/path/UrlNormalizer.java | 4 +- .../DefaultPluginConfigurationExpander.java | 2 +- .../DefaultReportConfigurationExpander.java | 2 +- .../plugin/DefaultReportingConverter.java | 2 +- .../plugin/LifecycleBindingsInjector.java | 4 +- .../plugin/PluginConfigurationExpander.java | 4 +- .../plugin/ReportConfigurationExpander.java | 4 +- .../model/plugin/ReportingConverter.java | 4 +- .../model/profile/DefaultProfileInjector.java | 2 +- .../model/profile/DefaultProfileSelector.java | 2 +- .../profile/ProfileActivationContext.java | 12 +- .../maven/model/profile/ProfileInjector.java | 4 +- .../maven/model/profile/ProfileSelector.java | 4 +- .../activation/FileProfileActivator.java | 2 +- .../JdkVersionProfileActivator.java | 2 +- .../OperatingSystemProfileActivator.java | 2 +- .../profile/activation/ProfileActivator.java | 4 +- .../activation/PropertyProfileActivator.java | 2 +- .../InvalidRepositoryException.java | 8 +- .../UnresolvableModelException.java | 12 +- .../model/superpom/SuperPomProvider.java | 4 +- .../validation/DefaultModelValidator.java | 2 +- .../model/validation/ModelValidator.java | 6 +- .../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 +- .../maven/model/ActivationFileTest.java | 2 +- .../apache/maven/model/ActivationOSTest.java | 2 +- .../maven/model/ActivationPropertyTest.java | 2 +- .../apache/maven/model/ActivationTest.java | 2 +- .../org/apache/maven/model/BuildTest.java | 2 +- .../apache/maven/model/CiManagementTest.java | 2 +- .../apache/maven/model/ContributorTest.java | 2 +- .../maven/model/DependencyManagementTest.java | 2 +- .../apache/maven/model/DependencyTest.java | 2 +- .../maven/model/DeploymentRepositoryTest.java | 2 +- .../org/apache/maven/model/DeveloperTest.java | 2 +- .../model/DistributionManagementTest.java | 2 +- .../org/apache/maven/model/ExclusionTest.java | 2 +- .../org/apache/maven/model/ExtensionTest.java | 2 +- .../maven/model/IssueManagementTest.java | 2 +- .../org/apache/maven/model/LicenseTest.java | 2 +- .../apache/maven/model/MailingListTest.java | 2 +- .../org/apache/maven/model/ModelTest.java | 2 +- .../org/apache/maven/model/NotifierTest.java | 2 +- .../apache/maven/model/OrganizationTest.java | 2 +- .../org/apache/maven/model/ParentTest.java | 2 +- .../maven/model/PluginConfigurationTest.java | 2 +- .../maven/model/PluginContainerTest.java | 2 +- .../maven/model/PluginExecutionTest.java | 2 +- .../maven/model/PluginManagementTest.java | 2 +- .../org/apache/maven/model/PluginTest.java | 2 +- .../apache/maven/model/PrerequisitesTest.java | 2 +- .../org/apache/maven/model/ProfileTest.java | 2 +- .../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 +- .../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 +- .../plugin/descriptor/MojoDescriptor.java | 2 +- .../plugin/descriptor/PluginDescriptor.java | 2 +- .../PluginDescriptorBuilderTest.java | 2 +- .../src/test/resources/plugin.xml | 2 +- .../building/DefaultSettingsBuilder.java | 2 +- .../DefaultSettingsBuilderFactory.java | 4 +- .../DefaultSettingsBuildingRequest.java | 2 +- .../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 +- .../settings/building/SettingsSource.java | 6 +- .../building/StringSettingsSource.java | 8 +- .../settings/building/UrlSettingsSource.java | 6 +- .../crypto/DefaultSettingsDecrypter.java | 2 +- .../DefaultSettingsDecryptionRequest.java | 8 +- .../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 +- .../validation/SettingsValidator.java | 4 +- pom.xml | 10 +- 641 files changed, 1844 insertions(+), 1846 deletions(-) diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml index 204e33492f..19d7a97799 100644 --- a/apache-maven/src/conf/settings.xml +++ b/apache-maven/src/conf/settings.xml @@ -22,7 +22,7 @@ under the License. - - + @@ -157,20 +157,20 @@ under the License. --> - + false - + compile diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml index e9ddf0d78c..736b51539b 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml @@ -7,5 +7,5 @@ 4.0.0 p1 - + diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml index 97bf7ccc22..a22df68eac 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml @@ -4,13 +4,13 @@ p0 pom 1.0 - + scm:svn:http://host/p0 scm:svn:https://host/p0 http://host/viewer?path=/p0 - + modules/p1 diff --git a/maven-core/lifecycle-executor.txt b/maven-core/lifecycle-executor.txt index 13ac5454a5..41e98bfdb5 100644 --- a/maven-core/lifecycle-executor.txt +++ b/maven-core/lifecycle-executor.txt @@ -36,7 +36,7 @@ We need to turn this list of phases into a set of plugin objects that have an xm . . - + We need this form so that the model builder can make the first pass at merging. Full merging cannot be done because we don't know what the version of the plugin is yet that the user has requested. For plugins in the default lifecycle they are typically defined in the plugin management section of the parent POM. When the merging is complete we are going to have something that looks like the following: @@ -57,11 +57,11 @@ We need this form so that the model builder can make the first pass at merging. . -Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the element and element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configurure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values in the Maven Mojo. +Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the element and element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configurure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values in the Maven Mojo. foreach configuration element: - if read only and being set squawk - + - find the parameter - get value from expression or default - if required and null squawk diff --git a/maven-core/plugin-manager.txt b/maven-core/plugin-manager.txt index 43cccd3ed1..f3fcf8e962 100644 --- a/maven-core/plugin-manager.txt +++ b/maven-core/plugin-manager.txt @@ -47,50 +47,50 @@ i'l // - plugins with a dependency the same as the core but different versions, make it fail then fix it /* - * + * * h2. Concerns for the plugin manager - * + * * h3. resolving the dependencies of a plugin - these could be resolved remotely at runtime or, - * they could be resolved from a local repository - i think we need a simple dependency model here * that is more mercury related and not Maven related i.e no POMs - workspace resolver - we need * tools to pre-populate this repository - * + * * h3. create an isolated classloader - * + * * h3. lookup the plugin with a configuration - * + * * h3. execute the plugin - * + * * h3. plugins may have to deal with particular actions when a plugin is - installed - loaded - * unloaded - update - uninstalled - * + * * h3. plugins should be able to have specific metadata for a plugin model and that be translated - * dependencies - resources - configuration - extension points of plugins - * + * * For a particular application plugin there will be a declarative descriptor for that plugin type. - * + * * - nexus - the plugin class - UI to contribute - what JS to hook into the UI - what resources to * load into the UI - having packed or unpacked plugins, and positioning resources if necessary - * maven can work out of the classloader, nexus plugins probably couldn't given the js and image * resources - * + * * We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be * able to do - * + * * - now what is really the difference between this and loading a component in plexus - custom * classloading capability - remote resolution of dependencies - do we want a model for sharing * information among plugins, is this more like an extension point - do we need a sort of bus for * application data - do we need a dictionary for our applications like Apple does. We could easily * hook into this and this is the model we need to follow - how many of our REST services do not map * directory to a method in the application interface? - * + * * - research extension points versus plugins - * + * * from igor: two plugins A and B, both depend on the same library but use different versions, say * lib 1.0 and lib 2.0 when debugger hits a breakpoint inside a class from the library, IDE needs to * know which version of library the class comes from */ - + This document outlines the concerns of a general plugin manager that would be used in conjunction with any Plexus-based application. The following outlined concerns are an attempt to describe what a plugin manager would need to do for Maven and for Nexus. h2. Concerns for the plugin manager @@ -144,8 +144,8 @@ Each application will have its own model for plugins. Much of this model will be * Configuration metadata and default configuration values * Extension points that plugins might expose -h3. The plugin manager may have to deal with particular actions when a plugin is - +h3. The plugin manager may have to deal with particular actions when a plugin is + * installation * activation * update @@ -158,7 +158,7 @@ We might want to separate between installation and activation, it might be nice These particular phases in a plugin’s lifecycle can probably be generalized to all plugins so could be something implemented in all plugins. Here we could have the descriptor either point to methods for each of these phases to execute or we could create a lifecycle in Plexus for these phases. -For a particular application plugin there will be a declarative descriptor for that plugin type. +For a particular application plugin there will be a declarative descriptor for that plugin type. h3. Some general notes on Nexus @@ -168,11 +168,11 @@ The plugin metadata: * what JS to hook into the UI * what resources to load into the UI * having packed or unpacked plugins, and positioning resources if necessary -* maven can work out of the classloader, nexus plugins probably couldn't given the js and image resources - +* maven can work out of the classloader, nexus plugins probably couldn't given the js and image resources + h3. Other issues -We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be able to do +We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be able to do * now what is really the difference between this and loading a component in plexus * do we want a model for sharing information among plugins, is this more like an extension point @@ -182,4 +182,3 @@ We need to look at Maven, and Nexus as use cases and figure out what each of the - an example of adding js - an example of adding a URI - \ No newline at end of file diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java index 03db5e6c6f..84b5298755 100644 --- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java +++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java @@ -69,7 +69,7 @@ public void afterSessionStart( MavenSession session ) * code. */ public void afterSessionEnd( MavenSession session ) - throws MavenExecutionException + throws MavenExecutionException { // do nothing } diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java index da88508e2c..dda35bd90f 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java @@ -38,7 +38,7 @@ * @todo this should probably be a component with some dynamic control of filtering */ @Component( role = ArtifactFilterManager.class ) -public class DefaultArtifactFilterManager +public class DefaultArtifactFilterManager implements ArtifactFilterManager { diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index fb70bfef61..8fc35e8adc 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -145,7 +145,7 @@ public class DefaultMaven @Requirement private SessionScope sessionScope; - + public MavenExecutionResult execute( MavenExecutionRequest request ) { MavenExecutionResult result; @@ -176,7 +176,7 @@ public MavenExecutionResult execute( MavenExecutionRequest request ) return result; } - // + // // 1) Setup initial properties. // // 2) Validate local repository directory is accessible. @@ -208,7 +208,7 @@ public MavenExecutionResult execute( MavenExecutionRequest request ) private MavenExecutionResult doExecute( MavenExecutionRequest request ) { request.setStartTime( new Date() ); - + MavenExecutionResult result = new DefaultMavenExecutionResult(); try @@ -223,14 +223,14 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request ) DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) newRepositorySession( request ); MavenSession session = new MavenSession( container, repoSession, request, result ); - + // // We enter the session scope right after the MavenSession creation and before any of the AbstractLifecycleParticipant lookups // so that @SessionScoped components can be @Injected into AbstractLifecycleParticipants. - // + // sessionScope.enter(); sessionScope.seed( MavenSession.class, session ); - + legacySupport.setSession( session ); try @@ -285,7 +285,7 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request ) { return addExceptionToResult( result, e ); } - + WorkspaceReader reactorWorkspace; try { @@ -295,14 +295,14 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request ) { return addExceptionToResult( result, e ); } - + // // Desired order of precedence for local artifact repositories // // Reactor // Workspace // User Local Repository - // + // repoSession.setWorkspaceReader( ChainedWorkspaceReader.newInstance( reactorWorkspace, repoSession.getWorkspaceReader() ) ); @@ -380,7 +380,7 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request ) return result; } - private void afterSessionEnd( Collection projects, MavenSession session ) + private void afterSessionEnd( Collection projects, MavenSession session ) throws MavenExecutionException { ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); @@ -641,7 +641,7 @@ private List getProjectsForMavenReactor( MavenSession session ) throws ProjectBuildingException { MavenExecutionRequest request = session.getRequest(); - + request.getProjectBuildingRequest().setRepositorySession( session.getRepositorySession() ); List projects = new ArrayList(); @@ -761,7 +761,7 @@ private void validateProjects( List projects ) for ( MavenProject project : projects ) { - // MNG-1911 / MNG-5572: Building plugins with extensions cannot be part of reactor + // MNG-1911 / MNG-5572: Building plugins with extensions cannot be part of reactor for ( Plugin plugin : project.getBuildPlugins() ) { if ( plugin.isExtensions() ) @@ -940,7 +940,7 @@ else if ( StringUtils.isNotEmpty( request.getMakeBehavior() ) ) return result; } - + private List trimExcludedProjects( List projects, MavenExecutionRequest request ) throws MavenExecutionException { diff --git a/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java b/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java index c58749dde2..b13987295b 100644 --- a/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java +++ b/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java @@ -26,7 +26,7 @@ /** * Signals a collision of two or more projects with the same g:a:v during a reactor build. - * + * * @author Benjamin Bentmann */ public class DuplicateProjectException @@ -37,7 +37,7 @@ public class DuplicateProjectException /** * Creates a new exception with specified details. - * + * * @param message The message text, may be {@code null}. * @param collisions The POM files of the projects that collided, indexed by their g:a:v, may be {@code null}. */ @@ -50,7 +50,7 @@ public DuplicateProjectException( String message, Map> collis /** * Gets the POM files of the projects that collided. - * + * * @return The POM files of the projects that collided, indexed by their g:a:v, never {@code null}. */ public Map> getCollisions() diff --git a/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java index 8d748c9664..e5db6bdfe4 100644 --- a/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java @@ -30,7 +30,7 @@ /** * Provides a sub view of another dependency graph. - * + * * @author Benjamin Bentmann */ class FilteredProjectDependencyGraph @@ -45,7 +45,7 @@ class FilteredProjectDependencyGraph /** * Creates a new project dependency graph from the specified graph. - * + * * @param projectDependencyGraph The project dependency graph to create a sub view from, must not be {@code null}. * @param whiteList The projects on which the dependency view should focus, must not be {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/InternalErrorException.java b/maven-core/src/main/java/org/apache/maven/InternalErrorException.java index 1fd7a78986..afe92c1b31 100644 --- a/maven-core/src/main/java/org/apache/maven/InternalErrorException.java +++ b/maven-core/src/main/java/org/apache/maven/InternalErrorException.java @@ -21,7 +21,7 @@ /** * Signals an internal error in Maven itself, e.g. a programming bug. - * + * * @author Benjamin Bentmann */ public class InternalErrorException diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/maven-core/src/main/java/org/apache/maven/Maven.java index 05fb6edb11..85638476c6 100644 --- a/maven-core/src/main/java/org/apache/maven/Maven.java +++ b/maven-core/src/main/java/org/apache/maven/Maven.java @@ -30,5 +30,5 @@ public interface Maven @Deprecated String POMv4 = "pom.xml"; - MavenExecutionResult execute( MavenExecutionRequest request ); + MavenExecutionResult execute( MavenExecutionRequest request ); } \ No newline at end of file diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index de31eb8f8f..3aca28d17d 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -43,7 +43,7 @@ /** * An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either * as packaged jar if it has been built, or only compile output directory if packaging hasn't happened yet. - * + * * @author Jason van Zyl */ @Named( ReactorReader.HINT ) @@ -52,7 +52,7 @@ class ReactorReader implements WorkspaceReader { public static final String HINT = "reactor"; - + private static final Collection COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); private Map projectsByGAV; @@ -193,7 +193,7 @@ private boolean hasBeenPackaged( MavenProject project ) /** * Tries to resolve the specified artifact from the artifacts of the given project. - * + * * @param project The project to try to resolve the artifact from, must not be null. * @param requestedArtifact The artifact to resolve, must not be null. * @return The matching artifact from the project or null if not found. Note that this @@ -234,7 +234,7 @@ private boolean attachedArtifactComparison( Artifact requested, Artifact attache /** * Determines whether the specified artifact refers to test classes. - * + * * @param artifact The artifact to check, must not be {@code null}. * @return {@code true} if the artifact refers to test classes, {@code false} otherwise. */ diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java index 9190c0c230..d7fd88e27e 100644 --- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java +++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java @@ -49,7 +49,7 @@ /** * Warning: 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 RepositoryUtils diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java b/maven-core/src/main/java/org/apache/maven/SessionScoped.java index 3a1692ff3e..f44ddbf996 100644 --- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java +++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java @@ -29,7 +29,7 @@ /** * Indicates that annotated component should be instantiated before session starts and discarded after session execution completes. - * + * * @author Jason van Zyl * @since 3.2.0 */ diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java index 16cdeffbf2..6b18789dea 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java @@ -27,7 +27,7 @@ /** * Collects basic settings to access the repository system. - * + * * @author Benjamin Bentmann */ public class DefaultRepositoryRequest @@ -52,7 +52,7 @@ public DefaultRepositoryRequest() /** * Creates a shallow copy of the specified repository request. - * + * * @param repositoryRequest The repository request to copy from, must not be {@code null}. */ public DefaultRepositoryRequest( RepositoryRequest repositoryRequest ) diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java index 159d3e3f33..f56fb45949 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java @@ -47,7 +47,7 @@ /** * Warning: 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 LegacyLocalRepositoryManager diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java index 8f4744388b..8e45b20305 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java @@ -142,7 +142,7 @@ public String toString() { sb.append( " proxy: " ).append( proxy.getHost() ).append( ":" ).append( proxy.getPort() ).append( "\n" ); } - + if ( snapshots != null ) { sb.append( "snapshots: [enabled => " ).append( snapshots.isEnabled() ); diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java index 3afe33d359..bf79d69857 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java @@ -22,7 +22,7 @@ /** * Caches auxiliary data used during repository access like already processed metadata. The data in the cache is meant * for exclusive consumption by the repository system and is opaque to the cache implementation. - * + * * @author Benjamin Bentmann */ @Deprecated @@ -37,7 +37,7 @@ public interface RepositoryCache * Puts the specified data into the cache. Warning: The cache will directly save the provided * reference. If the cached data is mutable, i.e. could be modified after being put into the cache, the caller is * responsible for creating a copy of the original data and store the copy in the cache. - * + * * @param request The repository request from which this cache was retrieved, must not be {@code null}. * @param key The key to use associate the data with, must not be {@code null}. * @param data The data to store in the cache, may be {@code null}. @@ -48,7 +48,7 @@ public interface RepositoryCache * Gets the specified data from the cache. Warning: The cache will directly return the saved * reference. If the cached data is to be modified after its retrieval, the caller is responsible to create a copy * of the returned data and use this instead of the cache record. - * + * * @param request The repository request from which this cache was retrieved, must not be {@code null}. * @param key The key to use for lookup of the data, must not be {@code null}. * @return The requested data or {@code null} if none was present in the cache. diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java index 870e4f683a..55f60686ff 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java @@ -23,7 +23,7 @@ /** * Collects basic settings to access the repository system. - * + * * @author Benjamin Bentmann */ public interface RepositoryRequest @@ -31,14 +31,14 @@ public interface RepositoryRequest /** * Indicates whether network access to remote repositories has been disabled. - * + * * @return {@code true} if remote access has been disabled, {@code false} otherwise. */ boolean isOffline(); /** * Enables/disables network access to remote repositories. - * + * * @param offline {@code true} to disable remote access, {@code false} to allow network access. * @return This request, never {@code null}. */ @@ -47,7 +47,7 @@ public interface RepositoryRequest /** * Indicates whether remote repositories should be re-checked for updated artifacts/metadata regardless of their * configured update policy. - * + * * @return {@code true} if remote repositories should be re-checked for updated artifacts/metadata, {@code false} * otherwise. */ @@ -55,7 +55,7 @@ public interface RepositoryRequest /** * Enables/disabled forced checks for updated artifacts/metadata on remote repositories. - * + * * @param forceUpdate {@code true} to forcibly check the remote repositories for updated artifacts/metadata, {@code * false} to use the update policy configured on each repository. * @return This request, never {@code null}. @@ -64,14 +64,14 @@ public interface RepositoryRequest /** * Gets the local repository to use. - * + * * @return The local repository to use or {@code null} if not set. */ ArtifactRepository getLocalRepository(); /** * Sets the local repository to use. - * + * * @param localRepository The local repository to use. * @return This request, never {@code null}. */ @@ -79,14 +79,14 @@ public interface RepositoryRequest /** * Gets the remote repositories to use. - * + * * @return The remote repositories to use, never {@code null}. */ List getRemoteRepositories(); /** * Sets the remote repositories to use. - * + * * @param remoteRepositories The remote repositories to use. * @return This request, never {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java index 58e3c5acec..e1e5fe3f83 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java @@ -56,7 +56,7 @@ public String getRemoteFilename() } public String getLocalFilename( ArtifactRepository repository ) - { + { return "maven-metadata-" + repository.getKey() + ".xml"; } @@ -208,7 +208,7 @@ public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata AbstractRepositoryMetadata repoMetadata = (AbstractRepositoryMetadata) metadata; this.metadata.merge( repoMetadata.getMetadata() ); } - + public void merge( ArtifactMetadata metadata ) { // TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact replaces? diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java index f8c55acce6..6a1578d894 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java @@ -34,7 +34,7 @@ /** * Handles deserialization of metadata from some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ @Component( role = MetadataReader.class ) diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java index 8240cf5bae..e3e141b101 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java @@ -23,7 +23,7 @@ /** * Signals a failure to parse the metadata due to invalid syntax (e.g. non-wellformed XML or unknown elements). - * + * * @author Benjamin Bentmann */ public class MetadataParseException @@ -42,7 +42,7 @@ public class MetadataParseException /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -56,7 +56,7 @@ public MetadataParseException( String message, int lineNumber, int columnNumber /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -72,7 +72,7 @@ public MetadataParseException( String message, int lineNumber, int columnNumber, /** * Gets the one-based index of the line containing the error. - * + * * @return The one-based index of the line containing the error or a non-positive value if unknown. */ public int getLineNumber() @@ -82,7 +82,7 @@ public int getLineNumber() /** * Gets the one-based index of the column containing the error. - * + * * @return The one-based index of the column containing the error or non-positive value if unknown. */ public int getColumnNumber() diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java index 890b466211..050ec47891 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java @@ -61,9 +61,9 @@ public class ArtifactResolutionRequest // Needs to go away private List listeners = new ArrayList(); - // This is like a filter but overrides all transitive versions + // This is like a filter but overrides all transitive versions private Map managedVersionMap; - + private boolean resolveRoot = true; private boolean resolveTransitively = false; @@ -141,7 +141,7 @@ public ArtifactResolutionRequest setRemoteRepositories( List /** * Gets the artifact filter that controls traversal of the dependency graph. - * + * * @return The filter used to determine which of the artifacts in the dependency graph should be traversed or * {@code null} to collect all transitive dependencies. */ @@ -160,7 +160,7 @@ public ArtifactResolutionRequest setCollectionFilter( ArtifactFilter filter ) /** * Gets the artifact filter that controls downloading of artifact files. This filter operates on those artifacts * that have been included by the {@link #getCollectionFilter()}. - * + * * @return The filter used to determine which of the artifacts should have their files resolved or {@code null} to * resolve the files for all collected artifacts. */ @@ -182,12 +182,12 @@ public List getListeners() } public ArtifactResolutionRequest setListeners( List listeners ) - { + { this.listeners = listeners; - + return this; } - + public ArtifactResolutionRequest addListener( ResolutionListener listener ) { listeners.add( listener ); @@ -210,26 +210,26 @@ public ArtifactResolutionRequest setManagedVersionMap( Map man public ArtifactResolutionRequest setResolveRoot( boolean resolveRoot ) { this.resolveRoot = resolveRoot; - + return this; } - + public boolean isResolveRoot() { return resolveRoot; - } + } public ArtifactResolutionRequest setResolveTransitively( boolean resolveDependencies ) { this.resolveTransitively = resolveDependencies; - + return this; } - + public boolean isResolveTransitively() { return resolveTransitively; - } + } public String toString() { @@ -239,7 +239,7 @@ public String toString() .append( artifactDependencies ).append( "\n" ) .append( "localRepository: " ).append( localRepository ).append( "\n" ) .append( "remoteRepositories: " ).append( remoteRepositories ).append( "\n" ); - + return sb.toString(); } @@ -322,8 +322,8 @@ public List getProxies() // Used by Tycho and will break users and force them to upgrade to Maven 3.1 so we should really leave // this here, possibly indefinitely. // - public ArtifactResolutionRequest setCache( RepositoryCache cache ) - { - return this; - } + public ArtifactResolutionRequest setCache( RepositoryCache cache ) + { + return this; + } } diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java index d6f97d866a..5c6689dec9 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java @@ -35,7 +35,7 @@ public class AndArtifactFilter implements ArtifactFilter { - private Set filters; + private Set filters; public AndArtifactFilter() { @@ -46,7 +46,7 @@ public AndArtifactFilter( List filters ) { this.filters = new LinkedHashSet( filters ); } - + public boolean include( Artifact artifact ) { boolean include = true; @@ -86,14 +86,14 @@ public boolean equals( Object obj ) { return true; } - + if ( !( obj instanceof AndArtifactFilter ) ) { return false; } - + AndArtifactFilter other = (AndArtifactFilter) obj; - + return filters.equals( other.filters ); } } diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java index 1a6b8a82e4..fb0afcfb95 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java @@ -28,7 +28,7 @@ * scopes and their associated implied scopes, so that the user can filter apply a series of implication rules in a * single step. This should be a more efficient implementation of multiple standard {@link ScopeArtifactFilter} * instances ORed together. - * + * * @author Brett Porter * @author jdcasey */ @@ -40,7 +40,7 @@ public class CumulativeScopeArtifactFilter /** * Create a new filter with the specified scopes and their implied scopes enabled. - * + * * @param scopes The scopes to enable, along with all implied scopes, may be {@code null}. */ public CumulativeScopeArtifactFilter( Collection scopes ) @@ -52,7 +52,7 @@ public CumulativeScopeArtifactFilter( Collection scopes ) /** * Creates a new filter that combines the specified filters. - * + * * @param filters The filters to combine, may be {@code null}. */ public CumulativeScopeArtifactFilter( CumulativeScopeArtifactFilter... filters ) diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java index 45ce84585e..c3dc9812ff 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java @@ -73,14 +73,14 @@ public boolean equals( Object obj ) { return true; } - + if ( !( obj instanceof ExclusionSetFilter ) ) { return false; } - + ExclusionSetFilter other = (ExclusionSetFilter) obj; - + return excludes.equals( other.excludes ); } } diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java index aeeb3c7e06..403e12513d 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java @@ -68,19 +68,19 @@ public int hashCode() { int hash = 17; hash = hash * 31 + patterns.hashCode(); - + return hash; } @Override public boolean equals( Object obj ) { - if ( this == obj ) + if ( this == obj ) { return true; } - // make sure IncludesArtifactFilter is not equal ExcludesArtifactFilter! + // make sure IncludesArtifactFilter is not equal ExcludesArtifactFilter! if ( obj == null || getClass() != obj.getClass() ) { return false; diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 80aee224d6..839c089190 100644 --- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -79,7 +79,7 @@ public class MavenRepositorySystem @Requirement private ArtifactHandlerManager artifactHandlerManager; - + @Requirement private ArtifactResolver artifactResolver; @@ -91,7 +91,7 @@ public class MavenRepositorySystem @Requirement private SettingsDecrypter settingsDecrypter; - + // DefaultProjectBuilder public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type ) { @@ -600,7 +600,7 @@ public static ArtifactRepository createArtifactRepository( String id, String url return repository; } - + // ArtifactFactory private Artifact XcreateArtifact( String groupId, String artifactId, String version, String scope, String type ) { @@ -694,5 +694,5 @@ else if ( Artifact.SCOPE_COMPILE.equals( scope ) && Artifact.SCOPE_COMPILE.equal return new DefaultArtifact( groupId, artifactId, versionRange, desiredScope, type, classifier, handler, optional ); - } + } } diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java index 742b80fc8f..f658eb4359 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java @@ -23,7 +23,7 @@ /** * Describes a constituent of a class realm. - * + * * @author Benjamin Bentmann */ public interface ClassRealmConstituent @@ -31,42 +31,42 @@ public interface ClassRealmConstituent /** * Gets the group id of the constituent's artifact. - * + * * @return The group id, never {@code null}. */ String getGroupId(); /** * Gets the artifact id of the constituent's artifact. - * + * * @return The artifact id, never {@code null}. */ String getArtifactId(); /** * Gets the type of the constituent's artifact. - * + * * @return The type, never {@code null}. */ String getType(); /** * Gets the classifier of the constituent's artifact. - * + * * @return The classifier or an empty string, never {@code null}. */ String getClassifier(); /** * Gets the version of the constituent's artifact. - * + * * @return The version, never {@code null}. */ String getVersion(); /** * Gets the file of the constituent's artifact. - * + * * @return The file, never {@code null}. */ File getFile(); diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java index 9391f6ac01..e5d15143ed 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java @@ -31,7 +31,7 @@ * Manages the class realms used by Maven. Warning: This is an internal utility interface that is only * public for technical reasons, it is not part of the public API. In particular, this interface can be changed or * deleted without prior notice. - * + * * @author Benjamin Bentmann */ public interface ClassRealmManager @@ -39,21 +39,21 @@ public interface ClassRealmManager /** * Gets the class realm hosting the Maven core. - * + * * @return The class realm hosting the Maven core, never {@code null}. */ ClassRealm getCoreRealm(); /** * Gets the class realm exposing the Maven API. This is basically a restricted view on the Maven core realm. - * + * * @return The class realm exposing the Maven API, never {@code null}. */ ClassRealm getMavenApiRealm(); /** * Creates a new class realm for the specified project and its build extensions. - * + * * @param model The model of the project for which to create a realm, must not be {@code null}. * @param artifacts The artifacts to add to the class realm, may be {@code null}. Unresolved artifacts (i.e. with a * missing file) will automatically be excluded from the realm. @@ -63,7 +63,7 @@ public interface ClassRealmManager /** * Creates a new class realm for the specified build extension. - * + * * @param extension The extension plugin for which to create a realm, must not be {@code null}. * @param artifacts The artifacts to add to the class realm, may be {@code null}. Unresolved artifacts (i.e. with a * missing file) will automatically be excluded from the realm. @@ -73,7 +73,7 @@ public interface ClassRealmManager /** * Creates a new class realm for the specified plugin. - * + * * @param plugin The plugin for which to create a realm, must not be {@code null}. * @param parent The parent realm for the new realm, may be {@code null}. * @param parentImports The packages/types to import from the parent realm, may be {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java index d882c99ede..b0229b9793 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java @@ -25,7 +25,7 @@ /** * ClassRealmManagerDelegate is used to perform addition configuration of * class realms created by ClassRealmManager. - * + * * @author igor */ public interface ClassRealmManagerDelegate diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java index 24f3819e69..9b62108fc1 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java @@ -24,7 +24,7 @@ /** * Describes the requirements for a new class realm. - * + * * @author Benjamin Bentmann */ public interface ClassRealmRequest @@ -58,14 +58,14 @@ enum RealmType /** * Gets the type of the class realm. - * + * * @return The type of the class realm, never {@code null}. */ RealmType getType(); /** * Gets the parent class realm (if any). - * + * * @return The parent class realm or {@code null} if using the default parent. */ ClassLoader getParent(); @@ -78,21 +78,21 @@ enum RealmType /** * Gets the packages/types to import from the parent realm. - * + * * @return The modifiable list of packages/types to import from the parent realm, never {@code null}. */ List getParentImports(); /** * Gets the packages/types to import from foreign realms. - * + * * @return The modifiable map of packages/types to import from foreign realms, never {@code null}. */ Map getForeignImports(); /** * Gets the constituents for the class realm. - * + * * @return The modifiable list of constituents for the class realm, never {@code null}. */ List getConstituents(); diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index b718ef1d03..3584d53416 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -51,7 +51,7 @@ * Manages the class realms used by Maven. Warning: 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 */ @Component( role = ClassRealmManager.class ) @@ -227,7 +227,7 @@ private void importMavenApi( Map imports ) /** * Creates a new class realm with the specified parent and imports. - * + * * @param baseRealmId The base id to use for the new realm, must not be {@code null}. * @param type The type of the class realm, must not be {@code null}. * @param parent The parent realm for the new realm, may be {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java b/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java index b72346445d..9859f586ad 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java @@ -23,7 +23,7 @@ /** * A path translator that resolves relative paths against a specific base directory. - * + * * @author Benjamin Bentmann */ public class BasedirBeanConfigurationPathTranslator @@ -34,7 +34,7 @@ public class BasedirBeanConfigurationPathTranslator /** * Creates a new path translator using the specified base directory. - * + * * @param basedir The base directory to resolve relative paths against, may be {@code null} to disable path * translation. */ diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java index 1d8c57f1c6..3d10ed4a52 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java @@ -21,7 +21,7 @@ /** * Thrown when a bean couldn't be configured. - * + * * @author Benjamin Bentmann */ public class BeanConfigurationException diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java index bfa53c7152..396633916e 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java @@ -24,7 +24,7 @@ /** * Postprocesses filesystem paths. For instance, a path translator might want to resolve relative paths given in the * bean configuration against some base directory. - * + * * @author Benjamin Bentmann */ public interface BeanConfigurationPathTranslator @@ -32,7 +32,7 @@ public interface BeanConfigurationPathTranslator /** * Translates the specified path. - * + * * @param path The path to translate, may be {@code null}. * @return The translated path or {@code null} if none. */ diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java index 6f3f2fe520..d19aa2044e 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java @@ -21,7 +21,7 @@ /** * A request to configure a bean from some configuration in the POM or similar. - * + * * @author Benjamin Bentmann */ public interface BeanConfigurationRequest @@ -29,14 +29,14 @@ public interface BeanConfigurationRequest /** * Gets the bean to configure. Eventually, a valid request must have a bean set. - * + * * @return The bean to configure, or {@code null} if none. */ Object getBean(); /** * Sets the bean to configure. Eventually, a valid request must have a bean set. - * + * * @param bean The bean to configure, may be {@code null}. * @return This request for chaining, never {@code null}. */ @@ -44,7 +44,7 @@ public interface BeanConfigurationRequest /** * Gets the configuration to unmarshal into the bean. - * + * * @return The configuration to unmarshal into the bean or {@code null} if none. */ Object getConfiguration(); @@ -53,7 +53,7 @@ public interface BeanConfigurationRequest * Sets the configuration to unmarshal into the bean. The configuration should be taken from * {@link org.apache.maven.model.ConfigurationContainer#getConfiguration()} or a similar source. * Fully equivalent to {@code setConfiguration(configuration, null)}. - * + * * @param configuration The configuration to unmarshal, may be {@code null}. * @return This request for chaining, never {@code null}. */ @@ -62,9 +62,9 @@ public interface BeanConfigurationRequest /** * Sets the configuration to unmarshal into the bean. The configuration should be taken from * {@link org.apache.maven.model.ConfigurationContainer#getConfiguration()} or a similar source. - * If {@code element} is not {@code null}, child configuration element with the specified name will + * If {@code element} is not {@code null}, child configuration element with the specified name will * be unmarshaled. - * + * * @param configuration The configuration to unmarshal, may be {@code null}. * @param element Configuration element name to unmarshal or {@code null} to unmarshal entire configuration. * @return This request for chaining, never {@code null}. @@ -72,10 +72,10 @@ public interface BeanConfigurationRequest BeanConfigurationRequest setConfiguration( Object configuration, String element ); /** - * Returns configuration element name or {@code null}. - * + * Returns configuration element name or {@code null}. + * * @see #setConfiguration(Object, String) - * + * * @return Configuration element name or {@code null} */ String getConfigurationElement(); @@ -83,7 +83,7 @@ public interface BeanConfigurationRequest /** * Gets the class loader from which to load any types referenced by the configuration. If unset, the class loader of * the bean class will be used. - * + * * @return The class loader to load referenced types from or {@code null} if unset. */ ClassLoader getClassLoader(); @@ -91,7 +91,7 @@ public interface BeanConfigurationRequest /** * Sets the class loader from which to load any types referenced by the configuration. If unset, the class loader of * the bean class will be used. - * + * * @param classLoader The class loader to load referenced types from, may be {@code null}. * @return This request for chaining, never {@code null}. */ @@ -99,14 +99,14 @@ public interface BeanConfigurationRequest /** * Gets the optional preprocessor for configuration values. - * + * * @return The preprocessor for configuration values or {@code null} if none. */ BeanConfigurationValuePreprocessor getValuePreprocessor(); /** * Sets the optional preprocessor for configuration values. - * + * * @param valuePreprocessor The preprocessor for configuration values, may be {@code null} if unneeded. * @return This request for chaining, never {@code null}. */ @@ -114,14 +114,14 @@ public interface BeanConfigurationRequest /** * Gets the optional path translator for configuration values unmarshalled to files. - * + * * @return The path translator for files or {@code null} if none. */ BeanConfigurationPathTranslator getPathTranslator(); /** * Sets the optional path translator for configuration values unmarshalled to files. - * + * * @param pathTranslator The path translator for files, may be {@code null} if unneeded. * @return This request for chaining, never {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java index e00194e66c..63f8517399 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java @@ -22,7 +22,7 @@ /** * Preprocesses a value from a bean configuration before the bean configurator unmarshals it into a bean property. A * common use case for such preprocessing is the evaluation of variables within the configuration value. - * + * * @author Benjamin Bentmann */ public interface BeanConfigurationValuePreprocessor @@ -33,7 +33,7 @@ public interface BeanConfigurationValuePreprocessor * requirement) for the preprocessor to resolve the value to a compatible value or a (string) value than can be * unmarshalled into that type. The preprocessor is not required to perform any type conversion but should rather * filter out incompatible values from its result. - * + * * @param value The configuration value to preprocess, must not be {@code null}. * @param type The target type of the value, may be {@code null}. * @return The processed configuration value or {@code null} if none. diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java index 74993be701..36d23ecac9 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java @@ -24,7 +24,7 @@ * similar to the way Maven configures plugins from the POM, i.e. some configuration like {@code value} * is mapped to an equally named property of the bean and converted. The properties of the bean are supposed to either * have a public setter or be backed by an equally named field (of any visibility). - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -33,7 +33,7 @@ public interface BeanConfigurator /** * Performs the specified bean configuration. - * + * * @param request The configuration request that specifies the bean and the configuration to process, must not be * {@code null}. * @throws BeanConfigurationException If the bean configuration could not be successfully processed. diff --git a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java index ab46c18a8c..32def48f35 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java @@ -28,7 +28,7 @@ /** * A basic bean configuration request. - * + * * @author Benjamin Bentmann */ public class DefaultBeanConfigurationRequest @@ -83,7 +83,7 @@ public DefaultBeanConfigurationRequest setConfiguration( Object configuration, S /** * Sets the configuration to the configuration taken from the specified build plugin in the POM. First, the build * plugins will be searched for the specified plugin, if that fails, the plugin management section will be searched. - * + * * @param model The POM to extract the plugin configuration from, may be {@code null}. * @param pluginGroupId The group id of the plugin whose configuration should be used, must not be {@code null} or * empty. diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java index 32b8ae4e20..3d3def621c 100644 --- a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java +++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java @@ -40,7 +40,7 @@ /** * Warning: This is an internal 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 */ @Component( role = BeanConfigurator.class ) diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java index a183b82f3f..4284fce9be 100644 --- a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java +++ b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java @@ -37,7 +37,7 @@ interface Context /** * Gets key-value pairs providing information about the Maven runtime. - * + * * @return The key-value pairs, never {@code null}. */ Map getData(); @@ -46,7 +46,7 @@ interface Context /** * Initializes the spy. - * + * * @param context The event spy context, never {@code null}. */ void init( Context context ) @@ -54,7 +54,7 @@ void init( Context context ) /** * Notifies the spy of some build event/operation. - * + * * @param event The event, never {@code null}. * @see org.apache.maven.settings.building.SettingsBuildingRequest * @see org.apache.maven.settings.building.SettingsBuildingResult diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java index 945edf6358..47865f679b 100644 --- a/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java +++ b/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java @@ -24,7 +24,7 @@ * * @since 3.0-alpha-3 */ -public interface ExceptionHandler +public interface ExceptionHandler { ExceptionSummary handleException( Throwable e ); } diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java b/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java index 82da4dc0e6..bf8f62baff 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java +++ b/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java @@ -23,7 +23,7 @@ /** * Summarizes the result of a failed project build in the reactor. - * + * * @author Benjamin Bentmann */ public class BuildFailure @@ -37,7 +37,7 @@ public class BuildFailure /** * Creates a new build summary for the specified project. - * + * * @param project The project being summarized, must not be {@code null}. * @param time The build time of the project in milliseconds. * @param cause The cause of the build failure, may be {@code null}. @@ -50,7 +50,7 @@ public BuildFailure( MavenProject project, long time, Throwable cause ) /** * Gets the cause of the build failure. - * + * * @return The cause of the build failure or {@code null} if unknown. */ public Throwable getCause() diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java b/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java index 6d9d7d7652..3d0e8bd7b2 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java +++ b/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java @@ -23,7 +23,7 @@ /** * Summarizes the result of a successful project build in the reactor. - * + * * @author Benjamin Bentmann */ public class BuildSuccess @@ -32,7 +32,7 @@ public class BuildSuccess /** * Creates a new build summary for the specified project. - * + * * @param project The project being summarized, must not be {@code null}. * @param time The build time of the project in milliseconds. */ diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java b/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java index 93754d8478..ec23f72130 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java +++ b/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java @@ -23,7 +23,7 @@ /** * Summarizes the result of a project build in the reactor. - * + * * @author Benjamin Bentmann */ public abstract class BuildSummary @@ -41,7 +41,7 @@ public abstract class BuildSummary /** * Creates a new build summary for the specified project. - * + * * @param project The project being summarized, must not be {@code null}. * @param time The build time of the project in milliseconds. */ @@ -57,7 +57,7 @@ protected BuildSummary( MavenProject project, long time ) /** * Gets the project being summarized. - * + * * @return The project being summarized, never {@code null}. */ public MavenProject getProject() @@ -67,7 +67,7 @@ public MavenProject getProject() /** * Gets the build time of the project in milliseconds. - * + * * @return The build time of the project in milliseconds. */ public long getTime() diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java index 11329d0f51..df91f828a4 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java @@ -140,7 +140,7 @@ public class DefaultMavenExecutionRequest /** * Suppress SNAPSHOT updates. - * + * * @issue MNG-2681 */ private boolean noSnapshotUpdates; diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java index df3ee69398..de5fa69589 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java @@ -132,8 +132,8 @@ public MavenExecutionRequest populateFromSettings( MavenExecutionRequest request } return request; - } - + } + private void populateDefaultPluginGroups( MavenExecutionRequest request ) { request.addPluginGroup( "org.apache.maven.plugins" ); diff --git a/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java index 80ec2194e0..0ee7f57ad7 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java @@ -24,7 +24,7 @@ /** * Holds data relevant for an execution event. - * + * * @author Benjamin Bentmann */ public interface ExecutionEvent @@ -56,35 +56,35 @@ enum Type /** * Gets the type of the event. - * + * * @return The type of the event, never {@code null}. */ Type getType(); /** * Gets the session from which this event originates. - * + * * @return The current session, never {@code null}. */ MavenSession getSession(); /** * Gets the current project (if any). - * + * * @return The current project or {@code null} if not applicable. */ MavenProject getProject(); /** * Gets the current mojo execution (if any). - * + * * @return The current mojo execution or {@code null} if not applicable. */ MojoExecution getMojoExecution(); /** * Gets the exception that caused the event (if any). - * + * * @return The exception or {@code null} if none. */ Exception getException(); diff --git a/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java index 91fa945938..ad3f345a27 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java @@ -23,7 +23,7 @@ * Defines events that Maven fires during a build. Warning: This interface might be extended in future * Maven versions to support further events. Hence it is strongly recommended to derive custom listeners from * {@link AbstractExecutionListener} in order to avoid interoperability problems. - * + * * @author Benjamin Bentmann */ public interface ExecutionListener diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java index dfa20c429c..3c99d31083 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java @@ -109,7 +109,7 @@ public interface MavenExecutionRequest /** * Sets the system properties to use for interpolation and profile activation. The system properties are collected * from the runtime environment like {@link System#getProperties()} and environment variables. - * + * * @param systemProperties The system properties, may be {@code null}. * @return This request, never {@code null}. */ @@ -118,7 +118,7 @@ public interface MavenExecutionRequest /** * Gets the system properties to use for interpolation and profile activation. The system properties are collected * from the runtime environment like {@link System#getProperties()} and environment variables. - * + * * @return The system properties, never {@code null}. */ Properties getSystemProperties(); @@ -127,7 +127,7 @@ public interface MavenExecutionRequest * Sets the user properties to use for interpolation and profile activation. The user properties have been * configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command * line. - * + * * @param userProperties The user properties, may be {@code null}. * @return This request, never {@code null}. */ @@ -137,7 +137,7 @@ public interface MavenExecutionRequest * Gets the user properties to use for interpolation and profile activation. The user properties have been * configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command * line. - * + * * @return The user properties, never {@code null}. */ Properties getUserProperties(); @@ -174,7 +174,7 @@ public interface MavenExecutionRequest /** * Set's the parallel degree of concurrency used by the build. - * + * * @param degreeOfConcurrency */ void setDegreeOfConcurrency( int degreeOfConcurrency ); @@ -324,7 +324,7 @@ public interface MavenExecutionRequest * Set a new list of remote repositories to use the execution request. This is necessary if you perform * transformations on the remote repositories being used. For example if you replace existing repositories with * mirrors then it's easier to just replace the whole list with a new list of transformed repositories. - * + * * @param repositories * @return This request, never {@code null}. */ @@ -366,14 +366,14 @@ public interface MavenExecutionRequest /** * Controls the {@link Builder} used by Maven by specification of the builder's id. - * + * * @since 3.2.0 */ MavenExecutionRequest setBuilderId( String builderId ); /** * Controls the {@link Builder} used by Maven by specification of the builders id. - * + * * @since 3.2.0 */ String getBuilderId(); diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java index 3d0001262b..7c20cb8389 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java @@ -23,7 +23,7 @@ /** * Assists in populating an execution request for invocation of Maven. - * + * * @author Benjamin Bentmann */ public interface MavenExecutionRequestPopulator @@ -33,7 +33,7 @@ public interface MavenExecutionRequestPopulator * Copies the values from the given settings into the specified execution request. This method will replace any * existing values in the execution request that are controlled by the settings. Hence, it is expected that this * method is called on a new/empty execution request before the caller mutates it to fit its needs. - * + * * @param request The execution request to populate, must not be {@code null}. * @param settings The settings to copy into the execution request, may be {@code null}. * @return The populated execution request, never {@code null}. @@ -44,7 +44,7 @@ MavenExecutionRequest populateFromSettings( MavenExecutionRequest request, Setti /** * Injects default values like plugin groups or repositories into the specified execution request. - * + * * @param request The execution request to populate, must not be {@code null}. * @return The populated execution request, never {@code null}. * @throws MavenExecutionRequestPopulationException If the execution request could not be populated. diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java index 8adc7ac2d7..cb95fb1fa7 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java @@ -33,7 +33,7 @@ public interface MavenExecutionResult MavenProject getProject(); MavenExecutionResult setTopologicallySortedProjects( List projects ); - + /** * @return the sorted list, or an empty list if there are no projects. */ diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index bd60d5edb2..972ebd676f 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -401,13 +401,13 @@ public RepositoryCache getRepositoryCache() } private Map projectMap; - + public void setProjectMap( Map projectMap ) { this.projectMap = projectMap; } - - public Map getProjectMap() + + public Map getProjectMap() { return projectMap; } @@ -423,6 +423,6 @@ public void setAllProjects( List allProjects ) { this.allProjects = allProjects; } - - + + } diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java index 2494dead86..a8d293d1f2 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java @@ -26,7 +26,7 @@ /** * Encapsulates parameters of MojoExecutionListener callback methods and is meant to provide API evolution path should * it become necessary to introduce new parameters in the existing callbacks in the future. - * + * * @see MojoExecutionListener * @see org.apache.maven.execution.scope.WeakMojoExecutionListener * @since 3.1.2 diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java index 921acc6553..c2fb7a18b3 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java @@ -23,7 +23,7 @@ /** * Extension point that allows build extensions observe and possibly veto mojo executions. - * + * * @see org.apache.maven.execution.scope.WeakMojoExecutionListener * @since 3.1.2 * @provisional This interface is part of work in progress and can be changed or removed without notice. diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java index bbc1091f3a..1db277db53 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java @@ -25,7 +25,7 @@ /** * Describes the inter-dependencies between projects in the reactor. - * + * * @author Benjamin Bentmann */ public interface ProjectDependencyGraph @@ -34,7 +34,7 @@ public interface ProjectDependencyGraph /** * Gets all projects in their intended build order, i.e. after topologically sorting the projects according to their * inter-dependencies. - * + * * @return The projects in the build order, never {@code null}. */ List getSortedProjects(); @@ -42,7 +42,7 @@ public interface ProjectDependencyGraph /** * Gets the downstream projects of the specified project. A downstream project is a project that directly or * indirectly depends on the given project. - * + * * @param project The project whose downstream projects should be retrieved, must not be {@code null}. * @param transitive A flag whether to retrieve all direct and indirect downstream projects or just the immediate * downstream projects. @@ -53,7 +53,7 @@ public interface ProjectDependencyGraph /** * Gets the upstream projects of the specified project. An upstream project is a project that directly or indirectly * is a prerequisite of the given project. - * + * * @param project The project whose upstream projects should be retrieved, must not be {@code null}. * @param transitive A flag whether to retrieve all direct and indirect upstream projects or just the immediate * upstream projects. diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java index 78655f730f..fb71078f39 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java @@ -27,7 +27,7 @@ /** * Encapsulates parameters of ProjectExecutionListener callback methods and is meant to provide API evolution path * should it become necessary to introduce new parameters in the existing callbacks in the future. - * + * * @see ProjectExecutionListener * @since 3.1.2 * @provisional This class is part of work in progress and can be changed or removed without notice. diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java index 24c49b902f..d7e891838d 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java @@ -23,7 +23,7 @@ /** * Extension point that allows build extensions observe and possibly veto project build execution. - * + * * @see ExecutionListener * @see MojoExecutionListener * @since 3.1.2 diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java b/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java index c53297cb88..0dcbd16fd8 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java +++ b/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java @@ -30,7 +30,7 @@ /** * Indicates that annotated component should be instantiated before mojo execution starts and discarded after mojo * execution completes. - * + * * @author igor * @since 3.1.2 */ diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java index 89242c0789..94e7c10458 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java @@ -27,7 +27,7 @@ *

* Unlike {@link MojoExecutionListener}, this extension point does not trigger instantiation of the component, hence * "weak" class name prefix. Only applies to mojo execution scoped components. - * + * * @see org.apache.maven.execution.MojoExecutionListener * @since 3.1.2 * @provisional This interface is part of work in progress and can be changed or removed without notice. diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java index 3705d1275e..349576cdc9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java @@ -29,7 +29,7 @@ public class LifecycleExecutionException extends Exception { private MavenProject project; - + public LifecycleExecutionException( String message ) { super( message ); @@ -44,7 +44,7 @@ public LifecycleExecutionException( String message, Throwable cause ) { super( message, cause ); } - + public LifecycleExecutionException( String message, MavenProject project ) { super( message ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java index c246001071..f070198712 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java @@ -38,7 +38,7 @@ *

* Implementations of this interface must be annotated with either {@code @Named("lifecycle-id")} or equivalent plexus * {@code @Component} annotations. - * + * * @since 3.2.0 * @see org.apache.maven.lifecycle.internal.DefaultLifecycleMappingDelegate * @author ifedorenko diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java index d79eaa13d0..e9ff0c2080 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java @@ -21,7 +21,7 @@ /** * Signals a failure to locate a lifecycle. - * + * * @author Benjamin Bentmann */ public class LifecycleNotFoundException @@ -32,7 +32,7 @@ public class LifecycleNotFoundException /** * Creates a new exception to indicate that the specified lifecycle is unknown. - * + * * @param lifecycleId The identifier of the lifecycle that could not be located, may be {@code null}. */ public LifecycleNotFoundException( String lifecycleId ) @@ -43,7 +43,7 @@ public LifecycleNotFoundException( String lifecycleId ) /** * Gets the identifier of the lifecycle that was not found. - * + * * @return The identifier of the lifecycle that was not found, never {@code null}. */ public String getLifecycleId() diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java index 86b37db3ba..fab1d2f2c5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java @@ -21,7 +21,7 @@ /** * Signals a failure to locate the lifecycle for some phase. - * + * * @author Benjamin Bentmann */ public class LifecyclePhaseNotFoundException @@ -32,7 +32,7 @@ public class LifecyclePhaseNotFoundException /** * Creates a new exception to indicate that the specified lifecycle phase is not defined by any known lifecycle. - * + * * @param message The detail message, may be {@code null}. * @param lifecyclePhase The name of the lifecycle phase that could not be located, may be {@code null}. */ @@ -44,7 +44,7 @@ public LifecyclePhaseNotFoundException( String message, String lifecyclePhase ) /** * Gets the lifecycle phase that was not found. - * + * * @return The lifecycle phase that was not found, never {@code null}. */ public String getLifecyclePhase() diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java index 991914557e..571e1d2bc6 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java @@ -21,7 +21,7 @@ /** * Signals a failure to execute a lifecycle phase or mojo because a project is required but not present. - * + * * @author Benjamin Bentmann */ public class MissingProjectException @@ -30,7 +30,7 @@ public class MissingProjectException /** * Creates a new exception. - * + * * @param message The detail message, may be {@code null}. */ public MissingProjectException( String message ) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java index 63ba2caaa6..2ac9638a65 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java @@ -21,7 +21,7 @@ /** * Signals a failure to build because no goal was specified. - * + * * @author Benjamin Bentmann */ public class NoGoalSpecifiedException @@ -30,7 +30,7 @@ public class NoGoalSpecifiedException /** * Creates a new exception. - * + * * @param message The detail message, may be {@code null}. */ public NoGoalSpecifiedException( String message ) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java index b5a4ad3f44..9434a65933 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java @@ -26,7 +26,7 @@ /** * Holds data relevant for an execution event. - * + * * @author Benjamin Bentmann */ class DefaultExecutionEvent diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java index 074aba77d5..bfb98d4300 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java @@ -29,7 +29,7 @@ * Assists in firing execution events. Warning: 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 */ @Component( role = ExecutionEventCatapult.class ) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java index 5602a09bd3..c187c1d117 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java @@ -170,7 +170,7 @@ public void setupMojoExecution( MavenSession session, MavenProject project, Mojo calculateForkedExecutions( mojoExecution, session, project, new HashSet() ); } - + public List calculateMojoExecutions( MavenSession session, MavenProject project, List tasks ) throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java index 575292b2da..28377f1db7 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java @@ -41,7 +41,7 @@ /** * Calculates the task segments in the build - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java index bed9a73b43..18fae7a951 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java @@ -28,7 +28,7 @@ /** * Context of dependency artifacts for a particular project. - * + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (class extract only) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java index c395868ffe..acff5661f8 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java @@ -27,7 +27,7 @@ * Assists in firing execution events. Warning: This is an internal utility interface that is only * public for technical reasons, it is not part of the public API. In particular, this interface can be changed or * deleted without prior notice. - * + * * @author Benjamin Bentmann */ public interface ExecutionEventCatapult diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java index 6ecc3e33b9..cceffdf8ee 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java @@ -32,7 +32,7 @@ * Wraps individual MojoExecutions, containing information about completion status and scheduling. *

* NOTE: This class is not part of any public api and can be changed or deleted without prior notice. - * + * * @since 3.0 * @author Kristian Rosenvold */ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java index ab39971b30..5c43dbd4c3 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java @@ -23,7 +23,7 @@ * A task that is a goal *

* TODO: From a concurrecy perspective, this class is not good. The combination of mutable/immutable state is not nice - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java index c9a19478d9..2edbe754cd 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java @@ -37,7 +37,7 @@ /** * Logs debug output from the various lifecycle phases. - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java index a76461d523..c95da2a444 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java @@ -52,7 +52,7 @@ /** * Resolves dependencies for the artifacts in context of the lifecycle build - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java index 5d72ca3eba..df7f67458f 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java @@ -38,7 +38,7 @@ /** * Builds one or more lifecycles for a full module - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl @@ -88,7 +88,7 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto long buildStartTime = System.currentTimeMillis(); // session may be different from rootSession seeded in DefaultMaven - // explicitly seed the right session here to make sure it is used by Guice + // explicitly seed the right session here to make sure it is used by Guice sessionScope.enter(); sessionScope.seed( MavenSession.class, session ); try diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java index 3b06c7207c..cc00ff901e 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java @@ -36,7 +36,7 @@ /** * Starts the build life cycle - * + * * @author Jason van Zyl * @author Benjamin Bentmann * @author Kristian Rosenvold diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java index 54de06189a..0b5fff3422 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java @@ -23,7 +23,7 @@ * A task that is a lifecycle *

* NOTE: This class is not part of any public api and can be changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java index 6fe7e585e3..a721355b04 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java @@ -34,7 +34,7 @@ /** * Calculates the task segments in the build - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java index 4347b3ce4e..da04b2336f 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java @@ -51,7 +51,7 @@ /** * Resolves dependencies for the artifacts in context of the lifecycle build - * + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java index 2e71199cee..fedb462843 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java @@ -51,7 +51,7 @@ /** * Executes an individual mojo - * + * * @since 3.0 * @author Jason van Zyl * @author Benjamin Bentmann diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java index ee335db4ad..6c8fd50a05 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java @@ -35,7 +35,7 @@ /** * A list of project segments, ordered so that all ProjectSegments from first TaskSegment come before any * subsequent TaskSegments. - * + * * @since 3.0 * @author Kristian Rosenvold *

diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java index 3f78baff9a..b1b1d18636 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java @@ -28,7 +28,7 @@ /** * Provides the positional index of the project - * + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (extracted class only) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java index e7104b175c..5ef7745462 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java @@ -43,7 +43,7 @@ *

* Additionally this class contains a clone of the MavenSession, which is *only* needed * because it has as notion of a "current" project. - * + * * @since 3.0 * @author Jason van Zyl * @author Benjamin Bentmann diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java index eff4e92f4f..2e2c3fd449 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java @@ -29,7 +29,7 @@ /** * Contains status information that is global to an entire reactor build. - * + * * @since 3.0 * @author Kristian Rosenvold */ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java index 5bba9a6c63..a6adc95896 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java @@ -23,7 +23,7 @@ /** * Context that is fixed for the entire reactor build. - * + * * @since 3.0 * @author Jason van Zyl * @author Kristian Rosenvold diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java index 39487a308f..9551887cd6 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java @@ -25,7 +25,7 @@ /** * Describes the required task segment as provided on the maven command line; i.e. "clean jetty:run install" - * + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (extracted class only) diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java index 6d5a6abaf4..84f94310e7 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java @@ -29,21 +29,21 @@ import org.apache.maven.lifecycle.internal.TaskSegment; /** - * + * * A {@link Builder} encapsulates a strategy for building a set of Maven projects. The default strategy in Maven builds the * the projects serially, but a {@link Builder} can employ any type of concurrency model to build the projects. - * + * * @author jvanzyl - * @provisional + * @provisional * */ public interface Builder { // - // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is the + // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is the // the place to store reactor related information. // void build( MavenSession session, ReactorContext reactorContext, ProjectBuildList projectBuilds, List taskSegments, ReactorBuildStatus reactorBuildStatus ) throws ExecutionException, InterruptedException; -} +} diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java index 53be344442..de6a5a3103 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java @@ -31,7 +31,7 @@ /** * Presents a view of the Dependency Graph that is suited for concurrent building. - * + * * @since 3.0 * @author Kristian Rosenvold *

@@ -59,7 +59,7 @@ public int getNumberOfBuilds() /** * Gets all the builds that have no reactor-dependencies - * + * * @return A list of all the initial builds */ @@ -78,7 +78,7 @@ public List getRootSchedulableBuilds() /** * Marks the provided project as finished. Returns a list of - * + * * @param mavenProject The project * @return The list of builds that are eligible for starting now that the provided project is done */ @@ -129,7 +129,7 @@ protected ProjectBuildList getProjectBuilds() /** * For the given {@link MavenProject} {@code p}, return all of {@code p}'s dependencies. - * + * * @param p * @return List of prerequisite projects */ @@ -140,7 +140,7 @@ protected List getDependencies( MavenProject p ) /** * For the given {@link MavenProject} {@code p} return {@code p}'s uncompleted dependencies. - * + * * @param p * @return List of uncompleted prerequisite projects */ diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java index 15499efae7..88fa81b1fa 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java @@ -45,7 +45,7 @@ /** * Builds the full lifecycle in weave-mode (phase by phase as opposed to project-by-project) - * + * * @since 3.0 * @author Kristian Rosenvold * Builds one or more lifecycles for a full module @@ -79,7 +79,7 @@ public void build( MavenSession session, ReactorContext reactorContext, ProjectB CompletionService service = new ExecutorCompletionService( executor ); ConcurrencyDependencyGraph analyzer = new ConcurrencyDependencyGraph( projectBuilds, session.getProjectDependencyGraph() ); - + // Currently disabled ThreadOutputMuxer muxer = null; // new ThreadOutputMuxer( analyzer.getProjectBuilds(), System.out ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java index 20c61eb8db..e656cc9fdc 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java @@ -23,7 +23,7 @@ import java.util.Map; public interface LifecycleMapping -{ +{ @Deprecated String ROLE = LifecycleMapping.class.getName(); diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java index f120b499d7..1702aa1ee0 100644 --- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java +++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java @@ -44,7 +44,7 @@ /** * Handles injection of plugin executions induced by the lifecycle bindings for a packaging. - * + * * @author Benjamin Bentmann */ @Component( role = LifecycleBindingsInjector.class ) diff --git a/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java b/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java index 8ea89e44e1..3e726746ad 100644 --- a/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java +++ b/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java @@ -27,9 +27,9 @@ public interface EventMonitor { void startEvent( String eventName, String target, long timestamp ); - + void endEvent( String eventName, String target, long timestamp ); - - void errorEvent( String eventName, String target, long timestamp, Throwable cause ); + + void errorEvent( String eventName, String target, long timestamp, Throwable cause ); } \ No newline at end of file diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java index cbe1cb01d4..a73e1efecd 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java @@ -137,7 +137,7 @@ public static boolean pluginEquals( Plugin a, Plugin b ) { return eq( a.getArtifactId(), b.getArtifactId() ) // && eq( a.getGroupId(), b.getGroupId() ) // - && eq( a.getVersion(), b.getVersion() ) // + && eq( a.getVersion(), b.getVersion() ) // && a.isExtensions() == b.isExtensions() // && dependenciesEquals( a.getDependencies(), b.getDependencies() ); } @@ -159,7 +159,7 @@ private static boolean dependenciesEquals( List a, List boolean r = eq( aD.getGroupId(), bD.getGroupId() ) // && eq( aD.getArtifactId(), bD.getArtifactId() ) // - && eq( aD.getVersion(), bD.getVersion() ) // + && eq( aD.getVersion(), bD.getVersion() ) // && eq( aD.getType(), bD.getType() ) // && eq( aD.getClassifier(), bD.getClassifier() ) // && eq( aD.getScope(), bD.getScope() ); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java b/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java index 537307c473..f77461fe37 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java @@ -34,7 +34,7 @@ public class CycleDetectedInPluginGraphException public CycleDetectedInPluginGraphException( Plugin plugin, CycleDetectedInComponentGraphException e ) { - super( "A cycle was detected in the component graph of the plugin: " + plugin.getArtifactId() ); + super( "A cycle was detected in the component graph of the plugin: " + plugin.getArtifactId() ); this.plugin = plugin; } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java index 5fd16f696e..57084ceb08 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java @@ -58,7 +58,7 @@ public void notifyFieldChangeUsingReflection( String fieldName, Object value, Ob /** * Creates a human-friendly string represenation of the specified object. - * + * * @param obj The object to create a string representation for, may be null. * @return The string representation, never null. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java index c61c9fb2a8..97b69bec89 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java @@ -73,7 +73,7 @@ public void setMojoExecutionListeners( final List listene * @return PluginDescriptor The component descriptor for the Maven plugin. * @throws PluginNotFoundException The plugin could not be found in any repositories. * @throws PluginResolutionException The plugin could be found but could not be resolved. - * @throws InvalidPluginDescriptorException + * @throws InvalidPluginDescriptorException */ public PluginDescriptor loadPlugin( Plugin plugin, List repositories, RepositorySystemSession session ) throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, InvalidPluginDescriptorException @@ -215,9 +215,9 @@ public void executeMojo( MavenSession session, MojoExecution mojoExecution ) /** * TODO pluginDescriptor classRealm and artifacts are set as a side effect of this * call, which is not nice. - * @throws PluginResolutionException + * @throws PluginResolutionException */ - public ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor ) + public ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor ) throws PluginResolutionException, PluginManagerException { ClassRealm pluginRealm = pluginDescriptor.getClassRealm(); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java index 4242a32260..4927726b60 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java @@ -41,7 +41,7 @@ * data like the plugin realm. Warning: This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java index 61d3058d0a..3dfb5fddbb 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java @@ -30,7 +30,7 @@ * Caches extension class realms. Warning: This is an internal utility interface that is only public * for technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted * without prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -71,7 +71,7 @@ public CacheRecord( ClassRealm realm, ExtensionDescriptor descriptor ) * Registers the specified cache record for usage with the given project. Integrators can use the information * collected from this method in combination with a custom cache implementation to dispose unused records from the * cache. - * + * * @param project The project that employs the plugin realm, must not be {@code null}. * @param record The cache record being used for the project, must not be {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java index 30f4d0f2eb..223ccd811f 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java @@ -24,7 +24,7 @@ public class InvalidPluginDescriptorException extends Exception { - + public InvalidPluginDescriptorException( String message, List errors ) { super( toMessage( message, errors ) ); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java index eef9b4f3ea..b246ed1877 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java @@ -26,7 +26,7 @@ * Helps to provide backward-compatibility with plugins that use legacy components. Warning: This is an * internal utility interface that is only public for technical reasons, it is not part of the public API. In * particular, this interface can be changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -37,21 +37,21 @@ public interface LegacySupport * Sets the currently active session. Some legacy components are basically stateful and their API is missing * parameters that would be required to delegate to a stateless component. Saving the session (in a thread-local * variable) is our best effort to record any state that is required to enable proper delegation. - * + * * @param session The currently active session, may be {@code null}. */ void setSession( MavenSession session ); /** * Gets the currently active session. - * + * * @return The currently active session or {@code null} if none. */ MavenSession getSession(); /** * Gets the currently active repository session. - * + * * @return The currently active repository session or {@code null} if none. */ RepositorySystemSession getRepositorySession(); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java index e62cb9b534..8f6c3a87e9 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java @@ -33,7 +33,7 @@ * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such * that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build * plugins as well as special purpose plugins like reports. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -42,7 +42,7 @@ public interface MavenPluginManager /** * Retrieves the descriptor for the specified plugin from its main artifact. - * + * * @param plugin The plugin whose descriptor should be retrieved, must not be {@code null}. * @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code * null}. @@ -54,7 +54,7 @@ PluginDescriptor getPluginDescriptor( Plugin plugin, List repo /** * Retrieves the descriptor for the specified plugin goal from the plugin's main artifact. - * + * * @param plugin The plugin whose mojo descriptor should be retrieved, must not be {@code null}. * @param goal The simple name of the mojo whose descriptor should be retrieved, must not be {@code null}. * @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code @@ -69,7 +69,7 @@ MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, ListWarning: The returned mojo instance must be released via * {@link #releaseMojo(Object, MojoExecution)} when the mojo is no longer needed to free any resources allocated for * it. - * + * * @param mojoInterface The component role of the mojo, must not be {@code null}. * @param session The build session in whose context the mojo will be used, must not be {@code null}. * @param mojoExecution The mojo execution to retrieve the mojo for, must not be {@code null}. @@ -108,7 +108,7 @@ T getConfiguredMojo( Class mojoInterface, MavenSession session, MojoExecu /** * Releases the specified mojo back to the container. - * + * * @param mojo The mojo to release, may be {@code null}. * @param mojoExecution The mojo execution the mojo was originally retrieved for, must not be {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java index 9417e8db5c..a417219ebd 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java @@ -31,11 +31,11 @@ public class MojoExecution { private Plugin plugin; - + private String goal; - + private String executionId; - + private MojoDescriptor mojoDescriptor; private Xpp3Dom configuration; @@ -77,7 +77,7 @@ public MojoExecution( Plugin plugin, String goal, String executionId ) this.goal = goal; this.executionId = executionId; } - + public MojoExecution( MojoDescriptor mojoDescriptor ) { this.mojoDescriptor = mojoDescriptor; @@ -109,7 +109,7 @@ public MojoExecution( MojoDescriptor mojoDescriptor, Xpp3Dom configuration ) /** * Gets the source of this execution. - * + * * @return The source of this execution or {@code null} if unknown. */ public Source getSource() @@ -146,14 +146,14 @@ public void setConfiguration( Xpp3Dom configuration ) { this.configuration = configuration; } - + public String identify() { StringBuilder sb = new StringBuilder( 256 ); - + sb.append( executionId ); sb.append( configuration.toString() ); - + return sb.toString(); } @@ -165,7 +165,7 @@ public String getLifecyclePhase() public void setLifecyclePhase( String lifecyclePhase ) { this.lifecyclePhase = lifecyclePhase; - } + } @Override public String toString() @@ -185,7 +185,7 @@ public String getGroupId() { return mojoDescriptor.getPluginDescriptor().getGroupId(); } - + return plugin.getGroupId(); } @@ -195,7 +195,7 @@ public String getArtifactId() { return mojoDescriptor.getPluginDescriptor().getArtifactId(); } - + return plugin.getArtifactId(); } @@ -204,8 +204,8 @@ public String getVersion() if ( mojoDescriptor != null ) { return mojoDescriptor.getPluginDescriptor().getVersion(); - } - + } + return plugin.getVersion(); } @@ -215,7 +215,7 @@ public String getGoal() { return mojoDescriptor.getGoal(); } - + return goal; } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java index e4d256f9a2..1232052723 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java @@ -32,7 +32,7 @@ * Caches plugin artifacts. Warning: This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -52,7 +52,7 @@ static class CacheRecord public final List artifacts; - public final PluginResolutionException exception; + public final PluginResolutionException exception; public CacheRecord( List artifacts ) { @@ -82,7 +82,7 @@ Key createKey( Plugin plugin, DependencyFilter extensionFilter, ListWarning: This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java index 283c349058..1a3100e911 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java @@ -62,7 +62,7 @@ Object getPluginComponent( Plugin plugin, String role, String roleHint ) Map getPluginComponents( Plugin plugin, String role ) throws ComponentLookupException, PluginManagerException; - + /** * @since 2.2.1 */ @@ -70,7 +70,7 @@ PluginDescriptor loadPluginDescriptor( Plugin plugin, MavenProject project, Mave throws ArtifactResolutionException, PluginVersionResolutionException, ArtifactNotFoundException, InvalidVersionSpecificationException, InvalidPluginException, PluginManagerException, PluginNotFoundException, PluginVersionNotFoundException; - + /** * @since 2.2.1 */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java index dfdd4327f0..dcf459e7ba 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java @@ -78,7 +78,7 @@ private static void decomposeParameterIntoUserInstructions( MojoDescriptor mojo, StringBuilder messageBuffer ) { String expression = param.getExpression(); - + if ( param.isEditable() ) { boolean isArray = param.getType().endsWith( "[]" ); @@ -99,7 +99,7 @@ private static void decomposeParameterIntoUserInstructions( MojoDescriptor mojo, // assume it is not assignable from Collection or Map } } - + messageBuffer.append( "Inside the definition for plugin \'" ); messageBuffer.append( mojo.getPluginDescriptor().getArtifactId() ); messageBuffer.append( "\', specify the following:\n\n\n ...\n" ); @@ -137,7 +137,7 @@ else if ( isMap ) { messageBuffer.append( "\n" ); messageBuffer.append( " " ); - } + } messageBuffer.append( "\n" ); messageBuffer.append( "" ); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index 593cd87327..df47fa4062 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -57,7 +57,7 @@ * * project properties * * Notice: reports was supported in Maven 2.x but was removed in Maven 3 - * + * * @author Jason van Zyl * @see MavenSession * @see MojoExecution diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java index 4eea338a7f..1ffa157582 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java @@ -34,7 +34,7 @@ * Caches plugin class realms. Warning: This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -76,7 +76,7 @@ Key createKey( Plugin plugin, ClassLoader parentRealm, Map * Registers the specified cache record for usage with the given project. Integrators can use the information * collected from this method in combination with a custom cache implementation to dispose unused records from the * cache. - * + * * @param project The project that employs the plugin realm, must not be {@code null}. * @param record The cache record being used for the project, must not be {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java index 59047eb1ee..bafbcb35fe 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java @@ -29,7 +29,7 @@ * Helps to provide backward-compatibility with plugins that use legacy components. Warning: This is an * internal utility component that is only public for technical reasons, it is not part of the public API. In * particular, this component can be changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 020d6b1d37..842987b8bd 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -102,7 +102,7 @@ * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such * that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build * plugins as well as special purpose plugins like reports. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index a1b735e5d9..5a0edf5a77 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -64,7 +64,7 @@ * Assists in resolving the dependencies of a plugin. Warning: 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. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java index 2112748027..16a0b63c08 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java @@ -32,7 +32,7 @@ /** * Injects plexus-utils:1.1 into a plugin's class path if it doesn't already declare a dependency on plexus-utils. This * is another legacy bit to provide backward-compat with Maven 2.x. - * + * * @author Benjamin Bentmann */ class PlexusUtilsInjector diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java index 632d1d5918..4194297897 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java @@ -33,7 +33,7 @@ * Assists in resolving the dependencies of a plugin. Warning: This is an internal utility interface * that is only public for technical reasons, it is not part of the public API. In particular, this interface can be * changed or deleted without prior notice. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -42,7 +42,7 @@ public interface PluginDependenciesResolver /** * Resolves the main artifact of the specified plugin. - * + * * @param plugin The plugin for which to resolve the main artifact, must not be {@code null}. * @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code * null}. @@ -55,7 +55,7 @@ Artifact resolve( Plugin plugin, List repositories, Repository /** * Resolves the runtime dependencies of the specified plugin. - * + * * @param plugin The plugin for which to resolve the dependencies, must not be {@code null}. * @param pluginArtifact The plugin's main artifact, may be {@code null}. * @param dependencyFilter A filter to exclude artifacts from resolution (but not collection), may be {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java index 038fa00789..533920a86a 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java @@ -36,7 +36,7 @@ * for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not * intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the * core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561). - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java index 3c59fb4775..706694b8ad 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java @@ -30,7 +30,7 @@ /** * A configuration listener to help validate the plugin configuration. For instance, check for required but missing * parameters. - * + * * @author Benjamin Bentmann */ class ValidatingConfigurationListener diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java index f0e2107fab..43e8cfc4e3 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java @@ -30,7 +30,7 @@ * for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not * intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the * core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561). - * + * * @author Benjamin Bentmann */ class WagonExcluder diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java index 27c5f5b9ed..7ab86cfd16 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java @@ -30,7 +30,7 @@ /** * Collects settings required to resolve a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -59,7 +59,7 @@ public DefaultPluginPrefixRequest() * Creates a request for the specified plugin prefix and build session. The provided build session will be used to * configure repository settings. If the session has a current project, its plugin repositories and model will be * used as well. - * + * * @param prefix The plugin prefix to resolve, must not be {@code null}. * @param session The build session from which to derive further settings, must not be {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java index c23368ec72..23df66eeb1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java @@ -27,7 +27,7 @@ /** * Collects settings required to resolve a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -36,14 +36,14 @@ public interface PluginPrefixRequest /** * Gets the prefix of the plugin. - * + * * @return The prefix of the plugin. */ String getPrefix(); /** * Sets the prefix of the plugin. - * + * * @param prefix The prefix of the plugin. * @return This request, never {@code null}. */ @@ -51,14 +51,14 @@ public interface PluginPrefixRequest /** * Gets the list of group ids to scan for the plugin prefix. - * + * * @return The list of group ids to scan for the plugin prefix, never {@code null}. */ List getPluginGroups(); /** * Sets the list of group ids to scan for the plugin prefix. - * + * * @param pluginGroups The list of group ids to scan for the plugin prefix, may be {@code null}. * @return This request, never {@code null}. */ @@ -66,7 +66,7 @@ public interface PluginPrefixRequest /** * Gets the POM whose build plugins are to be scanned for the prefix. - * + * * @return The POM whose build plugins are to be scanned for the prefix or {@code null} to only search the plugin * repositories. */ @@ -74,7 +74,7 @@ public interface PluginPrefixRequest /** * Sets the POM whose build plugins are to be scanned for the prefix. - * + * * @param pom The POM whose build plugins are to be scanned for the prefix, may be {@code null} to only search the * plugin repositories. * @return This request, never {@code null}. @@ -83,7 +83,7 @@ public interface PluginPrefixRequest /** * Gets the remote repositories to use. - * + * * @return The remote repositories to use, never {@code null}. */ List getRepositories(); @@ -91,7 +91,7 @@ public interface PluginPrefixRequest /** * Sets the remote repositories to use. Note: When creating a request from a project, be sure to use the * plugin repositories and not the regular project repositories. - * + * * @param repositories The remote repositories to use. * @return This request, never {@code null}. */ @@ -99,14 +99,14 @@ public interface PluginPrefixRequest /** * Gets the session to use for repository access. - * + * * @return The repository session or {@code null} if not set. */ RepositorySystemSession getRepositorySession(); /** * Sets the session to use for repository access. - * + * * @param repositorySession The repository session to use. * @return This request, never {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java index 6f11bcdb14..943e683308 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java @@ -21,7 +21,7 @@ /** * Resolves a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -30,7 +30,7 @@ public interface PluginPrefixResolver /** * Resolves the plugin prefix for the specified request. - * + * * @param request The request that holds the details about the plugin and the repositories to consult, must not be * {@code null}. * @return The result of the prefix resolution, never {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java index 6fe1f728b9..8fe1a71af8 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java @@ -23,7 +23,7 @@ /** * Describes the result of a plugin prefix resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -32,21 +32,21 @@ public interface PluginPrefixResult /** * The resolved group id for the plugin. - * + * * @return The resolved group id for the plugin, never {@code null}. */ String getGroupId(); /** * The resolved artifact id for the plugin. - * + * * @return The resolved artifact id for the plugin, never {@code null}. */ String getArtifactId(); /** * The repository from which the plugin prefix was resolved. - * + * * @return The repository from which the plugin prefix was resolved or {@code null} if the prefix was resolved from * the supplied POM. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java index 76814fd79c..8d2ad0f7ef 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java @@ -54,7 +54,7 @@ /** * Resolves a plugin prefix. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java index 9917387ed5..6a248bff93 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java @@ -25,7 +25,7 @@ /** * Describes the result of a plugin prefix resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java index b672090b8d..f88dba576d 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java @@ -31,7 +31,7 @@ /** * Collects settings required to resolve the version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -59,7 +59,7 @@ public DefaultPluginVersionRequest() /** * Creates a request for the specified plugin by copying settings from the specified build session. If the session * has a current project, its plugin repositories will be used as well. - * + * * @param plugin The plugin for which to resolve a version, must not be {@code null}. * @param session The Maven session to use, must not be {@code null}. */ @@ -79,7 +79,7 @@ public DefaultPluginVersionRequest( Plugin plugin, MavenSession session ) /** * Creates a request for the specified plugin using the given repository session and plugin repositories. - * + * * @param plugin The plugin for which to resolve a version, must not be {@code null}. * @param session The repository session to use, must not be {@code null}. * @param repositories The plugin repositories to query, may be {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java index 5d2b63d21d..b22f9e1d63 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java @@ -27,7 +27,7 @@ /** * Collects settings required to resolve the version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -36,14 +36,14 @@ public interface PluginVersionRequest /** * Gets the group id of the plugin. - * + * * @return The group id of the plugin. */ String getGroupId(); /** * Sets the group id of the plugin. - * + * * @param groupId The group id of the plugin. * @return This request, never {@code null}. */ @@ -51,14 +51,14 @@ public interface PluginVersionRequest /** * Gets the artifact id of the plugin. - * + * * @return The artifact id of the plugin. */ String getArtifactId(); /** * Sets the artifact id of the plugin. - * + * * @param artifactId The artifact id of the plugin. * @return This request, never {@code null}. */ @@ -66,7 +66,7 @@ public interface PluginVersionRequest /** * Gets the POM whose build plugins are to be scanned for the version. - * + * * @return The POM whose build plugins are to be scanned for the verion or {@code null} to only search the plugin * repositories. */ @@ -74,7 +74,7 @@ public interface PluginVersionRequest /** * Sets the POM whose build plugins are to be scanned for the version. - * + * * @param pom The POM whose build plugins are to be scanned for the version, may be {@code null} to only search the * plugin repositories. * @return This request, never {@code null}. @@ -83,7 +83,7 @@ public interface PluginVersionRequest /** * Gets the remote repositories to use. - * + * * @return The remote repositories to use, never {@code null}. */ List getRepositories(); @@ -91,7 +91,7 @@ public interface PluginVersionRequest /** * Sets the remote repositories to use. Note: When creating a request from a project, be sure to use the * plugin repositories and not the regular project repositories. - * + * * @param repositories The remote repositories to use. * @return This request, never {@code null}. */ @@ -99,14 +99,14 @@ public interface PluginVersionRequest /** * Gets the session to use for repository access. - * + * * @return The repository session or {@code null} if not set. */ RepositorySystemSession getRepositorySession(); /** * Sets the session to use for repository access. - * + * * @param repositorySession The repository session to use. * @return This request, never {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java index b5c3c104c2..935fdfc5c2 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java @@ -21,7 +21,7 @@ /** * Resolves a version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -30,7 +30,7 @@ public interface PluginVersionResolver /** * Resolves the version for the specified request. - * + * * @param request The request that holds the details about the plugin and the repositories to consult, must not be * {@code null}. * @return The result of the version resolution, never {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java index bc3a2d28d2..09a69e9609 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java @@ -23,7 +23,7 @@ /** * Describes the result of a plugin version resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -32,14 +32,14 @@ public interface PluginVersionResult /** * The resolved plugin version. - * + * * @return The resolved plugin version, never {@code null}. */ String getVersion(); /** * The repository from which the plugin version was resolved. - * + * * @return The repository from which the plugin version was resolved, never {@code null}. */ ArtifactRepository getRepository(); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java index de007b3b47..76b6bfd6cc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java @@ -61,7 +61,7 @@ /** * Resolves a version for a plugin. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java index c67516c0ce..9027a532b1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java @@ -24,7 +24,7 @@ /** * Describes the result of a plugin version resolution request. - * + * * @since 3.0 * @author Benjamin Bentmann */ diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java index 6f26ec48a6..596f853be9 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java @@ -92,7 +92,7 @@ public void attachArtifact( MavenProject project, File artifactFile, String arti /** * Add an attached artifact or replace the file for an existing artifact. - * + * * @see MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact) * @param project project reference. * @param artifact artifact to add or replace. diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java index 3aebe9b4b7..5d97cfcafa 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java @@ -33,7 +33,7 @@ /** * Processes events from the model builder while building the effective model for a {@link MavenProject} instance. - * + * * @author Benjamin Bentmann */ class DefaultModelBuildingListener @@ -76,7 +76,7 @@ public DefaultModelBuildingListener( MavenProject project, ProjectBuildingHelper /** * Gets the project whose model is being built. - * + * * @return The project, never {@code null}. */ public MavenProject getProject() diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index 4d77049434..e359bcf00c 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -131,7 +131,7 @@ private ProjectBuildingResult build( File pomFile, ModelSource modelSource, Inte try { - ProjectBuildingRequest projectBuildingRequest = config.request; + ProjectBuildingRequest projectBuildingRequest = config.request; MavenProject project = projectBuildingRequest.getProject(); @@ -731,9 +731,9 @@ private void initProject( MavenProject project, Map projec // // All the parts that were taken out of MavenProject for Maven 4.0.0 // - + project.setProjectBuildingRequest( projectBuildingRequest ); - + // pluginArtifacts Set pluginArtifacts = new HashSet(); for ( Plugin plugin : project.getBuildPlugins() ) diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java index 3d04637c68..035b42b5dd 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java @@ -66,7 +66,7 @@ * Assists the project builder. Warning: 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 */ @Component( role = ProjectBuildingHelper.class ) @@ -255,7 +255,7 @@ public synchronized ProjectRealmCache.CacheRecord createProjectRealm( MavenProje ClassRealm extensionRealm; ExtensionDescriptor extensionDescriptor = null; - + final ExtensionRealmCache.Key extensionKey = extensionRealmCache.createKey( artifacts ); ExtensionRealmCache.CacheRecord recordRealm = extensionRealmCache.get( extensionKey ); diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java index f3cafdbf95..185e4ca7fc 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java @@ -208,7 +208,7 @@ public ProjectBuildingRequest setProcessPlugins( boolean processPlugins ) this.processPlugins = processPlugins; return this; } - + public ProjectBuildingRequest setResolveDependencies( boolean resolveDependencies ) { this.resolveDependencies = resolveDependencies; diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java index 3a3c37f201..b64a395d64 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java @@ -27,7 +27,7 @@ /** * Collects the output of the project builder. - * + * * @author Benjamin Bentmann */ class DefaultProjectBuildingResult @@ -46,7 +46,7 @@ class DefaultProjectBuildingResult /** * Creates a new result with the specified contents. - * + * * @param project The project that was built, may be {@code null}. * @param problems The problems that were encouterned, may be {@code null}. * @param dependencyResolutionResult The result of the resolution for the project dependencies, may be {@code null}. @@ -65,7 +65,7 @@ public DefaultProjectBuildingResult( MavenProject project, List pr /** * Creates a new result with the specified contents. - * + * * @param projectId The identifier of the project, may be {@code null}. * @param pomFile The POM file from which the project was built, may be {@code null}. * @param problems The problems that were encouterned, may be {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java index 758c49170e..c120a1379b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java @@ -24,7 +24,7 @@ /** * A request to resolve the dependencies of a project. - * + * * @author Benjamin Bentmann */ public interface DependencyResolutionRequest @@ -32,14 +32,14 @@ public interface DependencyResolutionRequest /** * Gets the project to resolve dependencies for. - * + * * @return The project to resolve dependencies for or {@code null} if not set. */ MavenProject getMavenProject(); /** * Sets the project to resolve dependencies for. - * + * * @param project The project to resolve dependencies for, may be {@code null}. * @return This request for chaining, never {@code null}. */ @@ -47,7 +47,7 @@ public interface DependencyResolutionRequest /** * Gets the filter used to exclude some dependencies from resolution. - * + * * @return The filter to exclude dependencies from resolution or {@code null} to resolve all dependencies. */ DependencyFilter getResolutionFilter(); @@ -56,7 +56,7 @@ public interface DependencyResolutionRequest * Sets the filter used to exclude some dependencies from resolution. Note that this filter only controls the * resolution/download of dependency artifacts, not the inclusion of dependency nodes in the resolved dependency * graph. - * + * * @param filter The filter to exclude dependencies from resolution, may be {@code null} to resolve all * dependencies. * @return This request for chaining, never {@code null}. @@ -65,14 +65,14 @@ public interface DependencyResolutionRequest /** * Gets the session to use for repository access. - * + * * @return The repository session or {@code null} if not set. */ RepositorySystemSession getRepositorySession(); /** * Sets the session to use for repository access. - * + * * @param repositorySession The repository session to use. * @return This request for chaining, never {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java index 2f62d80da2..6ad55fae74 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java @@ -26,7 +26,7 @@ /** * The result of a project dependency resolution. - * + * * @author Benjamin Bentmann */ public interface DependencyResolutionResult @@ -34,7 +34,7 @@ public interface DependencyResolutionResult /** * Gets the dependency graph of the project. - * + * * @return The dependency graph or {@code null} if not available. */ DependencyNode getDependencyGraph(); @@ -43,35 +43,35 @@ public interface DependencyResolutionResult * Gets the transitive dependencies of the project that were not excluded by * {@link DependencyResolutionRequest#getResolutionFilter()}. This list is a union of the results from * {@link #getResolvedDependencies()} and {@link #getUnresolvedDependencies()}. - * + * * @return The transitive dependencies, never {@code null}. */ List getDependencies(); /** * Gets the dependencies that were successfully resolved. - * + * * @return The resolved dependencies, never {@code null}. */ List getResolvedDependencies(); /** * Gets the dependencies that could not be resolved. - * + * * @return The unresolved dependencies, never {@code null}. */ List getUnresolvedDependencies(); /** * Gets the errors that occurred while building the dependency graph. - * + * * @return The errors that occurred while building the dependency graph, never {@code null}. */ List getCollectionErrors(); /** * Gets the errors that occurred while resolving the specified dependency. - * + * * @param dependency The dependency for which to retrieve the errors, must not be {@code null}. * @return The resolution errors for the specified dependency, never {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java index 9750e6552e..062b8b77a7 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java +++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java @@ -26,7 +26,7 @@ * Provides metadata about a build extension. Warning: 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 ExtensionDescriptor diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java index 89f394f949..c18f87f961 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java @@ -37,7 +37,7 @@ /** * Creates an extension descriptor from some XML stream. - * + * * @author Benjamin Bentmann */ class ExtensionDescriptorBuilder @@ -50,7 +50,7 @@ private String getExtensionDescriptorLocation() /** * Extracts the extension descriptor (if any) from the specified JAR file. - * + * * @param extensionJar The JAR file or directory to extract the descriptor from, must not be {@code null}. * @return The extracted descriptor or {@code null} if no descriptor was found. * @throws IOException If the descriptor is present but could not be parsed. diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 9a65b7fe38..2289465b5b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -227,7 +227,7 @@ public Model getModel() /** * Returns the project corresponding to a declared parent. - * + * * @return the parent, or null if no parent is declared or there was an error building it */ public MavenProject getParent() @@ -690,7 +690,7 @@ public void setArtifacts( Set artifacts ) * All dependencies that this project has, including transitive ones. Contents are lazily populated, so depending on * what phases have run dependencies in some scopes won't be included. eg. if only compile phase has run, * dependencies with scope test won't be included. - * + * * @return {@link Set} < {@link Artifact} > * @see #getDependencyArtifacts() to get only direct dependencies */ @@ -894,7 +894,7 @@ public void setInjectedProfileIds( String source, List injectedProfileId * {@code settings.xml}. The profile identifiers are grouped by the identifier of their source, e.g. * {@code ::} for a POM profile or {@code external} for profiles from the * {@code settings.xml}. - * + * * @return The identifiers of all injected profiles, indexed by the source from which the profiles originated, never * {@code null}. */ @@ -909,7 +909,7 @@ public Map> getInjectedProfileIds() * 3.0.x. Historically, it logged and ignored a second addition of the same g/a/v/c/t. Now it replaces the file for * the artifact, so that plugins (e.g. shade) can change the pathname of the file for a particular set of * coordinates. - * + * * @param artifact the artifact to add or replace. * @throws DuplicateArtifactAttachmentException */ @@ -986,7 +986,7 @@ public void setCollectedProjects( List collectedProjects ) /** * Direct dependencies that this project has. - * + * * @return {@link Set} < {@link Artifact} > * @see #getArtifacts() to get all transitive dependencies */ @@ -1352,7 +1352,7 @@ public Object getContextValue( String key ) * Sets the project's class realm. Warning: This is an internal utility method that is only public * for technical reasons, it is not part of the public API. In particular, this method can be changed or deleted * without prior notice and must not be used by plugins. - * + * * @param classRealm The class realm hosting the build extensions of this project, may be {@code null}. */ public void setClassRealm( ClassRealm classRealm ) @@ -1365,7 +1365,7 @@ public void setClassRealm( ClassRealm classRealm ) * Warning: This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @return The project's class realm or {@code null}. */ public ClassRealm getClassRealm() @@ -1377,7 +1377,7 @@ public ClassRealm getClassRealm() * Sets the artifact filter used to exclude shared extension artifacts from plugin realms. Warning: * This is an internal utility method that is only public for technical reasons, it is not part of the public API. * In particular, this method can be changed or deleted without prior notice and must not be used by plugins. - * + * * @param extensionDependencyFilter The dependency filter to apply to plugins, may be {@code null}. */ public void setExtensionDependencyFilter( DependencyFilter extensionDependencyFilter ) @@ -1390,7 +1390,7 @@ public void setExtensionDependencyFilter( DependencyFilter extensionDependencyFi * Warning: This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @return The dependency filter or {@code null}. */ public DependencyFilter getExtensionDependencyFilter() @@ -1403,7 +1403,7 @@ public DependencyFilter getExtensionDependencyFilter() * Warning: This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param artifacts The set of artifacts, may be {@code null}. */ public void setResolvedArtifacts( Set artifacts ) @@ -1418,7 +1418,7 @@ public void setResolvedArtifacts( Set artifacts ) * Warning: This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param artifactFilter The artifact filter, may be {@code null} to exclude all artifacts. */ public void setArtifactFilter( ArtifactFilter artifactFilter ) @@ -1432,7 +1432,7 @@ public void setArtifactFilter( ArtifactFilter artifactFilter ) * Warning: This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param phase The phase to check for, must not be {@code null}. * @return {@code true} if the phase has been seen. */ @@ -1445,7 +1445,7 @@ public boolean hasLifecyclePhase( String phase ) * Warning: This is an internal utility method that is only public for technical reasons, it is not * part of the public API. In particular, this method can be changed or deleted without prior notice and must not be * used by plugins. - * + * * @param lifecyclePhase The lifecycle phase to add, must not be {@code null}. */ public void addLifecyclePhase( String lifecyclePhase ) @@ -1523,8 +1523,8 @@ public String getModulePathAdjustment( MavenProject moduleProject ) } return moduleAdjustments.get( module ); - } - + } + @Deprecated public Set createArtifacts( ArtifactFactory artifactFactory, String inheritedScope, ArtifactFilter filter ) throws InvalidDependencyVersionException @@ -1688,8 +1688,8 @@ public List getRuntimeDependencies() } } return list; - } - + } + @Deprecated public List getRuntimeArtifacts() { @@ -1706,8 +1706,8 @@ public List getRuntimeArtifacts() } } return list; - } - + } + @Deprecated public List getSystemClasspathElements() throws DependencyResolutionRequiredException @@ -1944,7 +1944,7 @@ public Artifact replaceWithActiveArtifact( Artifact pluginArtifact ) /** * Gets the project building request from which this project instance was created. Warning: This is * an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins. - * + * * @return The project building request or {@code null}. * @since 2.1 */ @@ -1957,7 +1957,7 @@ public ProjectBuildingRequest getProjectBuildingRequest() /** * Sets the project building request from which this project instance was created. Warning: This is * an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins. - * + * * @param projectBuildingRequest The project building request, may be {@code null}. * @since 2.1 */ diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java index 70eb5b4e5d..4ac83972b6 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java @@ -33,7 +33,7 @@ public interface ProjectBuilder /** * Builds a project descriptor from the specified POM file. - * + * * @param projectFile The POM file to build the project from, must not be {@code null}. * @param request The project building request that holds further parameters, must not be {@code null}. * @return The result of the project building, never {@code null}. @@ -44,7 +44,7 @@ ProjectBuildingResult build( File projectFile, ProjectBuildingRequest request ) /** * Builds a project descriptor for the specified artifact. - * + * * @param projectArtifact The POM artifact to build the project from, must not be {@code null}. * @param request The project building request that holds further parameters, must not be {@code null}. * @return The result of the project building, never {@code null}. @@ -55,7 +55,7 @@ ProjectBuildingResult build( Artifact projectArtifact, ProjectBuildingRequest re /** * Builds a project descriptor for the specified artifact. - * + * * @param projectArtifact The POM artifact to build the project from, must not be {@code null}. * @param allowStubModel A flag controlling the case of a missing POM artifact. If {@code true} and the specified * POM artifact does not exist, a simple stub model will be returned. If {@code false}, an exception will @@ -69,12 +69,12 @@ ProjectBuildingResult build( Artifact projectArtifact, boolean allowStubModel, P /** * Builds a project descriptor for the specified model source. - * + * * @param modelSource The source of the model to built the project descriptor from, must not be {@code null}. * @param request The project building request that holds further parameters, must not be {@code null}. * @return The result of the project building, never {@code null}. * @throws ProjectBuildingException If the project descriptor could not be successfully built. - * + * * @see org.apache.maven.model.building.ModelSource2 */ ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request ) @@ -82,7 +82,7 @@ ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest req /** * Builds the projects for the specified POM files and optionally their children. - * + * * @param pomFiles The POM files to build, must not be {@code null}. * @param recursive {@code true} to recursively build sub modules referenced by the POM files, {@code false} to * build only the specified POM files. diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java index 32818afdee..0380278bf9 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java @@ -31,7 +31,7 @@ public interface ProjectBuildingRequest { ProjectBuildingRequest setLocalRepository( ArtifactRepository localRepository ); - + ArtifactRepository getLocalRepository(); ProjectBuildingRequest setRemoteRepositories( List remoteRepositories ); @@ -45,7 +45,7 @@ public interface ProjectBuildingRequest /** * Sets the system properties to use for interpolation and profile activation. The system properties are collected * from the runtime environment like {@link System#getProperties()} and environment variables. - * + * * @param systemProperties The system properties, may be {@code null}. * @return This request, never {@code null}. */ @@ -54,7 +54,7 @@ public interface ProjectBuildingRequest /** * Gets the system properties to use for interpolation and profile activation. The system properties are collected * from the runtime environment like {@link System#getProperties()} and environment variables. - * + * * @return The system properties, never {@code null}. */ Properties getSystemProperties(); @@ -63,7 +63,7 @@ public interface ProjectBuildingRequest * Sets the user properties to use for interpolation and profile activation. The user properties have been * configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command * line. - * + * * @param userProperties The user properties, may be {@code null}. * @return This request, never {@code null}. */ @@ -73,7 +73,7 @@ public interface ProjectBuildingRequest * Gets the user properties to use for interpolation and profile activation. The user properties have been * configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command * line. - * + * * @return The user properties, never {@code null}. */ Properties getUserProperties(); @@ -92,7 +92,7 @@ public interface ProjectBuildingRequest /** * Controls the level of validation to perform on processed models. By default, models are validated in strict mode. - * + * * @param validationLevel The level of validation to perform on processed models, e.g. * {@link org.apache.maven.model.building.ModelBuildingRequest#VALIDATION_LEVEL_STRICT}. * @return This configuration, never {@code null}. @@ -101,47 +101,47 @@ public interface ProjectBuildingRequest /** * Gets the level of validation to perform on processed models. - * + * * @return The level of validation to perform on processed models. */ int getValidationLevel(); // Profiles - + /** * Set any active profiles that the {@link ProjectBuilder} should consider while constructing * a {@link MavenProject}. */ void setActiveProfileIds( List activeProfileIds ); - + List getActiveProfileIds(); void setInactiveProfileIds( List inactiveProfileIds ); List getInactiveProfileIds(); - + /** * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom * configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse. - * + * * @param profile */ void addProfile( Profile profile ); - + void setProfiles( List profiles ); - + List getProfiles(); /** * Gets the start time of the build. - * + * * @return The start time of the build or {@code null} if unknown. */ Date getBuildStartTime(); /** * Sets the start time of the build. - * + * * @param buildStartTime The start time of the build, may be {@code null}. */ void setBuildStartTime( Date buildStartTime ); @@ -153,7 +153,7 @@ public interface ProjectBuildingRequest /** * Sets the merge mode used to combine repositories declared in the POM with the repositories specified in this * request. - * + * * @param mode The repository merge mode, must not be {@code null}. * @return This request for chaining, never {@code null}. * @see #setRemoteRepositories(List) @@ -163,7 +163,7 @@ public interface ProjectBuildingRequest /** * Gets the merge mode used to combine repositories declared in the POM with the repositories specified in this * request - * + * * @return The merge mode, never {@code null}. */ RepositoryMerging getRepositoryMerging(); diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java index bf9d265f71..9a43154c0c 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java @@ -26,7 +26,7 @@ /** * Collects the output of the project builder. - * + * * @author Benjamin Bentmann */ public interface ProjectBuildingResult @@ -36,21 +36,21 @@ public interface ProjectBuildingResult * Gets the identifier of the project that could not be built. The general format of the identifier is {@code * ::} but some of these coordinates may still be unknown at the point the exception * is thrown so this information is merely meant to assist the user. - * + * * @return The identifier of the project or an empty string if not known, never {@code null}. */ String getProjectId(); /** * Gets the POM file from which the project was built. - * + * * @return The POM file or {@code null} if unknown. */ File getPomFile(); /** * Gets the project that was built. - * + * * @return The project that was built or {@code null} if an error occurred and this result accompanies a * {@link ProjectBuildingException}. */ @@ -58,14 +58,14 @@ public interface ProjectBuildingResult /** * Gets the problems that were encountered during the project building. - * + * * @return The problems that were encountered during the project building, can be empty but never {@code null}. */ List getProblems(); /** * Gets the result of the dependency resolution for the project. - * + * * @return The result of the dependency resolution for the project or {@code null} if the project dependencies were * not requested. */ diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java index 36572c2fc3..539055ca5f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java @@ -21,7 +21,7 @@ /** * Resolves the transitive dependencies of a project. - * + * * @author Benjamin Bentmann */ public interface ProjectDependenciesResolver @@ -29,7 +29,7 @@ public interface ProjectDependenciesResolver /** * Resolves the transitive dependencies of a project. - * + * * @param request The resolution request holding the parameters, must not be {@code null}. * @return The resolution result, never {@code null}. * @throws DependencyResolutionException If any project dependency could not be resolved. diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java index 43609cedb2..c64dd73ec9 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java @@ -52,7 +52,7 @@ /** * A model resolver to assist building of projects. This resolver gives priority to those repositories that have been * declared in the POM. - * + * * @author Benjamin Bentmann */ class ProjectModelResolver diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java index 779d96b9e1..9265b894c7 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java @@ -28,7 +28,7 @@ * Caches project class realms. Warning: This is an internal utility interface that is only public for * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without * prior notice. - * + * * @author Igor Fedorenko * @author Benjamin Bentmann */ @@ -70,7 +70,7 @@ public CacheRecord( ClassRealm realm, DependencyFilter extensionArtifactFilter ) * Registers the specified cache record for usage with the given project. Integrators can use the information * collected from this method in combination with a custom cache implementation to dispose unused records from the * cache. - * + * * @param project The project that employs the plugin realm, must not be {@code null}. * @param record The cache record being used for the project, must not be {@code null}. */ diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java index 63d9ca5e51..24425da188 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java @@ -26,7 +26,7 @@ /** * A simple model cache used to accelerate model building during a reactor build. - * + * * @author Benjamin Bentmann */ class ReactorModelCache diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java index e0e9615e21..294fccdbe3 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java @@ -26,7 +26,7 @@ /** * Holds all POM files that are known to the reactor. This allows the project builder to resolve imported POMs from the * reactor when building another project's effective model. - * + * * @author Benjamin Bentmann */ class ReactorModelPool diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java index d02110777c..91f665b5f4 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java @@ -26,7 +26,7 @@ * This realizes the metadata source via the default hint to provide backward-compat with Maven 2.x whose Plexus version * registered component descriptors twice: once keyed by role+roleHint and once keyed by role only. This effectively * made the metadata source available with its original role hint ("maven") as well as the default hint. - * + * * @author Benjamin Bentmann */ @Component( role = ArtifactMetadataSource.class ) diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 1750a7b15a..becd88092e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -200,7 +200,7 @@ public ResolutionGroup retrieve( MetadataResolutionRequest request ) if ( rel.project == null ) { - // When this happens we have a Maven 1.x POM, or some invalid POM. + // When this happens we have a Maven 1.x POM, or some invalid POM. // It should have never found its way into Maven 2.x repository but it did. dependencies = Collections.emptyList(); } diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java index cdcd54598c..2c3196fb69 100644 --- a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java +++ b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java @@ -29,7 +29,7 @@ * Assists the project builder. Warning: 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. - * + * * @since 3.0 * @author Benjamin Bentmann */ @@ -43,7 +43,7 @@ public class EnvironmentUtils * env.PATH}. Unlike native environment variables, properties are always case-sensitive. For the sake of * determinism, the environment variable names will be normalized to upper case on platforms with case-insensitive * variable lookup. - * + * * @param props The properties to add the environment variables to, may be {@code null}. */ public static void addEnvVars( Properties props ) diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java index 81489a2eda..608df2dcab 100644 --- a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java +++ b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java @@ -28,7 +28,7 @@ public class SystemProperties { /** * Thread-safe System.properties copy implementation. - * + * * @see http://jira.codehaus.org/browse/MNG-5670 */ public static void addSystemProperties( Properties props ) diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java index 885048e23e..80189e7bc9 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java @@ -339,5 +339,5 @@ else if ( !source.equals( other.source ) ) } return true; } - + } diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java index dd91e7a1ca..8ed081ffc0 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java @@ -21,7 +21,7 @@ /** * Describes a resource being uploaded or downloaded by the repository system. - * + * * @author Benjamin Bentmann */ public interface ArtifactTransferResource @@ -30,35 +30,35 @@ public interface ArtifactTransferResource /** * The base URL of the repository, e.g. "http://repo1.maven.org/maven2/". Unless the URL is unknown, it will be * terminated by a trailing slash. - * + * * @return The base URL of the repository or an empty string if unknown, never {@code null}. */ String getRepositoryUrl(); /** * The path of the artifact relative to the repository's base URL. - * + * * @return The path of the artifact, never {@code null}. */ String getName(); /** * Gets the full URL of the artifact. - * + * * @return The full URL of the artifact, never {@code null}. */ String getUrl(); /** * The size of the artifact in bytes. - * + * * @return The of the artifact in bytes or a negative value if unknown. */ long getContentLength(); /** * Gets the timestamp when the transfer of this artifact was started. - * + * * @return The timestamp when the transfer of this artifact was started. */ long getTransferStartTime(); diff --git a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java index 491d575eb7..f47cb4b1e3 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java @@ -185,7 +185,7 @@ public boolean equals( Object obj ) { return false; } - + DelegatingLocalArtifactRepository other = (DelegatingLocalArtifactRepository) obj; return eq( buildReactor, other.buildReactor ) diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java index 7e54487bed..e33789e348 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java @@ -24,10 +24,10 @@ public abstract class LocalArtifactRepository extends MavenArtifactRepository -{ +{ public static final String IDE_WORKSPACE = "ide-workspace"; public abstract Artifact find( Artifact artifact ); - public abstract boolean hasLocalMetadata(); + public abstract boolean hasLocalMetadata(); } diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java index 72c2311adc..54e4ef4b0f 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java +++ b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java @@ -23,7 +23,7 @@ /** * Signals a failure to store files within the local repository. - * + * * @author Benjamin Bentmann */ public class LocalRepositoryNotAccessibleException diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java index d334f6bcbd..8d1e5162af 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java @@ -140,7 +140,7 @@ ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepo void injectProxy( RepositorySystemSession session, List repositories ); void injectAuthentication( RepositorySystemSession session, List repositories ); - + ArtifactResolutionResult resolve( ArtifactResolutionRequest request ); // Install diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java index 072baace96..67b4080b55 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java @@ -27,7 +27,7 @@ * @author Jason van Zyl */ public class ArtifactMetadataRetrievalException - extends Exception + extends Exception { private Artifact artifact; diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java index 63627dbc18..93b9d5da4b 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java @@ -29,7 +29,7 @@ /** * Forms a request to retrieve artifact metadata. - * + * * @author Benjamin Bentmann */ public class DefaultMetadataResolutionRequest diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java index f0fab77ff8..a652c97766 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java @@ -27,7 +27,7 @@ /** * Forms a request to retrieve artifact metadata. - * + * * @author Benjamin Bentmann */ public interface MetadataResolutionRequest @@ -36,14 +36,14 @@ public interface MetadataResolutionRequest /** * Indicates whether network access to remote repositories has been disabled. - * + * * @return {@code true} if remote access has been disabled, {@code false} otherwise. */ boolean isOffline(); /** * Enables/disables network access to remote repositories. - * + * * @param offline {@code true} to disable remote access, {@code false} to allow network access. * @return This request, never {@code null}. */ @@ -51,14 +51,14 @@ public interface MetadataResolutionRequest /** * Gets the artifact to resolve metadata for. - * + * * @return The artifact to resolve metadata for or {@code null} if not set. */ Artifact getArtifact(); /** * Sets the artifact for which to resolve metadata. - * + * * @param artifact The artifact for which to resolve metadata. * @return This request, never {@code null}. */ @@ -66,14 +66,14 @@ public interface MetadataResolutionRequest /** * Gets the local repository to use for the resolution. - * + * * @return The local repository to use for the resolution or {@code null} if not set. */ ArtifactRepository getLocalRepository(); /** * Sets the local repository to use for the resolution. - * + * * @param localRepository The local repository to use for the resolution. * @return This request, never {@code null}. */ @@ -81,14 +81,14 @@ public interface MetadataResolutionRequest /** * Gets the remote repositories to use for the resolution. - * + * * @return The remote repositories to use for the resolution, never {@code null}. */ List getRemoteRepositories(); /** * Sets the remote repositories to use for the resolution. - * + * * @param remoteRepositories The remote repositories to use for the resolution. * @return This request, never {@code null}. */ @@ -96,14 +96,14 @@ public interface MetadataResolutionRequest /** * Determines whether the managed version information should be retrieved. - * + * * @return {@code true} if the dependency management information should be retrieved, {@code false} otherwise. */ boolean isResolveManagedVersions(); /** * Enables/disables resolution of the dependency manageemnt information. - * + * * @param resolveManagedVersions {@code true} if the dependency management information should be retrieved, {@code * false} otherwise. * @return This request, never {@code null}. diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java b/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java index 5f5fe475a4..4e3520dbfe 100644 --- a/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java +++ b/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java @@ -21,7 +21,7 @@ /** * Provides information about the current Maven runtime. - * + * * @since 3.0.2 */ public interface RuntimeInformation @@ -29,7 +29,7 @@ public interface RuntimeInformation /** * Retrieves the current Maven version, for example "3.0.2". - * + * * @return The current Maven version or an empty string if unknown, never {@code null}. */ String getMavenVersion(); @@ -38,7 +38,7 @@ public interface RuntimeInformation * Checks whether the current Maven runtime matches the specified version range. A version range can either use the * usual mathematical syntax "[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short form for * "[2.2.1,)", i.e. denotes the minimum version required. - * + * * @param versionRange The version range to match the current Maven runtime against, must not be {@code null}. * @return {@code true} if the current Maven runtime matches the specified version range, {@code false} otherwise. * @throws IllegalArgumentException If the specified version range is {@code null}, empty or otherwise not a valid diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java index ea8b677efb..ae62ea2b88 100644 --- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java +++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java @@ -31,7 +31,7 @@ public class SessionScope implements Scope -{ +{ private static final Provider SEEDED_KEY_PROVIDER = new Provider() { public Object get() diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java index 7c39474707..733f30834a 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java @@ -112,17 +112,17 @@ public boolean equals( Object obj ) { return false; } - + if ( this == obj ) { return true; } - + if ( !( obj instanceof DefaultToolchain ) ) { return false; } - + DefaultToolchain other = (DefaultToolchain) obj; if ( type == null ? other.type != null : !type.equals( other.type ) ) @@ -132,12 +132,12 @@ public boolean equals( Object obj ) Properties thisProvides = this.getModel().getProvides(); Properties otherProvides = other.getModel().getProvides(); - + if ( thisProvides == null ? otherProvides != null : !thisProvides.equals( otherProvides ) ) { return false; } - + return true; } @@ -145,7 +145,7 @@ public boolean equals( Object obj ) public int hashCode() { int hashCode = ( type == null ) ? 0 : type.hashCode(); - + if ( this.getModel().getProvides() != null ) { hashCode = 31 * hashCode + this.getModel().getProvides().hashCode(); diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java index 95fe15f528..591afd84ea 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java @@ -84,7 +84,7 @@ Map retrieveContext( MavenSession session ) desc.setArtifactId( PluginDescriptor.getDefaultPluginArtifactId( "toolchains" ) ); MavenProject current = session.getCurrentProject(); - + if ( current != null ) { //TODO: why is this using the context diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java index c6c6ebf220..2a71346542 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java @@ -21,7 +21,7 @@ /** * Toolchain interface. - * + * * @author Milos Kleint * @author Jason van Zyl * @since 2.0.9 @@ -31,7 +31,7 @@ public interface Toolchain /** * get the type of toolchain. - * + * * @return the toolchain type */ String getType(); diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java index c1c2aa90f7..115eede3de 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java @@ -23,7 +23,7 @@ /** * Internal toolchain factory, to prepare toolchains instances. - * + * * @author mkleint * @since 2.0.9 */ diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java index 2150a19b9f..249a1a5861 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java @@ -24,7 +24,7 @@ /** * Public API for a toolchain-aware plugin to get expected toolchain instance. - * + * * @author mkleint * @since 2.0.9 */ diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java index a877772d10..67131ac042 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java @@ -24,7 +24,7 @@ /** * Component for use by the maven-toolchains-plugin only. - * + * * @author mkleint * @since 2.0.9 */ @@ -33,7 +33,7 @@ public interface ToolchainManagerPrivate /** * Retrieves the toolchains of given type from the user settings. - * + * * @since 3.0 (addition of the MavenSession parameter) */ ToolchainPrivate[] getToolchainsForType( String type, MavenSession context ) @@ -41,7 +41,7 @@ ToolchainPrivate[] getToolchainsForType( String type, MavenSession context ) /** * Stores the toolchain into build context. - * + * * @since 2.0.9 */ void storeToolchainToBuildContext( ToolchainPrivate toolchain, MavenSession context ); diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java index 4d94a13562..4bb4052a90 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java @@ -26,7 +26,7 @@ /** * Builds the toolchains model from a previously configured filesystem path to the toolchains file. * Note: This is an internal component whose interface can change without prior notice. - * + * * @author Benjamin Bentmann */ public interface ToolchainsBuilder @@ -34,7 +34,7 @@ public interface ToolchainsBuilder /** * Builds the toolchains model from the configured toolchain files. - * + * * @param userToolchainsFile The path to the toolchains file, may be null to disable parsing. * @return The toolchains model or null if no toolchain file was configured or the configured file does * not exist. diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java index 494aaf896b..cb14ada17d 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java @@ -23,7 +23,7 @@ /** * JDK toolchain interface. - * + * * @author Jason van Zyl * @author Milos Kleint * @since 2.0.9, renamed from JavaToolChain in 3.2.4 diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java index 9b790d8f2d..017caa61a7 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java @@ -39,7 +39,7 @@ * JDK toolchain factory. * This is a ToolchainFactory Plexus component registered with * jdk hint. - * + * * @author mkleint * @since 2.0.9, renamed from DefaultJavaToolchainFactory in 3.2.4 */ @@ -62,7 +62,7 @@ public ToolchainPrivate createToolchain( ToolchainModel model ) JavaToolchainImpl jtc = new JavaToolchainImpl( model, logger ); // populate the provides section - Properties provides = model.getProvides(); + Properties provides = model.getProvides(); for ( Entry provide : provides.entrySet() ) { String key = (String) provide.getKey(); diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java index 71c2ce8ce3..e65bcb1330 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java @@ -29,7 +29,7 @@ /** * JDK toolchain implementation. - * + * * @author Milos Kleint * @since 2.0.9, renamed from DefaultJavaToolChain in 3.2.4 */ diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo index 101d724eea..2ea33896e7 100644 --- a/maven-core/src/main/mdo/toolchains.mdo +++ b/maven-core/src/main/mdo/toolchains.mdo @@ -61,10 +61,10 @@ Toolchain identification information, which will be matched against project requirements.

Actual content structure is completely open: each toolchain type will define its own format and semantics.

In general, this is a properties format: <name>value</name> with - predefined properties names.

+ predefined properties names.

]]> @@ -168,7 +168,7 @@

Toolchain configuration information, like location or any information that is to be retrieved.

Actual content structure is completely open: each toochain type will define its own format and semantics.

In general, this is a properties format: <name>value</name> with - per-toolchain defined properties names.

+ per-toolchain defined properties names.

]]> diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml index 855e9b7a92..05795bebe7 100644 --- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml +++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml @@ -19,7 +19,7 @@ specific language governing permissions and limitations under the License. --> - @@ -52,9 +52,9 @@ Artifact handlers are required by the dependency resolution mechanism. true - + org.apache.maven.artifact.handler.ArtifactHandler @@ -90,7 +90,7 @@ Artifact handlers are required by the dependency resolution mechanism. java false - + org.apache.maven.artifact.handler.ArtifactHandler @@ -157,7 +157,7 @@ Artifact handlers are required by the dependency resolution mechanism. org.apache.maven.artifact.handler.ArtifactHandler @@ -172,7 +172,7 @@ Artifact handlers are required by the dependency resolution mechanism. org.apache.maven.artifact.handler.ArtifactHandler diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 7149f2d576..79d6c52efe 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -19,7 +19,7 @@ specific language governing permissions and limitations under the License. --> - @@ -96,9 +96,9 @@ Mappings to default lifecycle, specific for each packaging. - + org.apache.maven.lifecycle.mapping.LifecycleMapping @@ -139,7 +139,7 @@ Mappings to default lifecycle, specific for each packaging. - + org.apache.maven.lifecycle.mapping.LifecycleMapping ejb3 @@ -179,7 +179,7 @@ Mappings to default lifecycle, specific for each packaging. - + org.apache.maven.lifecycle.mapping.LifecycleMapping @@ -271,10 +271,10 @@ Mappings to default lifecycle, specific for each packaging. - + org.apache.maven.lifecycle.mapping.LifecycleMapping @@ -350,7 +350,7 @@ Mappings to default lifecycle, specific for each packaging. - + - + +---+ [NOTE] All empty elements above signify optional elements, usage specification. [[2]] <> - + The marmalade mojo packager will: - + [[a]] Locate all *.mmld files within the scripts directory of the project. - + The scripts directory should be tied to the script language within the POM. Until we have multiple language support in the POM, we'll use something like: <<>>. - + [[b]] For each script found: - + [[i]] Execute the script with "gatherMetadata=true" in the context. - - [[ii]] Retrieve the mojo descriptor from the resulting "metadata" + + [[ii]] Retrieve the mojo descriptor from the resulting "metadata" variable in the context. - + [[iii]] Cache the mojo descriptor in aggregator for subsequent output to plugin descriptor file. - + [[c]] Copy all scripts to the target directory. Preserve relative paths. - + [[d]] <> - + [[e]] Use the project's dependencies and other info to form the plugin descriptor's header (non-mojo-specific info). - + [[f]] Use the PluginGenerator from maven-plugin-tools to generate a META-INF/plexus/plugin.xml to the target directory. - + [[g]] Continue with lifecycle. - - This may include compilation of java helper classes, etc. and + + This may include compilation of java helper classes, etc. and plugin-artifact packaging, presumably via 'jar:jar' or similar. - + [[3]] <> - + The marmalade mojo loader will: - + [[a]] Retrieve the implementation spec (this is the path of the script, - relative to the root of the plugin filesystem...jar, etc.) to + relative to the root of the plugin filesystem...jar, etc.) to $path. - + [[b]] Use the context classloader to retrieve a reader to $path. - + [[c]] Build the ScriptBuilder corresponding to the script. - + [[d]] Create a new MarmaladeMojo instance which adapts the mojo calling semantics to the creation/execution of a marmalade script. - + Execution involves: - + [[i]] Creating a new MarmaladeScript instance. - + [[ii]] Creating an execution context which references all I/O from the main Maven execution thread, and embeds: - + - #request == MavenExecutionRequest - + - #response == MavenExecutionResponse - + - Any globally configured environmental constraints, such as a global preserve-whitespace setting - + [[iii]] Execution of the script using the execution context. - + [[iv]] Export of the resulting context, minus any surviving input variables, to the MavenExecutionResponse's out-params. *Implementation Issues [[1]] How do we make Maven smart enough to switch loader implementations based - on some sub-type of maven-plugin? - - This is important, since the default mojo loader will not be smart - enough to do the job, and embedding this behavior in that loader is not + on some sub-type of maven-plugin? + + This is important, since the default mojo loader will not be smart + enough to do the job, and embedding this behavior in that loader is not scalable or extensible enough to accommodate future expansion into the realms of jython, groovy, etc... - + <> - + We'll plan on using some sort of language specification in the mojo descriptor to determine which mojo loader to use, then we'll populate the PluginLoader/PluginManager with a map of known languages->loaders. - - [[2]] How do we make the plugin:install process smart enough to switch + + [[2]] How do we make the plugin:install process smart enough to switch generator implementations based on some sub-type of maven-plugin? - + This is closely related to [1] above. - + <> - + See update in [3]. - - [[3]] Do we want to allow mixed-bag plugin implementations? - - These might include a mix of standard-java and marmalade mojos. It - strikes me that many marmalade-based mojos may use beans/tags that are - actually adapter classes for other third-party APIs (why they wouldn't - implement everything as java mojos in this cases is beyond me). If they - have java source inside the plugin source directory, we should probably + + [[3]] Do we want to allow mixed-bag plugin implementations? + + These might include a mix of standard-java and marmalade mojos. It + strikes me that many marmalade-based mojos may use beans/tags that are + actually adapter classes for other third-party APIs (why they wouldn't + implement everything as java mojos in this cases is beyond me). If they + have java source inside the plugin source directory, we should probably compile it and bundle it with the plugin scripts; but what if this source - also has mojo annotations? This will have implications for [1] and [2] + also has mojo annotations? This will have implications for [1] and [2] above. - + <> - + We will plan on allowing this sort of implementation, and simply start by applying all known generators which have a source directory set in - the POM (or later, have a section, maybe). At any rate, + the POM (or later, have a section, maybe). At any rate, helper classes will be allowed for script-based mojos. diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java index 8fca2794cc..57d374fd88 100644 --- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java @@ -92,7 +92,7 @@ protected File getProject( String name ) * We need to customize the standard Plexus container with the plugin discovery listener which * is what looks for the META-INF/maven/plugin.xml resources that enter the system when a Maven * plugin is loaded. - * + * * We also need to customize the Plexus container with a standard plugin discovery listener * which is the MavenPluginCollector. When a Maven plugin is discovered the MavenPluginCollector * collects the plugin descriptors which are found. @@ -104,7 +104,7 @@ protected void customizeContainerConfiguration( ContainerConfiguration container protected MavenExecutionRequest createMavenExecutionRequest( File pom ) throws Exception - { + { MavenExecutionRequest request = new DefaultMavenExecutionRequest() .setPom( pom ) .setProjectPresent( true ) @@ -122,16 +122,16 @@ protected MavenExecutionRequest createMavenExecutionRequest( File pom ) // a Maven subclass because we don't want to couple maven to the project builder which we need to // separate. protected MavenSession createMavenSession( File pom ) - throws Exception + throws Exception { return createMavenSession( pom, new Properties() ); } - + protected MavenSession createMavenSession( File pom, Properties executionProperties ) throws Exception { MavenExecutionRequest request = createMavenExecutionRequest( pom ); - + ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest() .setLocalRepository( request.getLocalRepository() ) .setRemoteRepositories( request.getRemoteRepositories() ) @@ -179,7 +179,7 @@ protected MavenProject createStubMavenProject() model.setVersion( "1.0" ); return new MavenProject( model ); } - + protected List getRemoteRepositories() throws InvalidRepositoryException { @@ -212,7 +212,7 @@ protected ArtifactRepository getLocalRepository() return repositorySystem.createLocalRepository( repoDir ); } - + protected class ProjectBuilder { private MavenProject project; @@ -228,11 +228,11 @@ public ProjectBuilder( String groupId, String artifactId, String version ) model.setModelVersion( "4.0.0" ); model.setGroupId( groupId ); model.setArtifactId( artifactId ); - model.setVersion( version ); + model.setVersion( version ); model.setBuild( new Build() ); - project = new MavenProject( model ); + project = new MavenProject( model ); } - + public ProjectBuilder setGroupId( String groupId ) { project.setGroupId( groupId ); @@ -244,30 +244,30 @@ public ProjectBuilder setArtifactId( String artifactId ) project.setArtifactId( artifactId ); return this; } - + public ProjectBuilder setVersion( String version ) { project.setVersion( version ); return this; } - + // Dependencies // public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope ) { return addDependency( groupId, artifactId, version, scope, (Exclusion)null ); } - + public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion ) { - return addDependency( groupId, artifactId, version, scope, null, exclusion ); + return addDependency( groupId, artifactId, version, scope, null, exclusion ); } public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath ) { - return addDependency( groupId, artifactId, version, scope, systemPath, null ); + return addDependency( groupId, artifactId, version, scope, systemPath, null ); } - + public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath, Exclusion exclusion ) { Dependency d = new Dependency(); @@ -275,60 +275,60 @@ public ProjectBuilder addDependency( String groupId, String artifactId, String v d.setArtifactId( artifactId ); d.setVersion( version ); d.setScope( scope ); - + if ( systemPath != null && scope.equals( Artifact.SCOPE_SYSTEM ) ) { d.setSystemPath( systemPath ); } - + if ( exclusion != null ) { d.addExclusion( exclusion ); } - + project.getDependencies().add( d ); - + return this; } - + // Plugins // public ProjectBuilder addPlugin( Plugin plugin ) { - project.getBuildPlugins().add( plugin ); + project.getBuildPlugins().add( plugin ); return this; } - + public MavenProject get() { return project; - } - } - + } + } + protected class PluginBuilder { private Plugin plugin; - + public PluginBuilder( String groupId, String artifactId, String version ) { plugin = new Plugin(); plugin.setGroupId( groupId ); plugin.setArtifactId( artifactId ); - plugin.setVersion( version ); + plugin.setVersion( version ); } - + // Dependencies // public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion ) { - return addDependency( groupId, artifactId, version, scope, exclusion ); + return addDependency( groupId, artifactId, version, scope, exclusion ); } public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath ) { - return addDependency( groupId, artifactId, version, scope, systemPath, null ); + return addDependency( groupId, artifactId, version, scope, systemPath, null ); } - + public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath, Exclusion exclusion ) { Dependency d = new Dependency(); @@ -336,25 +336,25 @@ public PluginBuilder addDependency( String groupId, String artifactId, String ve d.setArtifactId( artifactId ); d.setVersion( version ); d.setScope( scope ); - + if ( systemPath != null && scope.equals( Artifact.SCOPE_SYSTEM ) ) { d.setSystemPath( systemPath ); } - + if ( exclusion != null ) { d.addExclusion( exclusion ); } - + plugin.getDependencies().add( d ); - + return this; } - + public Plugin get() { return plugin; - } - } + } + } } diff --git a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java index 7df09f6049..17aeab3138 100644 --- a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java +++ b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java @@ -6,9 +6,9 @@ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License. You may obtain a * copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express * or implied. See the License for the specific language governing permissions and limitations under diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java index 67a757504d..ca75c3f115 100644 --- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java +++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java @@ -65,7 +65,7 @@ public void testExclusionsInDependencies() new ProjectBuilder( project ).addDependency( "org.apache.maven.its", "b", "0.1", Artifact.SCOPE_RUNTIME, exclusion ); - + Set artifactDependencies = resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session ); assertEquals( 0, artifactDependencies.size() ); @@ -75,7 +75,7 @@ public void testExclusionsInDependencies() assertEquals( "b", artifactDependencies.iterator().next().getArtifactId() ); } */ - + public void testSystemScopeDependencies() throws Exception { @@ -88,8 +88,8 @@ public void testSystemScopeDependencies() Set artifactDependencies = resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session ); assertEquals( 1, artifactDependencies.size() ); - } - + } + public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements() throws Exception { @@ -102,10 +102,10 @@ public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements() MavenProject project = session.getCurrentProject(); project.setArtifacts( resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session ) ); - + List elements = project.getCompileClasspathElements(); assertEquals( 2, elements.size() ); - + @SuppressWarnings( "deprecation" ) List artifacts = project.getCompileArtifacts(); assertEquals( 1, artifacts.size() ); diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java index 698c6d1514..fbb8b9003a 100644 --- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java +++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java @@ -39,7 +39,7 @@ public void testCopyDefault() assertNotNull( copy ); assertNotSame( copy, original ); } - + public void testResultWithNullTopologicallySortedProjectsIsEmptyList() { MavenExecutionResult result = new DefaultMavenExecutionResult(); diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java index b18fa10efa..04be08b4ab 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java @@ -213,14 +213,14 @@ public void testCalculationOfBuildPlanWithMultipleExecutionsOfModello() //[05] modello:xpp3-writer //[06] modello:java //[07] modello:xpp3-reader - //[08] plugin:descriptor + //[08] plugin:descriptor //[09] resources:resources //[10] compiler:compile //[11] resources:testResources //[12] compiler:testCompile //[13] surefire:test //[14] jar:jar - //[15] plugin:addPluginArtifactMetadata + //[15] plugin:addPluginArtifactMetadata //[16] install:install // diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java index e49162923c..bc87702298 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java @@ -45,7 +45,7 @@ protected void setUp() super.setUp(); pluginManager = (DefaultBuildPluginManager) lookup( BuildPluginManager.class ); } - + @Override protected void tearDown() throws Exception @@ -62,7 +62,7 @@ protected String getProjectsDirectory() public void testPluginLoading() throws Exception { - MavenSession session = createMavenSession( null ); + MavenSession session = createMavenSession( null ); Plugin plugin = new Plugin(); plugin.setGroupId( "org.apache.maven.its.plugins" ); plugin.setArtifactId( "maven-it-plugin" ); @@ -72,17 +72,17 @@ public void testPluginLoading() session.getRepositorySession() ); assertNotNull( pluginDescriptor ); } - + public void testMojoDescriptorRetrieval() throws Exception { - MavenSession session = createMavenSession( null ); + MavenSession session = createMavenSession( null ); String goal = "it"; Plugin plugin = new Plugin(); plugin.setGroupId( "org.apache.maven.its.plugins" ); plugin.setArtifactId( "maven-it-plugin" ); plugin.setVersion( "0.1" ); - + MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject().getRemotePluginRepositories(), session.getRepositorySession() ); @@ -90,53 +90,53 @@ public void testMojoDescriptorRetrieval() assertEquals( goal, mojoDescriptor.getGoal() ); // igorf: plugin realm comes later // assertNotNull( mojoDescriptor.getRealm() ); - + PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor(); assertNotNull( pluginDescriptor ); assertEquals( "org.apache.maven.its.plugins", pluginDescriptor.getGroupId() ); assertEquals( "maven-it-plugin", pluginDescriptor.getArtifactId() ); assertEquals( "0.1", pluginDescriptor.getVersion() ); } - + // ----------------------------------------------------------------------------------------------- // Tests which exercise the lifecycle executor when it is dealing with individual goals. // ----------------------------------------------------------------------------------------------- - + //TODO: These two tests display a lack of symmetry with respect to the input which is a free form string and the // mojo descriptor which comes back. All the free form parsing needs to be done somewhere else, this is // really the function of the CLI, and then the pre-processing of that output still needs to be fed into // a hinting process which helps flesh out the full specification of the plugin. The plugin manager should // only deal in concrete terms -- all version finding mumbo jumbo is a customization to base functionality // the plugin manager provides. - + public void testRemoteResourcesPlugin() throws Exception { //TODO: turn an equivalent back on when the RR plugin is released. - + /* This will not work until the RR plugin is released to get rid of the binding to the reporting exception which is a mistake. - + This happpens after removing the reporting API from the core: - + java.lang.NoClassDefFoundError: org/apache/maven/reporting/MavenReportException - - MavenSession session = createMavenSession( getProject( "project-with-inheritance" ) ); + + MavenSession session = createMavenSession( getProject( "project-with-inheritance" ) ); String goal = "process"; - + Plugin plugin = new Plugin(); plugin.setGroupId( "org.apache.maven.plugins" ); plugin.setArtifactId( "maven-remote-resources-plugin" ); plugin.setVersion( "1.0-beta-2" ); - - MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject(), session.getLocalRepository() ); + + MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject(), session.getLocalRepository() ); assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.0-beta-2" ); MojoExecution mojoExecution = new MojoExecution( mojoDescriptor ); pluginManager.executeMojo( session, mojoExecution ); */ } - + //TODO: this will be the basis of the customizable lifecycle execution so need to figure this out quickly. public void testSurefirePlugin() throws Exception @@ -151,22 +151,22 @@ public void testSurefirePlugin() plugin.setVersion( "2.4.2" ); // The project has already been fully interpolated so getting the raw mojoDescriptor is not going to have the processes configuration. - MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() ); + MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() ); assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" ); - + System.out.println( session.getCurrentProject().getBuild().getPluginsAsMap() ); - + Xpp3Dom configuration = (Xpp3Dom) session.getCurrentProject().getBuild().getPluginsAsMap().get( plugin.getKey() ).getExecutions().get( 0 ).getConfiguration(); MojoExecution mojoExecution = new MojoExecution( mojoDescriptor, configuration ); pluginManager.executeMojo( session, mojoExecution ); */ } - + public void testMojoConfigurationIsMergedCorrectly() throws Exception { } - + /** * The case where the user wants to specify an alternate version of the underlying tool. Common case * is in the Antlr plugin which comes bundled with a version of Antlr but the user often times needs @@ -177,7 +177,7 @@ public void testMojoWhereInternallyStatedDependencyIsOverriddenByProject() { } - /** + /** * The case where you have a plugin in the current build that you want to be used on projects in * the current build. */ @@ -203,13 +203,13 @@ public void testMojoThatRequiresExecutionToAGivenPhaseBeforeExecutingItself() throws Exception { } - + // test that mojo which does not require dependency resolution trigger no downloading of dependencies - + // test interpolation of basedir values in mojo configuration - + // test a build where projects use different versions of the same plugin - + public void testThatPluginDependencyThatHasSystemScopeIsResolved() throws Exception { @@ -218,27 +218,27 @@ public void testThatPluginDependencyThatHasSystemScopeIsResolved() Plugin plugin = new PluginBuilder( "org.apache.maven", "project-test", "1.0" ) .addDependency( "org.apache.maven", "system-dependency", "1.0", Artifact.SCOPE_SYSTEM, systemPath.getAbsolutePath() ) - .get(); + .get(); MavenProject pluginProject = new ProjectBuilder( "org.apache.maven", "project-test", "1.0" ) .addPlugin( plugin ) .addDependency( "junit", "junit", "3.8.1", Artifact.SCOPE_COMPILE ) - .get(); - + .get(); + // i'm making this artifact which is assumed to come from a pom in the metadata processor, then it tries to create a POM artifact // and parse it for the dependencies and it blows up. // // we need to pass this through as is so it doesn't get parsed again. Artifact pluginArtifact = new ProjectArtifact( pluginProject ); - + Set artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getPluginArtifactRepositories() ); System.out.println( artifacts ); */ - + MavenSession session = createMavenSession( getProject( "project-contributing-system-scope-plugin-dep" ) ); MavenProject project = session.getCurrentProject(); - Plugin plugin = project.getPlugin( "org.apache.maven.its.plugins:maven-it-plugin" ); - + Plugin plugin = project.getPlugin( "org.apache.maven.its.plugins:maven-it-plugin" ); + RepositoryRequest repositoryRequest = new DefaultRepositoryRequest(); repositoryRequest.setLocalRepository( getLocalRepository() ); repositoryRequest.setRemoteRepositories( getPluginArtifactRepositories() ); @@ -257,23 +257,23 @@ public void testThatPluginDependencyThatHasSystemScopeIsResolved() return; } } - + fail( "Can't find the system scoped dependency in the plugin artifacts." ); } - + // ----------------------------------------------------------------------------------------------- // Testing help // ----------------------------------------------------------------------------------------------- protected void assertPluginDescriptor( MojoDescriptor mojoDescriptor, String groupId, String artifactId, String version ) { - assertNotNull( mojoDescriptor ); + assertNotNull( mojoDescriptor ); PluginDescriptor pd = mojoDescriptor.getPluginDescriptor(); assertNotNull( pd ); assertEquals( groupId, pd.getGroupId() ); assertEquals( artifactId, pd.getArtifactId() ); - assertEquals( version, pd.getVersion() ); - } + assertEquals( version, pd.getVersion() ); + } public void testPluginRealmCache() throws Exception @@ -299,7 +299,7 @@ public void testPluginRealmCache() assertNotNull( descriptor.getRealm() ); assertNotNull( descriptor.getImplementationClass() ); } - + // reload plugin realm from cache session = createMavenSession( getProject( "project-contributing-system-scope-plugin-dep" ) ); project = session.getCurrentProject(); diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java index 7f94bac7f8..ead7ae2e16 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java @@ -29,7 +29,7 @@ /** * MNG-3131 - * + * * @author Robert Scholte * */ @@ -49,24 +49,24 @@ public void testMissingRequiredStringArrayTypeParameter() Parameter parameter = new Parameter(); parameter.setType( "java.lang.String[]" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "\n" + + " ...\n" + " \n" + " VALUE\n" + - " \n" + + " \n" + ".\n", exception.buildDiagnosticMessage() ); } - + public void testMissingRequiredCollectionTypeParameter() { MojoDescriptor mojoDescriptor = new MojoDescriptor(); @@ -79,21 +79,21 @@ public void testMissingRequiredCollectionTypeParameter() Parameter parameter = new Parameter(); parameter.setType( "java.util.List" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "\n" + + " ...\n" + " \n" + " VALUE\n" + - " \n" + + " \n" + ".\n", exception.buildDiagnosticMessage() ); } @@ -109,21 +109,21 @@ public void testMissingRequiredMapTypeParameter() Parameter parameter = new Parameter(); parameter.setType( "java.util.Map" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "\n" + + " ...\n" + " \n" + " VALUE\n" + - " \n" + + " \n" + ".\n", exception.buildDiagnosticMessage() ); } @@ -139,24 +139,24 @@ public void testMissingRequiredPropertiesTypeParameter() Parameter parameter = new Parameter(); parameter.setType( "java.util.Properties" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "\n" + + " ...\n" + " \n" + " \n" + " KEY\n" + " VALUE\n" + " \n" + - " \n" + + " \n" + ".\n", exception.buildDiagnosticMessage() ); } diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index 4cc1e89c8a..73bdbcae45 100644 --- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -6,9 +6,9 @@ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License. You may obtain a * copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express * or implied. See the License for the specific language governing permissions and limitations under @@ -55,7 +55,7 @@ protected void setUp() throws Exception { super.setUp(); - + if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) ) { projectBuilder = lookup( ProjectBuilder.class, "test" ); @@ -65,9 +65,9 @@ protected void setUp() // default over to the main project builder... projectBuilder = lookup( ProjectBuilder.class ); } - - repositorySystem = lookup( RepositorySystem.class ); - } + + repositorySystem = lookup( RepositorySystem.class ); + } @Override protected void tearDown() diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index d7c247060e..13c32abbee 100644 --- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -143,7 +143,7 @@ protected ArtifactRepository getLocalRepository() null, null ); return r; } - + public void xtestLoop() throws Exception { diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java index e6b2693c6d..8ff912fbe3 100644 --- a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java +++ b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java @@ -34,7 +34,7 @@ /** * A stub implementation that assumes an empty lifecycle to bypass interaction with the plugin manager and to avoid * plugin artifact resolution from repositories. - * + * * @author Benjamin Bentmann */ public class EmptyLifecycleExecutor @@ -50,7 +50,7 @@ public MavenExecutionPlan calculateExecutionPlan( MavenSession session, boolean { return new MavenExecutionPlan( null, null ); } - + public void execute( MavenSession session ) { } diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java index e59988d84c..21e37f1f55 100644 --- a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java +++ b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java @@ -28,7 +28,7 @@ /** * A stub implementation to bypass artifact resolution from repositories. - * + * * @author Benjamin Bentmann */ public class EmptyProjectBuildingHelper diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java index a37ccf734b..68727013a6 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java @@ -28,7 +28,7 @@ /** * Tests {@link ExtensionDescriptorBuilder}. - * + * * @author Benjamin Bentmann */ public class ExtensionDescriptorBuilderTest diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java index c6248adec6..0c5cd07d45 100644 --- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java @@ -47,7 +47,7 @@ public void testShouldInterpretChildPathAdjustmentBasedOnModulePaths() childModel.setArtifactId( "artifact" ); MavenProject childProject = new MavenProject( childModel ); - + File childFile = new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis() + "/child/pom.xml" ); @@ -57,7 +57,7 @@ public void testShouldInterpretChildPathAdjustmentBasedOnModulePaths() String adjustment = parentProject.getModulePathAdjustment( childProject ); assertNotNull( adjustment ); - + assertEquals( "..", adjustment ); } @@ -147,11 +147,11 @@ public void testGetModulePathAdjustment() assertEquals( "..", pathAdjustment ); } - + public void testCloneWithDistributionManagement() throws Exception { - + File f = getFileForClasspathResource( "distributionManagement-pom.xml" ); MavenProject projectToClone = getProject( f ); diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 392d9cd30a..f17539b157 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -50,9 +50,9 @@ public class PomConstructionTest private static String BASE_MIXIN_DIR = BASE_DIR + "/resources-mixins"; private DefaultProjectBuilder projectBuilder; - + private RepositorySystem repositorySystem; - + private File testDirectory; @Override @@ -71,7 +71,7 @@ protected void setUp() projectBuilder = (DefaultProjectBuilder) lookup( ProjectBuilder.class ); repositorySystem = lookup( RepositorySystem.class ); } - + @Override protected void tearDown() throws Exception @@ -80,13 +80,13 @@ protected void tearDown() super.tearDown(); } - + /** - * Will throw exception if url is empty. MNG-4050 + * Will throw exception if url is empty. MNG-4050 * * @throws Exception */ - + public void testEmptyUrl() throws Exception { @@ -95,7 +95,7 @@ public void testEmptyUrl() /** * Tests that modules is not overriden by profile - * + * * @throws Exception */ /* MNG-786*/ @@ -137,10 +137,10 @@ public void testPluginConfigProperties() PomTestWrapper pom = buildPom( "plugin-config-properties" ); assertEquals( "my.property", pom.getValue( "build/plugins[1]/configuration[1]/systemProperties[1]/property[1]/name" ) ); } - + /*MNG-3900*/ public void testProfilePropertiesInterpolation() - throws Exception + throws Exception { PomTestWrapper pom = buildPom( "profile-properties-interpolation", "interpolation-profile" ); assertEquals( "PASSED", pom.getValue( "properties[1]/test" ) ); @@ -267,15 +267,15 @@ public void testMaven() throws Exception { PomTestWrapper pom = buildPomFromMavenProject( "maven-build/sub/pom.xml", null ); - - for( String s: pom.getMavenProject().getTestClasspathElements() ) + + for( String s: pom.getMavenProject().getTestClasspathElements() ) { System.out.println( s ); } - + } */ - + /* MNG-3567*/ public void testPluginManagementInherited() throws Exception @@ -349,13 +349,13 @@ public void testExecutionConfiguration() assertEquals( "src/main/mdo/security.xml", ( pom.getValue( "build/plugins[1]/executions[2]/configuration[1]/model" ) ) ); } - + /* public void testPluginConfigDuplicate() throws Exception { PomTestWrapper pom = buildPom( "plugin-config-duplicate/dup" ); -} +} */ @@ -839,14 +839,14 @@ public void testAppendOfInheritedPluginConfigurationWithNoProfile() { testAppendOfInheritedPluginConfiguration( "no-profile" ); } - + /* MNG-2591*/ public void testAppendOfInheritedPluginConfigurationWithActiveProfile() throws Exception { testAppendOfInheritedPluginConfiguration( "with-profile" ); } - + private void testAppendOfInheritedPluginConfiguration( String test ) throws Exception { @@ -955,14 +955,14 @@ public void testProfileInjectedDependencies() assertEquals( "b", pom.getValue( "dependencies[3]/artifactId" ) ); assertEquals( "d", pom.getValue( "dependencies[4]/artifactId" ) ); } - + /** IT-0021*/ public void testProfileDependenciesMultipleProfiles() throws Exception { PomTestWrapper pom = buildPom( "profile-dependencies-multiple-profiles", "profile-1", "profile-2" ); assertEquals(2, ( (List) pom.getValue( "dependencies" ) ).size() ); - } + } public void testDependencyInheritance() throws Exception @@ -993,7 +993,7 @@ public void testProfileModuleInheritance() PomTestWrapper pom = this.buildPom( "profile-module-inheritance/sub", "dist" ); assertEquals( 0, ( (List) pom.getValue( "modules" ) ).size() ); } - + /** MNG-3621 */ public void testUncPath() throws Exception @@ -1001,7 +1001,7 @@ public void testUncPath() PomTestWrapper pom = this.buildPom( "unc-path/sub" ); assertEquals( "file:////host/site/test-child", pom.getValue( "distributionManagement/site/url" ) ); } - + /** MNG-2006 */ public void testUrlAppendWithChildPathAdjustment() throws Exception @@ -1012,7 +1012,7 @@ public void testUrlAppendWithChildPathAdjustment() assertEquals( "http://scm.project.url/child", pom.getValue( "scm/connection" ) ); assertEquals( "https://scm.project.url/child", pom.getValue( "scm/developerConnection" ) ); assertEquals( "http://site.project.url/child", pom.getValue( "distributionManagement/site/url" ) ); - } + } /** MNG-0479 */ public void testRepoInheritance() @@ -1021,15 +1021,15 @@ public void testRepoInheritance() PomTestWrapper pom = this.buildPom( "repo-inheritance" ); assertEquals( 1, ( (List) pom.getValue( "repositories" ) ).size() ); assertEquals( "it0043", pom.getValue( "repositories[1]/name" ) ); - } - + } + public void testEmptyScm() throws Exception { PomTestWrapper pom = this.buildPom( "empty-scm" ); assertNull( pom.getValue( "scm" ) ); - } - + } + public void testPluginConfigurationUsingAttributesWithoutPluginManagement() throws Exception { @@ -1100,8 +1100,8 @@ public void testReportingPluginConfig() assertEquals( "childParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[2]" ) ); assertEquals( " preserve space ", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[3]" ) ); assertEquals( "true", pom.getValue( "reporting/plugins[1]/configuration/booleanParam" ) ); - } - + } + public void testPropertiesNoDuplication() throws Exception { @@ -1381,7 +1381,7 @@ public void testInheritedPropertiesInterpolatedWithValuesFromChildWithActiveProf assertEquals( "CHILD", pom.getValue( "properties/overridden" ) ); assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) ); } - + /* MNG-3545 */ public void testProfileDefaultActivation() throws Exception @@ -1390,30 +1390,30 @@ public void testProfileDefaultActivation() assertEquals( 1, pom.getMavenProject().getActiveProfiles().size() ); assertEquals( 1, ( (List) pom.getValue( "build/plugins" ) ).size() ); assertEquals( "2.1", pom.getValue( "build/plugins[1]/version" ) ); - } - + } + /* MNG-1995 */ public void testBooleanInterpolation() throws Exception { PomTestWrapper pom = buildPom( "boolean-interpolation" ); - assertTrue ((Boolean) pom.getValue( "repositories[1]/releases/enabled" ) ); - assertTrue((Boolean) pom.getValue( "build/resources[1]/filtering" ) ); - } + assertTrue ((Boolean) pom.getValue( "repositories[1]/releases/enabled" ) ); + assertTrue((Boolean) pom.getValue( "build/resources[1]/filtering" ) ); + } + - /* MNG-3899 */ public void testBuildExtensionInheritance() throws Exception { - PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" ); + PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" ); assertEquals( 3, ( (List) pom.getValue( "build/extensions" ) ).size() ); assertEquals( "b", pom.getValue( "build/extensions[1]/artifactId" ) ); assertEquals( "a", pom.getValue( "build/extensions[2]/artifactId" ) ); assertEquals( "0.2", pom.getValue( "build/extensions[2]/version" ) ); assertEquals( "c", pom.getValue( "build/extensions[3]/artifactId" ) ); } - + /*MNG-1957*/ public void testJdkActivation() throws Exception @@ -1426,16 +1426,16 @@ public void testJdkActivation() assertEquals( "PASSED", pom.getValue( "properties/jdkProperty3" ) ); assertEquals( "PASSED", pom.getValue( "properties/jdkProperty2" ) ); assertEquals( "PASSED", pom.getValue( "properties/jdkProperty1" ) ); - } - + } + /* MNG-2174 */ public void testProfilePluginMngDependencies() throws Exception { PomTestWrapper pom = buildPom( "profile-plugin-mng-dependencies/sub", "maven-core-it" ); assertEquals( "a", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) ); - } - + } + /** MNG-4116 */ public void testPercentEncodedUrlsMustNotBeDecoded() throws Exception @@ -1453,7 +1453,7 @@ public void testPercentEncodedUrlsMustNotBeDecoded() pom.getValue( "distributionManagement/snapshotRepository/url" ) ); assertEquals( "scm:svn:svn+ssh://site.apache.org/spacy%20path", pom.getValue( "distributionManagement/site/url" ) ); - } + } public void testPluginManagementInheritance() throws Exception @@ -1461,57 +1461,57 @@ public void testPluginManagementInheritance() PomTestWrapper pom = this.buildPom( "plugin-management-inheritance" ); assertEquals( "0.1-stub-SNAPSHOT", pom.getValue( "build/pluginManagement/plugins[@artifactId='maven-compiler-plugin']/version" ) ); - } - + } + public void testProfilePlugins() throws Exception { PomTestWrapper pom = this.buildPom( "profile-plugins", "standard" ); assertEquals( 2, ( (List) pom.getValue( "build/plugins" ) ).size() ); assertEquals( "maven-assembly2-plugin", pom.getValue( "build/plugins[2]/artifactId" ) ); - } - + } + public void testPluginInheritanceSimple() throws Exception { PomTestWrapper pom = this.buildPom( "plugin-inheritance-simple/sub" ); - assertEquals( 2, ( (List) pom.getValue( "build/plugins" ) ).size() ); - } - + assertEquals( 2, ( (List) pom.getValue( "build/plugins" ) ).size() ); + } + public void testPluginManagementDuplicate() throws Exception { PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" ); assertEquals( 12, ( (List) pom.getValue( "build/pluginManagement/plugins" ) ).size() ); - } - + } + public void testDistributionManagement() throws Exception { PomTestWrapper pom = this.buildPom( "distribution-management" ); assertEquals( "legacy", pom.getValue( "distributionManagement/repository/layout" ) ); - } - + } + public void testDependencyScopeInheritance() throws Exception { PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" ); String scope = (String) pom.getValue( "dependencies[1]/scope" ); assertEquals( "compile", scope ); - } - + } + public void testDependencyScope() throws Exception { buildPom( "dependency-scope/sub" ); - } - + } + //This will fail on a validation error if incorrect public void testDependencyManagementWithInterpolation() throws Exception { buildPom( "dependency-management-with-interpolation/sub" ); - } + } public void testInterpolationWithSystemProperty() throws Exception @@ -1520,7 +1520,7 @@ public void testInterpolationWithSystemProperty() sysProps.setProperty( "system.property", "PASSED" ); PomTestWrapper pom = buildPom( "sytem-property-interpolation", sysProps ); assertEquals( "PASSED", pom.getValue( "name" ) ); - } + } /* MNG-4129 */ public void testPluginExecutionInheritanceWhenChildDoesNotDeclarePlugin() @@ -1543,8 +1543,8 @@ public void testPluginExecutionInheritanceWhenChildDoesDeclarePluginAsWell() (List) pom.getValue( "build/pluginsAsMap[@name='org.apache.maven.its.plugins:maven-it-plugin-log-file']/executions" ); assertEquals( 1, executions.size() ); assertEquals( "inherited-execution", executions.get( 0 ).getId() ); - } - + } + /* MNG-4193 */ public void testValidationErrorUponNonUniqueArtifactRepositoryId() throws Exception @@ -1574,7 +1574,7 @@ public void testValidationErrorUponNonUniquePluginRepositoryId() // expected } } - + /* MNG-4193 */ public void testValidationErrorUponNonUniqueArtifactRepositoryIdInProfile() throws Exception @@ -1611,7 +1611,7 @@ public void testPrerequisitesAreNotInherited() { PomTestWrapper pom = buildPom( "prerequisites-inheritance/child" ); assertSame( null, pom.getValue( "prerequisites" ) ); - } + } public void testLicensesAreInheritedButNotAggregated() throws Exception @@ -1620,7 +1620,7 @@ public void testLicensesAreInheritedButNotAggregated() assertEquals( 1, ( (List) pom.getValue( "licenses" ) ).size() ); assertEquals( "child-license", pom.getValue( "licenses[1]/name" ) ); assertEquals( "http://child.url/license", pom.getValue( "licenses[1]/url" ) ); - } + } public void testDevelopersAreInheritedButNotAggregated() throws Exception @@ -1636,7 +1636,7 @@ public void testContributorsAreInheritedButNotAggregated() PomTestWrapper pom = buildPom( "contributors-inheritance/child-2" ); assertEquals( 1, ( (List) pom.getValue( "contributors" ) ).size() ); assertEquals( "child-contributor", pom.getValue( "contributors[1]/name" ) ); - } + } public void testMailingListsAreInheritedButNotAggregated() throws Exception @@ -1644,7 +1644,7 @@ public void testMailingListsAreInheritedButNotAggregated() PomTestWrapper pom = buildPom( "mailing-lists-inheritance/child-2" ); assertEquals( 1, ( (List) pom.getValue( "mailingLists" ) ).size() ); assertEquals( "child-mailing-list", pom.getValue( "mailingLists[1]/name" ) ); - } + } public void testPluginInheritanceOrder() throws Exception @@ -1818,7 +1818,7 @@ private void assertPathWithNormalizedFileSeparators( Object value ) { assertEquals( new File( value.toString() ).getPath(), value.toString() ); } - + private PomTestWrapper buildPom( String pomPath, String... profileIds ) throws Exception { @@ -1863,7 +1863,7 @@ private PomTestWrapper buildPom( String pomPath, boolean lenientValidation, Prop protected void assertModelEquals( PomTestWrapper pom, Object expected, String expression ) { - assertEquals( expected, pom.getValue( expression ) ); + assertEquals( expected, pom.getValue( expression ) ); } private static String createPath( List elements ) diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java index fc12b3e9d3..add3efe8fa 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java @@ -39,16 +39,16 @@ public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements() throws Exception { File pom = getProject( "it0063" ); - + Properties eps = new Properties(); - eps.setProperty( "jre.home", new File( pom.getParentFile(), "jdk/jre" ).getPath() ); - + eps.setProperty( "jre.home", new File( pom.getParentFile(), "jdk/jre" ).getPath() ); + MavenSession session = createMavenSession( pom, eps ); MavenProject project = session.getCurrentProject(); - + // Here we will actually not have any artifacts because the ProjectDependenciesResolver is not involved here. So // right now it's not valid to ask for artifacts unless plugins require the artifacts. - + project.getCompileClasspathElements(); } diff --git a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java index 9a7a72c90b..67c0037b1c 100644 --- a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java +++ b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java @@ -38,14 +38,14 @@ public class TestMetadataSource public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories ) throws ArtifactMetadataRetrievalException - { + { ResolutionGroup rg = super.retrieve( artifact, localRepository, remoteRepositories ); - + for ( Artifact a : rg.getArtifacts() ) { a.setResolved( true ); } - + return rg; } } \ No newline at end of file diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java index ba378030e2..6b103b2c9f 100644 --- a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java @@ -75,7 +75,7 @@ public void testCacheKey() CacheKey k1 = new CacheKey( a1, false, lr1, Collections.singletonList( rr1 ) ); CacheKey k2 = new CacheKey( a2, false, lr2, Collections.singletonList( rr2 ) ); - + assertEquals(k1.hashCode(), k2.hashCode()); } } diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java index 7b6713ee24..2811a8489d 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java @@ -31,7 +31,7 @@ /** * An attribute iterator for JXPath to support Xpp3Dom. - * + * * @author Benjamin Bentmann */ class Xpp3DomAttributeIterator diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java index e1aa29f36b..04514b186c 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java @@ -26,7 +26,7 @@ /** * An attribute pointer for JXPath to support Xpp3Dom. - * + * * @author Benjamin Bentmann */ class Xpp3DomAttributePointer diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java index bf865b25a7..796a5ca0ce 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java @@ -33,7 +33,7 @@ /** * A node iterator for JXPath to support Xpp3Dom. - * + * * @author Benjamin Bentmann */ class Xpp3DomNodeIterator diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java index 59ce300eac..f93bd89286 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java @@ -30,7 +30,7 @@ /** * A node pointer for JXPath to support Xpp3Dom. - * + * * @author Benjamin Bentmann */ class Xpp3DomNodePointer diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java index e3a08fbf40..28c0f8ff5d 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java @@ -28,7 +28,7 @@ /** * A node pointer factory for JXPath to support Xpp3Dom. - * + * * @author Benjamin Bentmann */ public class Xpp3DomPointerFactory diff --git a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java index d7d196e5d9..77a6baefbf 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java +++ b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java @@ -39,7 +39,7 @@ public String getId() { return "legacy"; } - + public String pathOf( Artifact artifact ) { ArtifactHandler artifactHandler = artifact.getArtifactHandler(); diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java index 0f90e1db64..db1fecb5b4 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java +++ b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java @@ -23,7 +23,7 @@ /** * Assists unit testing. - * + * * @author Benjamin Bentmann */ class TestArtifactHandler diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java index 6208c887ec..c4afc7a912 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java +++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java @@ -66,8 +66,8 @@ public class TestRepositorySystem private ModelReader modelReader; @Requirement - private ArtifactFactory artifactFactory; - + private ArtifactFactory artifactFactory; + public ArtifactRepository buildArtifactRepository( Repository repository ) throws InvalidRepositoryException { diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java index da0318ca9a..55d330a4bb 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java @@ -40,17 +40,17 @@ public void testEquals() throws Exception { InputStream jdksIS = null; InputStream jdksExtraIS = null; - try + try { jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ); - + PersistedToolchains jdks = reader.read( jdksIS ); PersistedToolchains jdksExtra = reader.read( jdksExtraIS ); - + JavaToolchainImpl tc1 = new JavaToolchainImpl( jdks.getToolchains().get( 0 ), null ); JavaToolchainImpl tc2 = new JavaToolchainImpl( jdksExtra.getToolchains().get( 0 ), null ); - + assertTrue( tc1.equals( tc1 ) ); assertFalse( tc1.equals( tc2 ) ); assertFalse( tc2.equals( tc1 ) ); diff --git a/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml b/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml index 6a6f31915c..a821765bc5 100644 --- a/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml @@ -63,5 +63,5 @@ - + diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml index c3dc612948..83080888d3 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-resources-plugin 0.1 - + - + diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java index 18425262ea..826279cc94 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java @@ -4,7 +4,7 @@ * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java index cf1e5f649a..469cb2c4b2 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml index ededdb92e3..0f49e9ae53 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml @@ -45,22 +45,22 @@ under the License. 1.3 1.0 - 1.0-alpha-9 1.2_Java1.3 - 3.8.1 + 3.8.1 1.0-beta-3.0.7 1.0-alpha-6 1.1 1.0-alpha-1 1.5.8 1.6 - 1.0 + 1.0 1.0-beta-4 1.7-SNAPSHOT 1.0-alpha-6-SNAPSHOT @@ -247,7 +247,7 @@ under the License. maven-toolchain maven-compat maven-repository - maven-repository-mercury + maven-repository-mercury @@ -366,11 +366,11 @@ under the License. - + - org.sonatype.plexus - plexus-jetty6 + org.sonatype.plexus + plexus-jetty6 ${plexusJetty6Version} test @@ -380,7 +380,7 @@ under the License. ${plexusWebdavVersion} test - + org.apache.maven.wagon diff --git a/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml b/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml index 00e1ce4a6d..41b99c7230 100644 --- a/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml +++ b/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml @@ -4,7 +4,7 @@ org.apache.maven.lifecycle-listener.test simple 1.0 - + ${injected} diff --git a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml b/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml index 376a736b9d..a9fa3cac17 100644 --- a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml @@ -5,7 +5,7 @@ test2 1.0 - Maven Integration Test :: MNG-3586 + Maven Integration Test :: MNG-3586 Test that plugin dependencies with scope system are part of the plugin class realm. @@ -37,7 +37,7 @@ load - + diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml index ededdb92e3..0f49e9ae53 100644 --- a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml @@ -45,22 +45,22 @@ under the License. 1.3 1.0 - 1.0-alpha-9 1.2_Java1.3 - 3.8.1 + 3.8.1 1.0-beta-3.0.7 1.0-alpha-6 1.1 1.0-alpha-1 1.5.8 1.6 - 1.0 + 1.0 1.0-beta-4 1.7-SNAPSHOT 1.0-alpha-6-SNAPSHOT @@ -247,7 +247,7 @@ under the License. maven-toolchain maven-compat maven-repository - maven-repository-mercury + maven-repository-mercury @@ -366,11 +366,11 @@ under the License. - + - org.sonatype.plexus - plexus-jetty6 + org.sonatype.plexus + plexus-jetty6 ${plexusJetty6Version} test @@ -380,7 +380,7 @@ under the License. ${plexusWebdavVersion} test - + org.apache.maven.wagon diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml index 4af8228a33..32124c536c 100644 --- a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3906 + Maven Integration Test :: MNG-3906 Test that project-level plugin dependencies are properly merged during inheritance. diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml index 43de3987eb..e13262b0f1 100644 --- a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3906 + Maven Integration Test :: MNG-3906 Test that project-level plugin dependencies are properly merged during inheritance. diff --git a/maven-core/src/test/projects/project-builder/it0063/pom.xml b/maven-core/src/test/projects/project-builder/it0063/pom.xml index b12cc70a7c..0d7b08a90c 100644 --- a/maven-core/src/test/projects/project-builder/it0063/pom.xml +++ b/maven-core/src/test/projects/project-builder/it0063/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 jar - Maven Integration Test :: it0063 + Maven Integration Test :: it0063 Test the use of a system scoped dependency to a (fake) tools.jar. diff --git a/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml index 0de79bca9a..a70b208c66 100644 --- a/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml +++ b/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml @@ -30,7 +30,7 @@ under the License. consumer - Maven Integration Test :: MNG-3023 :: Consumer + Maven Integration Test :: MNG-3023 :: Consumer Test that reactor projects are included in dependency resolution. diff --git a/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml index 5290af278a..e783f85caf 100644 --- a/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml +++ b/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml @@ -27,10 +27,10 @@ under the License. parent 1 - + dependency - Maven Integration Test :: MNG-3023 :: Dependency + Maven Integration Test :: MNG-3023 :: Dependency Test that reactor projects are included in dependency resolution. diff --git a/maven-core/src/test/projects/project-builder/mng-3023/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/pom.xml index 584db7dcde..23f09ce568 100644 --- a/maven-core/src/test/projects/project-builder/mng-3023/pom.xml +++ b/maven-core/src/test/projects/project-builder/mng-3023/pom.xml @@ -27,9 +27,9 @@ under the License. 1 pom - Maven Integration Test :: MNG-3023 + Maven Integration Test :: MNG-3023 Test that reactor projects are included in dependency resolution. - + dependency consumer diff --git a/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml b/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml index b12cc70a7c..0d7b08a90c 100644 --- a/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml +++ b/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 jar - Maven Integration Test :: it0063 + Maven Integration Test :: it0063 Test the use of a system scoped dependency to a (fake) tools.jar. diff --git a/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml index e9fcd5ba57..1885fc481b 100644 --- a/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml +++ b/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml @@ -26,7 +26,7 @@ under the License. test1 1.0-SNAPSHOT - Maven Integration Test :: MNG-3822 + Maven Integration Test :: MNG-3822 Verify that POM interpolation uses basedir-aligned build directories. diff --git a/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml b/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml index 4f055a3784..1c037e6306 100644 --- a/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml +++ b/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml @@ -26,7 +26,7 @@ under the License. test1 1.0-SNAPSHOT - Maven Integration Test :: MNG-3944 + Maven Integration Test :: MNG-3944 Test that interpolation of ${basedir} works for a POM that is not named "pom.xml" diff --git a/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml index 206a54ccc6..f1d4e6ca94 100644 --- a/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml +++ b/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml @@ -26,7 +26,7 @@ under the License. test1 1.0-SNAPSHOT - Maven Integration Test :: MNG-3760 + Maven Integration Test :: MNG-3760 Test interpolation of ${project.baseUri} diff --git a/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml index 98dc8ef0fb..992eac1eb2 100644 --- a/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml +++ b/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml @@ -26,7 +26,7 @@ under the License. test1 1.0 - Maven Integration Test :: MNG-1995 + Maven Integration Test :: MNG-1995 Verify that POM fields that are of type boolean can be interpolated with expressions. @@ -53,7 +53,7 @@ under the License. src/main/resources ${filter.resources} - + diff --git a/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml index 2d95cb1c5d..262af4fbc0 100644 --- a/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3899 + Maven Integration Test :: MNG-3899 Test that build extensions are properly merged during inheritance. diff --git a/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml index 4411b8929f..dc8f6f5b8a 100644 --- a/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3899 + Maven Integration Test :: MNG-3899 Test that build extensions are properly merged during inheritance. diff --git a/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml b/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml index 2fe674abb6..68ca28dd31 100644 --- a/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml @@ -33,7 +33,7 @@ under the License. 0.2 pom - project-name + project-name project-description http://project.url/ 2009 diff --git a/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml b/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml index 72dd787276..7b1ad79410 100644 --- a/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml +++ b/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml @@ -27,7 +27,7 @@ under the License. 0.2 pom - project-name + project-name project-description http://project.url/ 2009 diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml index 116e5bd051..788c5a72a6 100644 --- a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml @@ -21,7 +21,7 @@ maven-project-builder 3.0-SNAPSHOT Maven Project Builder - + junit junit diff --git a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml index 97407e9b84..5882ab5c9e 100644 --- a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test 1.0-SNAPSHOT - Maven Integration Test :: MNG-4003 + Maven Integration Test :: MNG-4003 Verify that dependencies survive the project construction in the POM order. diff --git a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml index 29a37eab00..57bd6d0fbb 100644 --- a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test 1.0-SNAPSHOT - Maven Integration Test :: MNG-4003 + Maven Integration Test :: MNG-4003 Verify that dependencies survive the project construction in the POM order. diff --git a/maven-core/src/test/resources-project-builder/distribution-management/pom.xml b/maven-core/src/test/resources-project-builder/distribution-management/pom.xml index 0c98793eca..1a0acb08f0 100644 --- a/maven-core/src/test/resources-project-builder/distribution-management/pom.xml +++ b/maven-core/src/test/resources-project-builder/distribution-management/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 jar - Maven Integration Test :: it0061 + Maven Integration Test :: it0061 diff --git a/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml b/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml index fde9e14965..6ebd5994f5 100644 --- a/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml @@ -26,7 +26,7 @@ 1.0 - default + default process diff --git a/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml b/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml index d24d4e1f3d..d33b2bae6f 100644 --- a/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml +++ b/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml @@ -26,7 +26,7 @@ under the License. test 1.0-SNAPSHOT - Maven Integration Test :: MNG-3838 + Maven Integration Test :: MNG-3838 Verify that using the same dependency for different plugins doesn't blow up the project builder. diff --git a/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml b/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml index d0ef617779..a05d45d062 100644 --- a/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml +++ b/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml @@ -26,7 +26,7 @@ under the License. test 1.0-SNAPSHOT - Maven Integration Test :: MNG-3821 + Maven Integration Test :: MNG-3821 Verify that using the same id for executions/reportsets of different plugins doesn't blow up the project builder. diff --git a/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml b/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml index be09b0614c..28defaa216 100644 --- a/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml +++ b/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml @@ -8,7 +8,7 @@ org.codehaus.modello modello-maven-plugin - 1.0-alpha-21 + 1.0-alpha-21 diff --git a/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml index 08080b3045..503dadb9ee 100644 --- a/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml +++ b/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 jar - Maven Integration Test :: MNG-3833 + Maven Integration Test :: MNG-3833 Test that POM interpolation fully interpolates all properties in data flow chain, i.e. where property A depends on property B, and property B depends on property C and so on. diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml index ed95efb09d..4db43cd413 100644 --- a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml +++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3979 + Maven Integration Test :: MNG-3979 Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent POM has a non-empty element and the child POM has an empty element to join. diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml index 9bd61d0f62..e65d26c24b 100644 --- a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3979 + Maven Integration Test :: MNG-3979 Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent POM has a non-empty element and the child POM has an empty element to join. diff --git a/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml index bd7b4588a0..8bbe6eaef0 100644 --- a/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3845 + Maven Integration Test :: MNG-3845 Test that inheritance is all-or-nothing for certain sub-trees of the POM. diff --git a/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml b/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml index b3305c76bd..88c9813af9 100644 --- a/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml +++ b/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0-SNAPSHOT pom - Maven Integration Test :: MNG-4034 + Maven Integration Test :: MNG-4034 Verify that dependencies defined in profiles are subject to the dependency management of the parent. diff --git a/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml b/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml index 706e748a62..88204fcd94 100644 --- a/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml @@ -32,7 +32,7 @@ under the License. child 1.0-SNAPSHOT - Maven Integration Test :: MNG-4034 + Maven Integration Test :: MNG-4034 Verify that dependencies defined in profiles are subject to the dependency management of the parent. diff --git a/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml b/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml index bd15b7774f..6f4df9acd8 100644 --- a/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 pom - Maven Integration Test :: MNG-4008 + Maven Integration Test :: MNG-4008 Verify that filter definitions are properly merged. diff --git a/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml index 2d7444f4b8..7e7155bf20 100644 --- a/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml @@ -33,7 +33,7 @@ under the License. 1.0 jar - Maven Integration Test :: MNG-4008 + Maven Integration Test :: MNG-4008 Verify that filter definitions are properly merged. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml index 6c4b186677..aba6bdf0d3 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3906 + Maven Integration Test :: MNG-3906 Test that project-level plugin dependencies are properly merged during inheritance. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml index 85cc818847..1877ea5488 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3906 + Maven Integration Test :: MNG-3906 Test that project-level plugin dependencies are properly merged during inheritance. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml index d4dcf657e2..10226cfb4b 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3906 + Maven Integration Test :: MNG-3906 Test that project-level plugin dependencies are properly merged during inheritance. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml index 85cc818847..1877ea5488 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3906 + Maven Integration Test :: MNG-3906 Test that project-level plugin dependencies are properly merged during inheritance. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml index 97fc9c4793..fc09dba181 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3937 + Maven Integration Test :: MNG-3937 Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly ordered. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml index b21f6a9227..2148aa9ba2 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child-2 - Maven Integration Test :: MNG-3937 + Maven Integration Test :: MNG-3937 Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly ordered. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml index b56a7a028c..b9c3f18ba6 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3937 + Maven Integration Test :: MNG-3937 Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly ordered. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml index 8da0710c47..fab233b245 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child-1 - Maven Integration Test :: MNG-3937 + Maven Integration Test :: MNG-3937 Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly ordered. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml index cd5383cede..ee4dedcfd2 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3925 + Maven Integration Test :: MNG-3925 Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with parent executions. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml index c14f8e37a4..bf777db9f7 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3925 + Maven Integration Test :: MNG-3925 Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with parent executions. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml index 90d2bef8e4..a816975f7b 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3925 + Maven Integration Test :: MNG-3925 Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with parent executions. diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml index c14f8e37a4..bf777db9f7 100644 --- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3925 + Maven Integration Test :: MNG-3925 Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with parent executions. diff --git a/maven-core/src/test/resources-project-builder/micromailer/pom.xml b/maven-core/src/test/resources-project-builder/micromailer/pom.xml index 57f85dd801..780faac235 100644 --- a/maven-core/src/test/resources-project-builder/micromailer/pom.xml +++ b/maven-core/src/test/resources-project-builder/micromailer/pom.xml @@ -75,7 +75,7 @@ - + org.apache.velocity velocity diff --git a/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml index d3c5cc1f69..5632fad4c2 100644 --- a/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml +++ b/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 jar - Maven Integration Test :: MNG-3904 + Maven Integration Test :: MNG-3904 Test that properties which refer to build directories which in turn refer to other build directories are properly interpolated. diff --git a/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml b/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml index a5bea4848e..26ba294365 100644 --- a/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml +++ b/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 jar - Maven Integration Test :: MNG-3877 + Maven Integration Test :: MNG-3877 Verify that paths to project directories use the platform-specific file separator. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml index 52fb468dc2..60180d5135 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 pom - Maven Integration Test :: MNG-2591 + Maven Integration Test :: MNG-2591 Test aggregation of list configuration items for build plugins when using 'combine.children=append' attribute. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml index 48a8d393ba..72ab3f4525 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 pom - Maven Integration Test :: MNG-2591 + Maven Integration Test :: MNG-2591 Test aggregation of list configuration items for build plugins when using 'combine.children=append' attribute. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml index cfe425b631..2f350715ec 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test2 1.0-SNAPSHOT - Maven Integration Test :: MNG-4053 + Maven Integration Test :: MNG-4053 Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when plugin management is used. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml index f22a18190e..f2d8c6c08a 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml @@ -26,7 +26,7 @@ under the License. test3 1.0-SNAPSHOT - Maven Integration Test :: MNG-4053 + Maven Integration Test :: MNG-4053 Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when plugin management and a profile are used. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml index 49e2452d87..c844b44748 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test1 1.0-SNAPSHOT - Maven Integration Test :: MNG-4053 + Maven Integration Test :: MNG-4053 Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when no plugin management is used. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml index dd5fe00885..f81724486f 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml @@ -32,7 +32,7 @@ under the License. child 1.0-SNAPSHOT - Maven Integration Test :: MNG-3836 + Maven Integration Test :: MNG-3836 Verify that children can *override* inherited plugin configuration. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml index e96d6e1534..12f2c2d65b 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0-SNAPSHOT pom - Maven Integration Test :: MNG-3836 + Maven Integration Test :: MNG-3836 Verify that children can *override* inherited plugin configuration. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml index 2b3fd71d03..7d7dfd81d9 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test2 1.0-SNAPSHOT - Maven Integration Test :: MNG-3827 + Maven Integration Test :: MNG-3827 Verify that plain plugin configuration works correctly. diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml index a28796f9e3..e300fe1ed6 100644 --- a/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test1 1.0-SNAPSHOT - Maven Integration Test :: MNG-3827 + Maven Integration Test :: MNG-3827 Verify that plain plugin configuration works correctly. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml index a5ecf1ba6f..9f66b49ee8 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test2 1.0-SNAPSHOT - Maven Integration Test :: MNG-3864 + Maven Integration Test :: MNG-3864 Verify that plain per-execution plugin configuration works correctly. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml index b7a3c31dde..4e1eafe34f 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test1 1.0-SNAPSHOT - Maven Integration Test :: MNG-3864 + Maven Integration Test :: MNG-3864 Verify that plain per-execution plugin configuration works correctly. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml index 07450ca28f..d4ac3b0e85 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3886 + Maven Integration Test :: MNG-3886 Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether plugin management is present or not. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml index 51660135fb..438d9d1a2b 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3886 + Maven Integration Test :: MNG-3886 Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether plugin management is present or not. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml index e243cfd054..127fa25938 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3916 + Maven Integration Test :: MNG-3916 Test that plugin executions are properly merged during inheritance, even if the child plugin section has no version. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml index bdeb76e105..61841aecff 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3916 + Maven Integration Test :: MNG-3916 Test that plugin executions are properly merged during inheritance, even if the child plugin section has no version. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml index e04c7b1e23..6bcfee56c3 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3938 + Maven Integration Test :: MNG-3938 Test that plugin executions with the same id are merged during inheritance, especially executions using the default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml index 827b907535..3129ad02d9 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3938 + Maven Integration Test :: MNG-3938 Test that plugin executions with the same id are merged during inheritance, especially executions using the default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml index e0055d0032..63db85f67b 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3938 + Maven Integration Test :: MNG-3938 Test that plugin executions with the same id are merged during inheritance, especially executions using the default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml index 827b907535..3129ad02d9 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml @@ -30,7 +30,7 @@ under the License. child - Maven Integration Test :: MNG-3938 + Maven Integration Test :: MNG-3938 Test that plugin executions with the same id are merged during inheritance, especially executions using the default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml index bb762f754d..6035e816f6 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml @@ -28,7 +28,7 @@ under the License. JAR - Maven Integration Test :: MNG-4341 + Maven Integration Test :: MNG-4341 Test that plugins bound to the same phase get executed in POM order even if one of the plugins participates in the default lifecycle bindings for the project's packaging. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml index a8b031f2f7..2c552d4cfa 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3887 + Maven Integration Test :: MNG-3887 Test that multiple plugin executions bound to the same phase are executed in the order given by the POM. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml index c226262c5c..c4ceaae33c 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3887 + Maven Integration Test :: MNG-3887 Test that multiple plugin executions bound to the same phase are executed in the order given by the POM. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml index 4cbab22e5b..fbae181f66 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test2 0.1 - Maven Integration Test :: MNG-4000 + Maven Integration Test :: MNG-4000 Test that plugin executions without id are not lost among other plugin executions. diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml index 9fcf91b16d..7910084f74 100644 --- a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml @@ -26,7 +26,7 @@ under the License. test1 0.1 - Maven Integration Test :: MNG-4000 + Maven Integration Test :: MNG-4000 Test that plugin executions without id are not lost among other plugin executions. diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml index f5389197dd..5350fa8795 100644 --- a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.maven.its.mng3808 test 0.1 - + child diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml index 182e1cdd3a..f66ae25c64 100644 --- a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3808 + Maven Integration Test :: MNG-3808 Test the reports are executeed in the order given in the POM. diff --git a/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml index ac4da04b86..85b7bd945b 100644 --- a/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 jar - Maven Integration Test :: it0052 + Maven Integration Test :: it0052 Test that source attachment doesn't take place when -DperformRelease=true is missing. diff --git a/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml b/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml index aaa433e443..b338399f12 100644 --- a/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml +++ b/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml @@ -31,6 +31,6 @@ NOTE: This POM's XML declaration intentionally declares Latin-1 encoding. 0.1-SNAPSHOT pom - Maven Integration Test :: MNG-2254 :: Latin-1 + Maven Integration Test :: MNG-2254 :: Latin-1 TEST-CHARS: ÄÖÜäöüß diff --git a/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml b/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml index 07b892466b..4400aa705d 100644 --- a/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml +++ b/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml @@ -31,6 +31,6 @@ NOTE: This POM's XML declaration specified no encoding which should therefore de 0.1-SNAPSHOT pom - Maven Integration Test :: MNG-2254 :: UTF-8 + Maven Integration Test :: MNG-2254 :: UTF-8 TEST-CHARS: ßıΣЯ×€ diff --git a/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml index 59cef1d8dc..f96a940015 100644 --- a/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml @@ -31,7 +31,7 @@ under the License. 0.1 pom - parent-name + parent-name parent-description http://parent.url/ 2008 diff --git a/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml b/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml index 2828fd1789..d7af4e27ba 100644 --- a/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml +++ b/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml @@ -26,7 +26,7 @@ under the License. test 1.0-SNAPSHOT - Maven Integration Test :: it0021 + Maven Integration Test :: it0021 Test pom-level profile inclusion (this one is activated by system property). diff --git a/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml index fc7fab955b..3fe02fbd22 100644 --- a/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml +++ b/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml @@ -26,7 +26,7 @@ under the License. test 0.1-SNAPSHOT - Maven Integration Test :: MNG-1412 + Maven Integration Test :: MNG-1412 Check that dependencies are available in classpath in same order as declared in POM. diff --git a/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml b/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml index 784996de5f..daf4607fc7 100644 --- a/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml +++ b/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0-SNAPSHOT jar - Maven Integration Test :: MNG-2309 + Maven Integration Test :: MNG-2309 Test that profiles are injected in declaration order, with the last profile being the most dominant. diff --git a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml index 118861a34a..e283bb09be 100644 --- a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml +++ b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0-SNAPSHOT pom - Maven Integration Test :: MNG-2174 + Maven Integration Test :: MNG-2174 Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the parent's main plugin management section is also present. diff --git a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml index 9c06879520..3614e30527 100644 --- a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml @@ -32,7 +32,7 @@ under the License. child 1.0-SNAPSHOT - Maven Integration Test :: MNG-2174 + Maven Integration Test :: MNG-2174 Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the parent's main plugin management section is also present. diff --git a/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml index 24e17530be..32e94d739a 100644 --- a/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml +++ b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml @@ -21,7 +21,7 @@ org.apache.maven maven 3.0-SNAPSHOT - + diff --git a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml index 67f9ee6fc9..5c1dacab08 100644 --- a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml @@ -21,12 +21,12 @@ under the License. 4.0.0 - + org.apache.maven.its.it0043 maven-it-it0043 1.0-SNAPSHOT - Maven Integration Test :: it0043 + Maven Integration Test :: it0043 Test for repository inheritence - ensure using the same id overrides the defaults diff --git a/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml index 6a60a8eb94..40031e363e 100644 --- a/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml +++ b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml @@ -5,7 +5,7 @@ pom Jetty :: Administrative Parent 7 - + diff --git a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml index 5081a6cf38..9304f5d0c2 100644 --- a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml +++ b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml @@ -100,5 +100,5 @@ under the License. target/doc - + diff --git a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml index d5c76696e7..768a5e9830 100644 --- a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml +++ b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0 pom - Maven Integration Test :: MNG-3831 + Maven Integration Test :: MNG-3831 Test POM interpolation with expressions of the form $ { * } (ugly but real) diff --git a/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml b/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml index 00a4a349b3..f8b069f82e 100644 --- a/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml +++ b/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-2006 + Maven Integration Test :: MNG-2006 Test that inheritance of those URLs which automatically append the child's artifact id take the child's relative location to the parent into account. diff --git a/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml index 4dc628f6fe..ed4cdf0880 100644 --- a/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml +++ b/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 pom - Maven Integration Test :: MNG-3846 + Maven Integration Test :: MNG-3846 Test that inheritance of certain URLs automatically appends the child's artifact id. diff --git a/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml b/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml index 5b92e23ed9..2dcceb93ae 100644 --- a/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml +++ b/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0-SNAPSHOT jar - Maven Integration Test :: MNG-4116 + Maven Integration Test :: MNG-4116 Test that the project builder does not decode URLs (which must be done by the transport layer instead). diff --git a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml index f7742fd72e..5822d8d390 100644 --- a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml +++ b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1 jar - Maven Integration Test :: MNG-3839 + Maven Integration Test :: MNG-3839 Test that POM parsing properly coalesces text data. diff --git a/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml index aec8b6cbc3..584712fde5 100644 --- a/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml +++ b/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml @@ -27,7 +27,7 @@ under the License. 0.1-SNAPSHOT jar - Maven Integration Test :: MNG-3924 + Maven Integration Test :: MNG-3924 Test that interpolation of properties that resolve to XML markup doesn't crash the project builder. diff --git a/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml b/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml index 858a82d6a6..f5ea684d7f 100644 --- a/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml @@ -33,7 +33,7 @@ under the License. 1.0 jar - Maven Integration Test :: MNG-4070 :: Child + Maven Integration Test :: MNG-4070 :: Child Test that whitespace around artifact coordinates does not change artifact identity. diff --git a/maven-core/src/test/resources-settings/settings-no-pom/settings.xml b/maven-core/src/test/resources-settings/settings-no-pom/settings.xml index b03bb53f85..964e051244 100644 --- a/maven-core/src/test/resources-settings/settings-no-pom/settings.xml +++ b/maven-core/src/test/resources-settings/settings-no-pom/settings.xml @@ -1,7 +1,7 @@ - diff --git a/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml b/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml index 4d2f61d961..245349a60b 100644 --- a/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml +++ b/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml @@ -27,7 +27,7 @@ under the License. 1.0-SNAPSHOT jar - Maven Integration Test :: MNG-4107 + Maven Integration Test :: MNG-4107 Test that POM interpolation uses the property values from the dominant profile source (POM vs. profiles.xml vs. settings.xml). This boils down to the proper order of profile injection and interpolation, i.e. diff --git a/maven-core/src/test/resources/META-INF/plexus/components.xml b/maven-core/src/test/resources/META-INF/plexus/components.xml index df2369303a..714cb36b4d 100644 --- a/maven-core/src/test/resources/META-INF/plexus/components.xml +++ b/maven-core/src/test/resources/META-INF/plexus/components.xml @@ -70,7 +70,7 @@ default - + org.apache.maven.plugins:maven-site-plugin:attach-descriptor org.apache.maven.plugins:maven-install-plugin:install diff --git a/maven-core/src/test/resources/distributionManagement-pom.xml b/maven-core/src/test/resources/distributionManagement-pom.xml index 9b2451bc32..1a8ee7ffd6 100644 --- a/maven-core/src/test/resources/distributionManagement-pom.xml +++ b/maven-core/src/test/resources/distributionManagement-pom.xml @@ -8,9 +8,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml index 5a6b9d9534..fb2f91c367 100644 --- a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml @@ -45,22 +45,22 @@ under the License. 1.3 1.0 - 1.0-alpha-9 1.2_Java1.3 - 3.8.1 + 3.8.1 1.0-beta-3.0.7-SNAPSHOT 1.0-alpha-6 1.1 1.0-alpha-1 1.5.8 1.6 - 1.0 + 1.0 1.0-beta-4 1.7-SNAPSHOT 1.0-alpha-6-SNAPSHOT @@ -247,7 +247,7 @@ under the License. maven-toolchain maven-compat maven-repository - maven-repository-mercury + maven-repository-mercury @@ -366,11 +366,11 @@ under the License. - + - org.sonatype.plexus - plexus-jetty6 + org.sonatype.plexus + plexus-jetty6 ${plexusJetty6Version} test @@ -380,7 +380,7 @@ under the License. ${plexusWebdavVersion} test - + org.apache.maven.wagon diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml index 45dc77d2a9..c8a8b85f1f 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - + org.apache.maven.tests build-from-file 1 - + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml index 5c62a787cc..8f5154fc82 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - + tests build-model-lineage 1 diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml index 5953c32e2f..4d1d23ee84 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml @@ -5,6 +5,6 @@ childAndParent-parent 1 - + childAndParent-child \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml index 365ec18388..164506fe46 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - + tests childAndParent-parent 1 diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml index e0eec3a2b0..9633029a2f 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml @@ -5,6 +5,6 @@ resolve-parent-pom-parent 1 - + resolve-parent-pom \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml index 322147dbba..35c321724e 100644 --- a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml +++ b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml @@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + jdk diff --git a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml index 01aa0e1399..5233a33831 100644 --- a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml +++ b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml @@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + jdk diff --git a/maven-core/src/test/resources/project-dynamism/pom-interp.xml b/maven-core/src/test/resources/project-dynamism/pom-interp.xml index 2ad098aab3..40fdb4149d 100644 --- a/maven-core/src/test/resources/project-dynamism/pom-interp.xml +++ b/maven-core/src/test/resources/project-dynamism/pom-interp.xml @@ -1,18 +1,18 @@ - - + 4.0.0 - + org.test test-build-dynamism 1 - + /${project.groupId}/src/main/java /${pom.groupId}/src/test/java /${groupId}/src/main/scripts - + my-plugin diff --git a/maven-core/src/test/resources/project-dynamism/pom-relative.xml b/maven-core/src/test/resources/project-dynamism/pom-relative.xml index a24aebe68e..bb22b3d077 100644 --- a/maven-core/src/test/resources/project-dynamism/pom-relative.xml +++ b/maven-core/src/test/resources/project-dynamism/pom-relative.xml @@ -1,13 +1,13 @@ - - + 4.0.0 - + org.test test-build-dynamism 1 - + ${pom.build.directory} @@ -18,17 +18,17 @@ ${pom.build.directory}/generated-resources/plexus - + ${pom.build.directory}/generated-filters.properties - + target - + src/main/java src/test/java src/main/scripts - + ${pom.build.directory}/classes ${pom.build.directory}/test-classes diff --git a/maven-core/src/test/resources/project-dynamism/pom.xml b/maven-core/src/test/resources/project-dynamism/pom.xml index 02bbed08f0..37797f2ee6 100644 --- a/maven-core/src/test/resources/project-dynamism/pom.xml +++ b/maven-core/src/test/resources/project-dynamism/pom.xml @@ -1,13 +1,13 @@ - - + 4.0.0 - + org.test test-build-dynamism 1 - + ${pom.build.directory} @@ -18,17 +18,17 @@ ${pom.build.directory}/generated-resources/plexus - + ${pom.build.directory}/generated-filters.properties - + target - + ${pom.basedir}/src/main/java ${pom.basedir}/src/test/java ${pom.basedir}/src/main/scripts - + ${pom.build.directory}/classes ${pom.build.directory}/test-classes diff --git a/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml b/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml index f4df904efb..58cae23eeb 100644 --- a/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml +++ b/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml @@ -22,7 +22,7 @@ under the License. bar Babar 4.5 - + diff --git a/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml index 6da9b271bb..7383109f0e 100644 --- a/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml +++ b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml @@ -3,7 +3,7 @@ tests.project duplicate-plugin-defs-merged 1 - + @@ -44,5 +44,5 @@ - + diff --git a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml index 537605a61e..95ee353a0b 100644 --- a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml +++ b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml @@ -8,9 +8,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 0f1b5387ad..97e9f0971a 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -84,12 +84,12 @@ org.slf4j slf4j-simple true - + ch.qos.logback logback-classic true - + commons-cli diff --git a/maven-embedder/src/examples/simple-project/settings.xml b/maven-embedder/src/examples/simple-project/settings.xml index 7c234c1264..39709fdef3 100644 --- a/maven-embedder/src/examples/simple-project/settings.xml +++ b/maven-embedder/src/examples/simple-project/settings.xml @@ -21,6 +21,6 @@ under the License. org.codehaus.tycho - org.sonatype.pwt + org.sonatype.pwt diff --git a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java index a3cf2a31f2..06927bff94 100644 --- a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java +++ b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java @@ -19,7 +19,7 @@ * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { diff --git a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java index cf7f8fcd3c..ee90c20619 100644 --- a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java +++ b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java @@ -22,7 +22,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index cde88cbfff..ef81408e51 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -120,9 +120,9 @@ public class MavenCli private LoggerManager plexusLoggerManager; private ILoggerFactory slf4jLoggerFactory; - + private Logger slf4jLogger; - + private EventSpyDispatcher eventSpyDispatcher; private ModelProcessor modelProcessor; @@ -297,7 +297,7 @@ private void cli( CliRequest cliRequest ) System.out.println( CLIReportingUtils.showVersion() ); throw new ExitException( 0 ); } - } + } /** * configure logging @@ -497,7 +497,7 @@ private void encryption( CliRequest cliRequest ) if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_MASTER_PASSWORD ) ) { String passwd = cliRequest.commandLine.getOptionValue( CLIManager.ENCRYPT_MASTER_PASSWORD ); - + if ( passwd == null ) { Console cons = System.console(); @@ -506,7 +506,7 @@ private void encryption( CliRequest cliRequest ) { // Cipher uses Strings passwd = String.copyValueOf( password ); - + // Sun/Oracle advises to empty the char array java.util.Arrays.fill( password, ' ' ); } @@ -522,7 +522,7 @@ private void encryption( CliRequest cliRequest ) else if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_PASSWORD ) ) { String passwd = cliRequest.commandLine.getOptionValue( CLIManager.ENCRYPT_PASSWORD ); - + if ( passwd == null ) { Console cons = System.console(); @@ -927,7 +927,7 @@ else if ( profileAction.startsWith( "+" ) ) if ( quiet ) { transferListener = new QuietMavenTransferListener(); - } + } else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) { // @@ -1009,10 +1009,10 @@ else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIM if ( commandLine.hasOption( CLIManager.PROJECT_LIST ) ) { String[] projectOptionValues = commandLine.getOptionValues( CLIManager.PROJECT_LIST ); - + List inclProjects = new ArrayList(); List exclProjects = new ArrayList(); - + if ( projectOptionValues != null ) { for ( String projectOptionValue : projectOptionValues ) @@ -1038,7 +1038,7 @@ else if ( projectAction.startsWith( "+" ) ) } } } - + request.setSelectedProjects( inclProjects ); request.setExcludedProjects( exclProjects ); } @@ -1070,24 +1070,24 @@ else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) { request.setLocalRepositoryPath( localRepoProperty ); } - + request.setCacheNotFound( true ); request.setCacheTransferError( false ); - // + // // Builder, concurrency and parallelism // // We preserve the existing methods for builder selection which is to look for various inputs in the threading // configuration. We don't have an easy way to allow a pluggable builder to provide its own configuration // parameters but this is sufficient for now. Ultimately we want components like Builders to provide a way to - // extend the command line to accept its own configuration parameters. + // extend the command line to accept its own configuration parameters. // final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS ) ? commandLine.getOptionValue( CLIManager.THREADS ) : request.getSystemProperties().getProperty( MavenCli.THREADS_DEPRECATED ); // TODO: Remove this setting. Note that the int-tests use it - + if ( threadConfiguration != null ) { // @@ -1104,15 +1104,15 @@ else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) request.setDegreeOfConcurrency( Integer.valueOf( threadConfiguration ) ); } } - + // // Allow the builder to be overriden by the user if requested. The builders are now pluggable. // if ( commandLine.hasOption( CLIManager.BUILDER ) ) - { + { request.setBuilderId( commandLine.getOptionValue( CLIManager.BUILDER ) ); - } - + } + return request; } @@ -1121,7 +1121,7 @@ int calculateDegreeOfConcurrencyWithCoreMultiplier( String threadConfiguration ) int procs = Runtime.getRuntime().availableProcessors(); return (int) ( Float.valueOf( threadConfiguration.replace( "C", "" ) ) * procs ); } - + static File resolveFile( File file, String workingDirectory ) { if ( file == null ) @@ -1250,21 +1250,21 @@ public ExitException( int exitCode ) } } - + // // Customizations available via the CLI // - - protected TransferListener getConsoleTransferListener() + + protected TransferListener getConsoleTransferListener() { return new ConsoleMavenTransferListener( System.out ); } - + protected TransferListener getBatchTransferListener() { return new Slf4jMavenTransferListener(); } - + protected void customizeContainer( PlexusContainer container ) { } @@ -1273,5 +1273,5 @@ protected ModelProcessor createModelProcessor( PlexusContainer container ) throws ComponentLookupException { return container.lookup( ModelProcessor.class ); - } + } } diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java index 44c79f4e05..33e9920ee6 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java @@ -24,7 +24,7 @@ /** * Abstract implementation. - * + * * @author Hervé Boutemy * @since 3.1.0 */ diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java index c7b89009e5..5f4b64d37a 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java @@ -22,7 +22,7 @@ /** * Interface for configuration operations on loggers, which are not available in slf4j, then require per-slf4f-binding * implementation. - * + * * @author Hervé Boutemy * @since 3.1.0 */ diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java index 3f06f371f4..39574642d6 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java @@ -24,7 +24,7 @@ /** * Adapt an SLF4J logger to a Plexus logger, ignoring Plexus logger API parts that are not classical and * probably not really used. - * + * * @author Jason van Zyl * @since 3.1.0 */ diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java index d32ea83668..64b9bfdef2 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java @@ -36,7 +36,7 @@ public class Slf4jStdoutLogger // // These are the only methods we need in our primordial logger - // + // public void error( String msg ) { out.print( ERROR ); @@ -50,12 +50,12 @@ public void error( String msg, Throwable t ) if ( null != t ) { t.printStackTrace( out ); - } - } + } + } // // Don't need any of this - // + // public String getName() { return null; diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java index 27fae1f7ac..b24ea9cf35 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java @@ -23,7 +23,7 @@ /** * Configuration for slf4j-log4j2. - * + * * @author Hervé Boutemy * @since 3.1.0 */ @@ -39,7 +39,7 @@ public void setRootLoggerLevel( Level level ) case DEBUG: value = "debug"; break; - + case INFO: value = "info"; break; diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java index 5d04961354..5d9fab7442 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java @@ -25,7 +25,7 @@ /** * Configuration for slf4j-logback. - * + * * @author Hervé Boutemy * @since 3.1.0 */ @@ -41,7 +41,7 @@ public void setRootLoggerLevel( Level level ) case DEBUG: value = ch.qos.logback.classic.Level.DEBUG; break; - + case INFO: value = ch.qos.logback.classic.Level.INFO; break; diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java index 5d12d5ae9c..3961059dbe 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java @@ -25,7 +25,7 @@ /** * Configuration for slf4j-simple. - * + * * @author Hervé Boutemy * @since 3.1.0 */ @@ -41,7 +41,7 @@ public void setRootLoggerLevel( Level level ) case DEBUG: value = "debug"; break; - + case INFO: value = "info"; break; diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java index a96ddc6f0c..2e91b251f1 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java @@ -29,7 +29,7 @@ /** * Pseudo-configuration for unsupported slf4j binding. - * + * * @author Hervé Boutemy * @since 3.2.4 */ @@ -59,7 +59,7 @@ public void activate() for ( Map.Entry> entry : supported.entrySet() ) { StringBuilder sb = new StringBuilder(); - sb.append( "(from " ).append( entry.getKey().toExternalForm() ).append( ")" ); + sb.append( "(from " ).append( entry.getKey().toExternalForm() ).append( ")" ); for ( Object binding : entry.getValue() ) { diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java index f8911cc233..46725024f5 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java @@ -29,7 +29,7 @@ /** * Console download progress meter. - * + * * @author Brett Porter */ public class ConsoleMavenTransferListener diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt index b903f8c101..cc9257d304 100644 --- a/maven-embedder/src/site/apt/logging.apt +++ b/maven-embedder/src/site/apt/logging.apt @@ -32,12 +32,12 @@ Maven Logging Maven uses {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus - Container logging API}}, like any other Plexus components, ie + Container logging API}}, like any other Plexus components, ie {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}} / {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}. Starting with Maven 3.1.0: - + * Maven supports SLF4J API logging API too, ie {{{http://slf4j.org/apidocs/org/slf4j/LoggerFactory.html}LoggerFactory}} / {{{http://slf4j.org/apidocs/org/slf4j/Logger.html}Logger}}, @@ -86,7 +86,7 @@ public class DefaultMyComponent Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course, this will only work when run under Maven 3.1.0, then this technique can be used safely only in Maven core components or in plugins/component not requiring compatibility with previous Maven versions. - + +-----+ import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java b/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java index dc4f5ecabc..3902bac58e 100644 --- a/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java +++ b/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java @@ -4,7 +4,7 @@ * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { diff --git a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java index 9dd685db35..7a879cec36 100644 --- a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java +++ b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml index 181b40a03a..cfd2970837 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven bad-dep-version 1 - + junit diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml index f7a5b5e414..6d06469fc4 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven.errortest bad-ext-direct-deps 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml index 9139736b91..2c3da51d27 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml @@ -5,14 +5,14 @@ bad-ext-plugin-maven-ver-maven-plugin maven-plugin 1 - - - + org.apache.maven diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java index 703166df7c..5836f1e0d6 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml index c70309da65..9001cdcabe 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven bad-ext-plugin-dep-ver 1 - + @@ -33,5 +33,5 @@ under the License. - + diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml index 9139736b91..2c3da51d27 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml @@ -5,14 +5,14 @@ bad-ext-plugin-maven-ver-maven-plugin maven-plugin 1 - - - + org.apache.maven diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java index 703166df7c..5836f1e0d6 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml index bcbc4d4372..3ab2818324 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven bad-ext-plugin-maven-ver 1 - + @@ -33,5 +33,5 @@ under the License. - + diff --git a/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml index fde0ed7c7f..db547ca55d 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml @@ -3,7 +3,7 @@ org.apache.maven.errortest bad-maven-version 1 - + 10 diff --git a/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml index 940758b0b4..4bb4c4610b 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven bad-mg-dep-version 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml index 37816e74b7..dd2cff370e 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven bad-non-dep-version 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml index 1a30d0907f..d7a737549e 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml @@ -3,5 +3,5 @@ org.apache.maven.errortest bad-profile-repo 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java index 91e481e657..6aa5c335f1 100644 --- a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + /** * @parameter default-value="something" * @required diff --git a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml index e6df01bb55..e2c74121ad 100644 --- a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven config-rdonly-mojo-param 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml index d9594d552a..d766e41896 100644 --- a/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven deploy-repo-creation-err 1 - + junit @@ -30,7 +30,7 @@ under the License. 3.8.1 - + test diff --git a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml index 5e04826249..c210cfbae2 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven err-loading-plugin 1 - + @@ -41,5 +41,5 @@ under the License. - + diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml index d9b3bcafc0..1339c66cb6 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml @@ -3,7 +3,7 @@ org.apache.maven.errortest err-resolving-ext-plugin 1 - + @@ -14,5 +14,5 @@ - + diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml index 2a142afe14..d0b755c6a6 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml @@ -3,7 +3,7 @@ org.apache.maven.errortest err-resolving-project-dep 1 - + junit @@ -17,7 +17,7 @@ pom - + repo diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 39ae671829..7e0144acd3 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml index 968ea717a6..8da1560639 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven.errortest ext-deps-resolve-err 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml index d9b019938d..6565fd44de 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven ext-plugin-artifact-missing 1 - + @@ -33,5 +33,5 @@ under the License. - + diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml index 4bc809e784..ddc1eee5a2 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml @@ -10,7 +10,7 @@ - + org.test.ComponentTwo default diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml index f7e341eb4a..513e00c856 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven.errortest ext-plugin-realm-error 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml index 9139736b91..2c3da51d27 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml @@ -5,14 +5,14 @@ bad-ext-plugin-maven-ver-maven-plugin maven-plugin 1 - - - + org.apache.maven diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java index 703166df7c..5836f1e0d6 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml index bade9b717c..ad6effcec2 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven ext-plugin-version-err 1 - + @@ -32,5 +32,5 @@ under the License. - + diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml index 40b95f0c50..a567706751 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml @@ -4,7 +4,7 @@ org.apache.maven.errortest test-maven-ext 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java index 85ab5c4075..0701b7ae5e 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java +++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java @@ -4,7 +4,7 @@ * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml index 78ebb9316e..85e9a9fbde 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven.errortest ext-realm-error 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml index 0fe11709be..bb50b45c4c 100644 --- a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml @@ -3,7 +3,7 @@ org.apache.maven.errortest interp-from-project 1 - + org.test diff --git a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml index a8aa8840e8..2a924b8c51 100644 --- a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml @@ -3,5 +3,5 @@ org.apache.maven.errortest load-extern-profiles-ioex 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml index 574a9e4d42..fdaa3d4333 100644 --- a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml @@ -3,5 +3,5 @@ org.apache.maven.errortest load-extern-profiles-xex 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java index 0b3975ddcf..2c825a09a1 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java +++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java @@ -4,7 +4,7 @@ * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java index b84ebc68eb..e4e81e21f2 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml b/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml index 951f841db1..e0ab9f6db4 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml @@ -5,7 +5,7 @@ missing-parent-pom-parent 1 - + missing-parent-pom - + diff --git a/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java index 2ce5b5d344..51b71a87f4 100644 --- a/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + /** * @parameter * @required diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml index 0b52969b46..de32947ad1 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml @@ -4,7 +4,7 @@ org.apache.maven.errortest mojo-config-error-maven-plugin 1 - + org.apache.maven diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java index 703166df7c..5836f1e0d6 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml index 1bfb2af613..9d63df51fc 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven mojo-config-error 1 - + @@ -41,5 +41,5 @@ under the License. - + diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java index 703166df7c..5836f1e0d6 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java @@ -13,7 +13,7 @@ public class TestPlugin { private Log log; - + public void execute() throws MojoExecutionException, MojoFailureException { diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml index ab5354256c..1f10d0fecf 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml @@ -22,5 +22,5 @@ under the License. org.apache.maven mojo-exec-err 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java index a1507b091c..bc2e712d85 100644 --- a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java +++ b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java @@ -17,7 +17,7 @@ public class TestPlugin { private Log log; - + /** * @component role-hint="nonexistant" */ diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml index e434d57126..b70261d15f 100644 --- a/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml @@ -6,5 +6,5 @@ 1 parent-parse-ioex-child - + diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml index ca6042081c..3961dd48c6 100644 --- a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml @@ -6,5 +6,5 @@ 1 parent-parse-xex-child - + diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml index 072d8859e3..7ac14c6cce 100644 --- a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml @@ -3,5 +3,5 @@ org.apache.maven.errortest parent-parse-xex 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml index e8fc832685..031ce1e922 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven profile-activator-err 1 - + faulty diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml index e802e70379..0f93b9e66d 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml @@ -4,7 +4,7 @@ org.apache.maven.errortest profile-activator-lookup-err-ext 1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java index 85ab5c4075..0701b7ae5e 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java @@ -4,7 +4,7 @@ * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml index fabf381395..a34b838de5 100644 --- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven.errortest profile-activator-lookup-err 1 - + test-profile @@ -33,7 +33,7 @@ under the License. - + diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml index 5f1ed1090d..ebb7ee7842 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - + org.apache.maven.errortest module 1 diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml index 5f1ed1090d..ebb7ee7842 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - + org.apache.maven.errortest module 1 diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml index 0ecb5b9084..9e11c6d180 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml @@ -4,7 +4,7 @@ project-collision 1 pom - + mod1 mod2 diff --git a/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml index cc96cb4f64..eb1f08fd73 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - + org.apache.maven.errortest project-cycle 1 - + org.apache.maven.errortest project-cycle-dep diff --git a/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml index aba34bfde1..75c53e7bc9 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml @@ -4,11 +4,11 @@ project-cycle 1 pom - + dep - + org.apache.maven.errortest diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml index 26a1029b72..3c297ac1bf 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml @@ -3,14 +3,14 @@ org.apache.maven.errortest project-dep-missing 1 - + central file://${java.io.tmpdir} - + not @@ -18,5 +18,5 @@ 3.8.1 - + diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 39ae671829..7e0144acd3 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java index 39ae671829..7e0144acd3 100644 --- a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java +++ b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml index a49b9dcc2b..d0574bd0df 100644 --- a/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml +++ b/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.maven repo-creation-err 1 - + junit @@ -30,7 +30,7 @@ under the License. 3.8.1 - + test diff --git a/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml b/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml index 4bbef519be..169b392167 100644 --- a/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml +++ b/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml @@ -3,7 +3,7 @@ testing read-with-deps 1 - + tests diff --git a/maven-embedder/src/test/extensions/META-INF/plexus/components.xml b/maven-embedder/src/test/extensions/META-INF/plexus/components.xml index c71f2a21b7..f38af5976e 100644 --- a/maven-embedder/src/test/extensions/META-INF/plexus/components.xml +++ b/maven-embedder/src/test/extensions/META-INF/plexus/components.xml @@ -21,7 +21,7 @@ under the License. org.apache.maven.artifact.factory.ArtifactFactory - default + default org.apache.maven.embedder.CustomArtifactFactory diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java index 9df1768a11..163d9d9dd6 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java @@ -34,7 +34,7 @@ /** * Pseudo test to generate documentation fragment about supported CLI options. * TODO such documentation generation code should not be necessary as unit test but should be run - * during site generation (Velocity? Doxia macro?) + * during site generation (Velocity? Doxia macro?) */ public class CLIManagerTest extends PlexusTestCase diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java index ba26467d27..6e06cc5ad8 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java @@ -25,20 +25,20 @@ public class MavenCliTest extends TestCase { private MavenCli cli; - + protected void setUp() { - cli = new MavenCli(); + cli = new MavenCli(); } - + public void testCalculateDegreeOfConcurrencyWithCoreMultiplier() { - int cores = Runtime.getRuntime().availableProcessors(); + int cores = Runtime.getRuntime().availableProcessors(); // -T2.2C assertEquals( (int) ( cores * 2.2 ), cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "C2.2" ) ); // -TC2.2 assertEquals( (int) ( cores * 2.2 ), cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "2.2C" ) ); - + try { cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "CXXX" ); @@ -47,6 +47,6 @@ public void testCalculateDegreeOfConcurrencyWithCoreMultiplier() catch ( NumberFormatException e ) { // carry on - } - } + } + } } diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java index f413a56bb8..f959dc43eb 100644 --- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java +++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java @@ -4,7 +4,7 @@ * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java index b66913469a..69af061340 100644 --- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java +++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml index 9328b53314..60c25eb840 100644 --- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml +++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml @@ -15,9 +15,9 @@ - + company - + diff --git a/maven-embedder/src/test/projects/optional-dep/pom.xml b/maven-embedder/src/test/projects/optional-dep/pom.xml index 47bb16ef35..56c99e1363 100644 --- a/maven-embedder/src/test/projects/optional-dep/pom.xml +++ b/maven-embedder/src/test/projects/optional-dep/pom.xml @@ -5,7 +5,7 @@ optionaldependency p01 0.0.1-SNAPSHOT - + - + diff --git a/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml b/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml index eecfc126a4..851987fe71 100644 --- a/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml +++ b/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml @@ -5,7 +5,7 @@ parent 1 pom - + child1 diff --git a/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml b/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml index cec339e7fd..3323e47d60 100644 --- a/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml +++ b/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml @@ -5,13 +5,13 @@ parent 1 pom - + scm:svn:http://host/trunk/parent scm:svn:https://host/trunk/parent http://host/viewer?path=/trunk/parent - + modules/child1 diff --git a/maven-embedder/src/test/resources/settings/valid-settings.xml b/maven-embedder/src/test/resources/settings/valid-settings.xml index fd5ff6aa8c..a7693343e8 100644 --- a/maven-embedder/src/test/resources/settings/valid-settings.xml +++ b/maven-embedder/src/test/resources/settings/valid-settings.xml @@ -22,6 +22,6 @@ under the License. /global/maven/local-repository org.codehaus.tycho - org.sonatype.pwt + org.sonatype.pwt diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java index 7cbb0d5bb6..bdb69ef4b5 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java @@ -21,7 +21,7 @@ /** * Provides a skeleton implementation for model building listeners. The methods of this class are empty. - * + * * @author Benjamin Bentmann */ public class AbstractModelBuildingListener diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java index b1d46deb10..6f7be63d38 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java @@ -70,7 +70,7 @@ * only meant as a utility for developers that want to employ the model builder outside of the Maven build system, Maven * plugins should always acquire model builder instances via dependency injection. Developers might want to subclass * this factory to provide custom implementations for some of the components used by the model builder. - * + * * @author Benjamin Bentmann */ public class DefaultModelBuilderFactory @@ -201,7 +201,7 @@ protected ReportingConverter newReportingConverter() /** * Creates a new model builder instance. - * + * * @return The new model builder instance, never {@code null}. */ public DefaultModelBuilder newInstance() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java index e34f0999ed..4fb9b8ae4a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java @@ -23,7 +23,7 @@ /** * Holds data relevant for a model building event. - * + * * @author Benjamin Bentmann */ class DefaultModelBuildingEvent diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java index 4719b88656..513f4f6b0a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java @@ -30,7 +30,7 @@ /** * Collects settings that control building of effective models. - * + * * @author Benjamin Bentmann */ public class DefaultModelBuildingRequest @@ -76,7 +76,7 @@ public DefaultModelBuildingRequest() /** * Creates a shallow copy of the specified request. - * + * * @param request The request to copy, must not be {@code null}. */ public DefaultModelBuildingRequest( ModelBuildingRequest request ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java index 739c6969b7..998c694b69 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java @@ -29,7 +29,7 @@ /** * Collects the output of the model builder. - * + * * @author Benjamin Bentmann */ class DefaultModelBuildingResult diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java index ba37cac3e5..5da2ee7467 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java @@ -25,7 +25,7 @@ * Describes a problem that was encountered during model building. A problem can either be an exception that was thrown * or a simple string message. In addition, a problem carries a hint about its source, e.g. the POM file that exhibits * the problem. - * + * * @author Benjamin Bentmann */ public class DefaultModelProblem @@ -51,7 +51,7 @@ public class DefaultModelProblem /** * Creates a new problem with the specified message and exception. - * + * * @param message The message describing the problem, may be {@code null}. * @param severity The severity level of the problem, may be {@code null} to default to * {@link ModelProblem.Severity#ERROR}. @@ -70,7 +70,7 @@ public DefaultModelProblem( String message, Severity severity, Version version, /** * Creates a new problem with the specified message and exception. - * + * * @param message The message describing the problem, may be {@code null}. * @param severity The severity level of the problem, may be {@code null} to default to * {@link ModelProblem.Severity#ERROR}. @@ -150,7 +150,7 @@ public Version getVersion() { return version; } - + @Override public String toString() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java index 114afeb2de..f434334e59 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java @@ -32,7 +32,7 @@ * an expressive source hint for the model problem. Instead, the source hint is configured by the model builder before * it delegates to other components that potentially encounter problems. Then, the problem reporter can focus on * providing a simple error message, leaving the donkey work of creating a nice model problem to this component. - * + * * @author Benjamin Bentmann */ class DefaultModelProblemCollector diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java index 12c7813d48..fcc85a81a0 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java @@ -27,7 +27,7 @@ /** * Wraps an ordinary {@link File} as a model source. - * + * * @author Benjamin Bentmann */ public class FileModelSource @@ -37,7 +37,7 @@ public class FileModelSource /** * Creates a new model source backed by the specified file. - * + * * @param pomFile The POM file, must not be {@code null}. */ public FileModelSource( File pomFile ) @@ -62,7 +62,7 @@ public String getLocation() /** * Gets the POM file of this model source. - * + * * @return The underlying POM file, never {@code null}. */ public File getPomFile() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java index b5c2ff3287..700b9ccbac 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java @@ -30,7 +30,7 @@ /** * A model building request that delegates all methods invocations to another request, meant for easy transformations by * subclassing. - * + * * @author Benjamin Bentmann */ class FilterModelBuildingRequest diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java index c29f279d2a..c6c75f9fa0 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java @@ -21,7 +21,7 @@ /** * Builds the effective model from a POM. - * + * * @author Benjamin Bentmann */ public interface ModelBuilder @@ -29,7 +29,7 @@ public interface ModelBuilder /** * Builds the effective model of the specified POM. - * + * * @param request The model building request that holds the parameters, must not be {@code null}. * @return The result of the model building, never {@code null}. * @throws ModelBuildingException If the effective model could not be built. @@ -42,7 +42,7 @@ ModelBuildingResult build( ModelBuildingRequest request ) * {@link #build(ModelBuildingRequest)} with {@link ModelBuildingRequest#isTwoPhaseBuilding()} being {@code true}. * The model building request passed to this method must be the same as the one used for the first phase of the * model building. - * + * * @param request The model building request that holds the parameters, must not be {@code null}. * @param result The interim result of the first phase of model building, must not be {@code null}. * @return The result of the model building, never {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java index 848a1d3d10..2995b1bfb1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java @@ -23,7 +23,7 @@ /** * Holds data relevant for a model building event. - * + * * @author Benjamin Bentmann */ public interface ModelBuildingEvent @@ -31,21 +31,21 @@ public interface ModelBuildingEvent /** * Gets the model being built. The precise state of this model depends on the event being fired. - * + * * @return The model being built, never {@code null}. */ Model getModel(); /** * Gets the model building request being processed. - * + * * @return The model building request being processed, never {@code null}. */ ModelBuildingRequest getRequest(); /** * Gets the container used to collect problems that were encountered while processing the event. - * + * * @return The container used to collect problems that were encountered, never {@code null}. */ ModelProblemCollector getProblems(); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java index 193a6b4f49..434cb591a2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java @@ -30,7 +30,7 @@ * Signals one ore more errors during model building. The model builder tries to collect as many problems as possible * before eventually failing to provide callers with rich error information. Use {@link #getProblems()} to query the * details of the failure. - * + * * @author Benjamin Bentmann */ public class ModelBuildingException @@ -41,7 +41,7 @@ public class ModelBuildingException /** * Creates a new exception with the specified problems. - * + * * @param model The model that could not be built, may be {@code null}. * @param modelId The identifier of the model that could not be built, may be {@code null}. * @param problems The problems that causes this exception, may be {@code null}. @@ -72,7 +72,7 @@ public ModelBuildingException( Model model, String modelId, List p /** * Creates a new exception from the specified interim result and its associated problems. - * + * * @param result The interim result, may be {@code null}. */ public ModelBuildingException( ModelBuildingResult result ) @@ -83,7 +83,7 @@ public ModelBuildingException( ModelBuildingResult result ) /** * Gets the interim result of the model building up to the point where it failed. - * + * * @return The interim model building result or {@code null} if not available. */ public ModelBuildingResult getResult() @@ -93,7 +93,7 @@ public ModelBuildingResult getResult() /** * Gets the model that could not be built properly. - * + * * @return The erroneous model or {@code null} if not available. */ public Model getModel() @@ -113,7 +113,7 @@ public Model getModel() * Gets the identifier of the POM whose effective model could not be built. The general format of the identifier is * {@code ::} but some of these coordinates may still be unknown at the point the * exception is thrown so this information is merely meant to assist the user. - * + * * @return The identifier of the POM or an empty string if not known, never {@code null}. */ public String getModelId() @@ -127,7 +127,7 @@ public String getModelId() /** * Gets the problems that caused this exception. - * + * * @return The problems that caused this exception, never {@code null}. */ public List getProblems() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java index f1650232d9..21029cc87b 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java @@ -24,7 +24,7 @@ * errors while processing the event, it can report these problems via {@link ModelBuildingEvent#getProblems()}. * Note: To cope with future extensions to this interface, it is strongly recommended to extend * {@link AbstractModelBuildingListener} rather than to directly implement this interface. - * + * * @author Benjamin Bentmann */ public interface ModelBuildingListener @@ -32,7 +32,7 @@ public interface ModelBuildingListener /** * Notifies the listener that the model has been constructed to the extent where build extensions can be processed. - * + * * @param event The details about the event. */ void buildExtensionsAssembled( ModelBuildingEvent event ); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java index ab1dba85f0..2a3a25a1b8 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java @@ -157,7 +157,7 @@ public interface ModelBuildingRequest /** * Indicates whether the model should track the line/column number of the model source from which it was parsed. - * + * * @return {@code true} if location tracking is enabled, {@code false} otherwise. */ boolean isLocationTracking(); @@ -165,7 +165,7 @@ public interface ModelBuildingRequest /** * Enables/disables the tracking of line/column numbers for the model source being parsed. By default, input * locations are not tracked. - * + * * @param locationTracking {@code true} to enable location tracking, {@code false} to disable it. * @return This request, never {@code null}. */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java index 7af3f5fc59..44b12958ee 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java @@ -26,7 +26,7 @@ /** * Collects the output of the model builder. - * + * * @author Benjamin Bentmann */ public interface ModelBuildingResult @@ -37,14 +37,14 @@ public interface ModelBuildingResult * constructed. Model identifiers have the form {@code ::}. The first identifier from * the list denotes the model on which the model builder was originally invoked. The last identifier will always be * an empty string that by definition denotes the super POM. - * + * * @return The model identifiers from the lineage of models, never {@code null}. */ List getModelIds(); /** * Gets the assembled model. - * + * * @return The assembled model, never {@code null}. */ Model getEffectiveModel(); @@ -52,7 +52,7 @@ public interface ModelBuildingResult /** * Gets the raw model as it was read from the input model source. Apart from basic validation, the raw model has not * undergone any updates by the model builder, e.g. reflects neither inheritance nor interpolation. - * + * * @return The raw model, never {@code null}. */ Model getRawModel(); @@ -62,7 +62,7 @@ public interface ModelBuildingResult * undergone any updates by the model builder, e.g. reflects neither inheritance nor interpolation. The model * identifier should be from the collection obtained by {@link #getModelIds()}. As a special case, an empty string * can be used as the identifier for the super POM. - * + * * @param modelId The identifier of the desired raw model, must not be {@code null}. * @return The raw model or {@code null} if the specified model id does not refer to a known model. */ @@ -72,7 +72,7 @@ public interface ModelBuildingResult * Gets the profiles from the specified model that were active during model building. The model identifier should be * from the collection obtained by {@link #getModelIds()}. As a special case, an empty string can be used as the * identifier for the super POM. - * + * * @param modelId The identifier of the model whose active profiles should be retrieved, must not be {@code null}. * @return The active profiles of the model or an empty list if none or {@code null} if the specified model id does * not refer to a known model. @@ -82,7 +82,7 @@ public interface ModelBuildingResult /** * Gets the external profiles that were active during model building. External profiles are those that were * contributed by {@link ModelBuildingRequest#getProfiles()}. - * + * * @return The active external profiles or an empty list if none, never {@code null}. */ List getActiveExternalProfiles(); @@ -91,7 +91,7 @@ public interface ModelBuildingResult * Gets the problems that were encountered during the model building. Note that only problems of severity * {@link ModelProblem.Severity#WARNING} and below are reported here. Problems with a higher severity level cause * the model builder to fail with a {@link ModelBuildingException}. - * + * * @return The problems that were encountered during the model building, can be empty but never {@code null}. */ List getProblems(); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java index 3bf4093f0a..132a511385 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java @@ -25,7 +25,7 @@ * formed by a combination of group id, artifact id, version and tag. The first three components generally refer to the * identify of a model. The tag allows for further classification of the associated data on the sole discretion of the * model builder. - * + * * @author Benjamin Bentmann */ public interface ModelCache @@ -33,7 +33,7 @@ public interface ModelCache /** * Puts the specified data into the cache. - * + * * @param groupId The group id of the cache record, must not be {@code null}. * @param artifactId The artifact id of the cache record, must not be {@code null}. * @param version The version of the cache record, must not be {@code null}. @@ -44,7 +44,7 @@ public interface ModelCache /** * Gets the specified data from the cache. - * + * * @param groupId The group id of the cache record, must not be {@code null}. * @param artifactId The artifact id of the cache record, must not be {@code null}. * @param version The version of the cache record, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java index e4c7527124..4fefe0df11 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java @@ -27,7 +27,7 @@ /** * Holds a model along with some auxiliary information. This internal utility class assists the model builder during POM * processing by providing a means to transport information that cannot be (easily) extracted from the model itself. - * + * * @author Benjamin Bentmann */ class ModelData @@ -48,7 +48,7 @@ class ModelData /** * Creates a new container for the specified model. - * + * * @param model The model to wrap, may be {@code null}. */ public ModelData( ModelSource source, Model model ) @@ -59,7 +59,7 @@ public ModelData( ModelSource source, Model model ) /** * Creates a new container for the specified model. - * + * * @param model The model to wrap, may be {@code null}. * @param groupId The effective group identifier of the model, may be {@code null}. * @param artifactId The effective artifact identifier of the model, may be {@code null}. @@ -81,7 +81,7 @@ public ModelSource getSource() /** * Gets the model being wrapped. - * + * * @return The model or {@code null} if not set. */ public Model getModel() @@ -91,7 +91,7 @@ public Model getModel() /** * Sets the model being wrapped. - * + * * @param model The model, may be {@code null}. */ public void setModel( Model model ) @@ -101,7 +101,7 @@ public void setModel( Model model ) /** * Gets the raw model being wrapped. - * + * * @return The raw model or {@code null} if not set. */ public Model getRawModel() @@ -111,7 +111,7 @@ public Model getRawModel() /** * Sets the raw model being wrapped. - * + * * @param rawModel The raw model, may be {@code null}. */ public void setRawModel( Model rawModel ) @@ -121,7 +121,7 @@ public void setRawModel( Model rawModel ) /** * Gets the active profiles from the model. - * + * * @return The active profiles or {@code null} if not set. */ public List getActiveProfiles() @@ -131,7 +131,7 @@ public List getActiveProfiles() /** * Sets the active profiles from the model. - * + * * @param activeProfiles The active profiles, may be {@code null}. */ public void setActiveProfiles( List activeProfiles ) @@ -141,7 +141,7 @@ public void setActiveProfiles( List activeProfiles ) /** * Gets the effective group identifier of the model. - * + * * @return The effective group identifier of the model or an empty string if unknown, never {@code null}. */ public String getGroupId() @@ -151,7 +151,7 @@ public String getGroupId() /** * Sets the effective group identifier of the model. - * + * * @param groupId The effective group identifier of the model, may be {@code null}. */ public void setGroupId( String groupId ) @@ -161,7 +161,7 @@ public void setGroupId( String groupId ) /** * Gets the effective artifact identifier of the model. - * + * * @return The effective artifact identifier of the model or an empty string if unknown, never {@code null}. */ public String getArtifactId() @@ -171,7 +171,7 @@ public String getArtifactId() /** * Sets the effective artifact identifier of the model. - * + * * @param artifactId The effective artifact identifier of the model, may be {@code null}. */ public void setArtifactId( String artifactId ) @@ -181,7 +181,7 @@ public void setArtifactId( String artifactId ) /** * Gets the effective version of the model. - * + * * @return The effective version of the model or an empty string if unknown, never {@code null}. */ public String getVersion() @@ -191,7 +191,7 @@ public String getVersion() /** * Sets the effective version of the model. - * + * * @param version The effective version of the model, may be {@code null}. */ public void setVersion( String version ) @@ -201,7 +201,7 @@ public void setVersion( String version ) /** * Gets the effective identifier of the model in the form {@code ::}. - * + * * @return The effective identifier of the model, never {@code null}. */ public String getId() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java index 08a1483c01..43272bac04 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java @@ -23,7 +23,7 @@ * Describes a problem that was encountered during model building. A problem can either be an exception that was thrown * or a simple string message. In addition, a problem carries a hint about its source, e.g. the POM file that exhibits * the problem. - * + * * @author Benjamin Bentmann */ public interface ModelProblem @@ -55,7 +55,7 @@ enum Version * creator of the problem, the general expectation is that the hint provides sufficient information to the user to * track the problem back to its origin. A concrete example for such a source hint can be the file path or URL from * which a POM was read. - * + * * @return The hint about the source of the problem or an empty string if unknown, never {@code null}. */ String getSource(); @@ -63,7 +63,7 @@ enum Version /** * Gets the one-based index of the line containing the problem. The line number should refer to some text file that * is given by {@link #getSource()}. - * + * * @return The one-based index of the line containing the problem or a non-positive value if unknown. */ int getLineNumber(); @@ -71,7 +71,7 @@ enum Version /** * Gets the one-based index of the column containing the problem. The column number should refer to some text file * that is given by {@link #getSource()}. - * + * * @return The one-based index of the column containing the problem or non-positive value if unknown. */ int getColumnNumber(); @@ -81,7 +81,7 @@ enum Version * groupId:artifactId:version the returned identifier need not be complete. The identifier is derived * from the information that is available at the point the problem occurs and as such merely serves as a best effort * to provide information to the user to track the problem back to its origin. - * + * * @return The identifier of the model from which the problem originated or an empty string if unknown, never * {@code null}. */ @@ -89,21 +89,21 @@ enum Version /** * Gets the exception that caused this problem (if any). - * + * * @return The exception that caused this problem or {@code null} if not applicable. */ Exception getException(); /** * Gets the message that describes this problem. - * + * * @return The message describing this problem, never {@code null}. */ String getMessage(); /** * Gets the severity level of this problem. - * + * * @return The severity level of this problem, never {@code null}. */ Severity getSeverity(); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java index 961d40abdf..e9561e54b4 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java @@ -25,7 +25,7 @@ * an expressive source hint for the model problem. Instead, the source hint is configured by the model builder before * it delegates to other components that potentially encounter problems. Then, the problem reporter can focus on * providing a simple error message, leaving the donkey work of creating a nice model problem to this component. - * + * * @author Benjamin Bentmann */ public interface ModelProblemCollector @@ -33,7 +33,7 @@ public interface ModelProblemCollector /** * Adds the specified problem. - * + * * @param req must not be null */ void add( ModelProblemCollectorRequest req ); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java index 30143c624e..7977d3a6ee 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java @@ -27,7 +27,7 @@ */ public interface ModelProblemCollectorExt extends ModelProblemCollector { - + /** * The collected problems. * @return a list of model problems encountered, never {@code null} diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java index 60bfdde207..d213cc48d2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java @@ -36,11 +36,11 @@ public final class ModelProblemCollectorRequest private Exception exception; private String message; private InputLocation location; - + /** * Create a new request with mandatory parameters. * @param severity - * @param version + * @param version */ public ModelProblemCollectorRequest( Severity severity, Version version ) { diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java index 6554b196d3..806c28d474 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java @@ -25,7 +25,7 @@ /** * Assists in the handling of model problems. - * + * * @author Benjamin Bentmann */ public class ModelProblemUtils @@ -33,7 +33,7 @@ public class ModelProblemUtils /** * Creates a user-friendly source hint for the specified model. - * + * * @param model The model to create a source hint for, may be {@code null}. * @return The user-friendly source hint, never {@code null}. */ @@ -100,7 +100,7 @@ static String toId( Model model ) /** * Creates a user-friendly artifact id from the specified coordinates. - * + * * @param groupId The group id, may be {@code null}. * @param artifactId The artifact id, may be {@code null}. * @param version The version, may be {@code null}. @@ -123,7 +123,7 @@ static String toId( String groupId, String artifactId, String version ) * Creates a string with all location details for the specified model problem. If the project identifier is * provided, the generated location will omit the model id and source information and only give line/column * information for problems originating directly from this POM. - * + * * @param problem The problem whose location should be formatted, must not be {@code null}. * @param projectId The {@code ::} of the corresponding project, may be {@code null} * to force output of model id and source. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java index 65ce7abbcc..dc648bfb39 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java @@ -27,7 +27,7 @@ *

* This interface does not support loading of parent POM(s) from the same backing store, integrators are strongly * encouraged to implement {@link ModelSource2} instead of implementing this interface directly. - * + * * @author Benjamin Bentmann * @see ModelSource2 */ @@ -36,7 +36,7 @@ public interface ModelSource /** * Gets a byte stream to the POM contents. Closing the returned stream is the responsibility of the caller. - * + * * @return A byte stream to the POM contents, never {@code null}. */ InputStream getInputStream() @@ -45,7 +45,7 @@ InputStream getInputStream() /** * Provides a user-friendly hint about the location of the POM. This could be a local file path, a URI or just an * empty string. The intention is to assist users during error reporting. - * + * * @return A user-friendly hint about the location of the POM, never {@code null}. */ String getLocation(); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java index ea3872bfbc..3e123d0874 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java @@ -43,7 +43,7 @@ public interface ModelSource2 *

  • point either at file or directory, in the latter case POM file name 'pom.xml' needs to be used by the * requested model source.
    • * - * + * * @param relPath is the path of the requested model source relative to this model source POM. * @return related model source or null if no such model source. */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java index 3a7ab02fe4..edc4d31429 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java @@ -25,7 +25,7 @@ /** * Wraps an ordinary {@link CharSequence} as a model source. - * + * * @author Benjamin Bentmann */ public class StringModelSource @@ -38,7 +38,7 @@ public class StringModelSource /** * Creates a new model source backed by the specified string. - * + * * @param pom The POM's string representation, may be empty or {@code null}. */ public StringModelSource( CharSequence pom ) @@ -48,7 +48,7 @@ public StringModelSource( CharSequence pom ) /** * Creates a new model source backed by the specified string. - * + * * @param pom The POM's string representation, may be empty or {@code null}. * @param location The location to report for this use, may be {@code null}. */ @@ -71,7 +71,7 @@ public String getLocation() /** * Gets the character sequence of this model source. - * + * * @return The underlying character stream, never {@code null}. */ public String getModel() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java index 053254bea6..07058b3a07 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java @@ -25,7 +25,7 @@ /** * Wraps an ordinary {@link URL} as a model source. - * + * * @author Benjamin Bentmann */ public class UrlModelSource @@ -36,7 +36,7 @@ public class UrlModelSource /** * Creates a new model source backed by the specified URL. - * + * * @param pomUrl The POM file, must not be {@code null}. */ public UrlModelSource( URL pomUrl ) @@ -61,7 +61,7 @@ public String getLocation() /** * Gets the POM URL of this model source. - * + * * @return The underlying POM URL, never {@code null}. */ public URL getPomUrl() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java index a61eba32f0..71ec63c8f7 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java @@ -33,7 +33,7 @@ /** * Handles the import of dependency management from other models into the target model. - * + * * @author Benjamin Bentmann */ @Component( role = DependencyManagementImporter.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java index b6cd7b91d8..06496429d1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java @@ -28,7 +28,7 @@ /** * Handles the import of dependency management from other models into the target model. - * + * * @author Benjamin Bentmann */ public interface DependencyManagementImporter @@ -36,7 +36,7 @@ public interface DependencyManagementImporter /** * Imports the specified dependency management sections into the given target model. - * + * * @param target The model into which to import the dependency management section, must not be null. * @param sources The dependency management sections to import, may be null. * @param request The model building request that holds further settings, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java index 01ff9d71a6..0d1fc8d5a6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java @@ -59,7 +59,7 @@ public void assembleModelInheritance( Model child, Model parent, ModelBuildingRe /** * Calculates the relative path from the base directory of the parent to the parent directory of the base directory * of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM). - * + * *

    This calculation is only a heuristic based on our conventions. * In detail, the algo relies on the following assumptions:

      *
    • The parent uses aggregation and refers to the child via the modules section
      • diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java index 9ce5d783b8..a191e52dd1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java @@ -25,7 +25,7 @@ /** * Handles inheritance of model values. - * + * * @author Benjamin Bentmann */ public interface InheritanceAssembler @@ -35,7 +35,7 @@ public interface InheritanceAssembler * Merges values from the specified parent model into the given child model. Implementations are expected to keep * parent and child completely decoupled by injecting deep copies of objects into the child rather than the original * objects from the parent. - * + * * @param child The child model into which to merge the values inherited from the parent, must not be * null. * @param parent The (read-only) parent model from which to inherit the values, may be null. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java index 4542a3fe5b..04b4cf663b 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java @@ -28,7 +28,7 @@ class BuildTimestampValueSource extends AbstractValueSource { private final MavenBuildTimestamp mavenBuildTimestamp; - + public BuildTimestampValueSource( Date startTime, Properties properties ) { super( false ); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java index 8167baf7ec..06ac3b4223 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java @@ -29,7 +29,7 @@ /** * Wraps another value source and intercepts interpolated expressions, checking for problems. - * + * * @author Benjamin Bentmann */ class ProblemDetectingValueSource diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java index d0106edcd7..a4d2323e39 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java @@ -27,7 +27,7 @@ /** * Ensures that expressions referring to URLs evaluate to normalized URLs. - * + * * @author Benjamin Bentmann */ class UrlNormalizingPostProcessor diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java index c1c3891ce8..5c1e58ffa4 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java @@ -37,7 +37,7 @@ /** * Handles deserialization of a model from some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ @Component( role = ModelReader.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java index 7813483cdd..25c9ebc06c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java @@ -34,7 +34,7 @@ /** * Handles serialization of a model into some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ @Component( role = ModelWriter.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java index 234cf66588..1b2cbc341f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java @@ -23,7 +23,7 @@ /** * Signals a failure to parse the POM due to invalid syntax (e.g. non-wellformed XML or unknown elements). - * + * * @author Benjamin Bentmann */ public class ModelParseException @@ -42,7 +42,7 @@ public class ModelParseException /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -56,7 +56,7 @@ public ModelParseException( String message, int lineNumber, int columnNumber ) /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -72,7 +72,7 @@ public ModelParseException( String message, int lineNumber, int columnNumber, Th /** * Gets the one-based index of the line containing the error. - * + * * @return The one-based index of the line containing the error or a non-positive value if unknown. */ public int getLineNumber() @@ -82,7 +82,7 @@ public int getLineNumber() /** * Gets the one-based index of the column containing the error. - * + * * @return The one-based index of the column containing the error or non-positive value if unknown. */ public int getColumnNumber() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java index 481c113d85..af7e0cab30 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java @@ -29,7 +29,7 @@ /** * Handles serialization of a model into some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ public interface ModelWriter @@ -38,7 +38,7 @@ public interface ModelWriter /** * Writes the supplied model to the specified file. Any non-existing parent directories of the output file will be * created automatically. - * + * * @param output The file to serialize the model to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param model The model to serialize, must not be {@code null}. @@ -50,7 +50,7 @@ void write( File output, Map options, Model model ) /** * Writes the supplied model to the specified character writer. The writer will be automatically closed before the * method returns. - * + * * @param output The writer to serialize the model to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param model The model to serialize, must not be {@code null}. @@ -62,7 +62,7 @@ void write( Writer output, Map options, Model model ) /** * Writes the supplied model to the specified byte stream. The stream will be automatically closed before the method * returns. - * + * * @param output The stream to serialize the model to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param model The model to serialize, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java b/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java index 1d9871dcfe..ff67f45191 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java @@ -25,7 +25,7 @@ /** * Locates a POM file within a project base directory. - * + * * @author Benjamin Bentmann */ @Component( role = ModelLocator.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java b/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java index a5c8d040e5..3aa0045c29 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java @@ -23,7 +23,7 @@ /** * Locates a POM file within a project base directory. - * + * * @author Benjamin Bentmann */ public interface ModelLocator @@ -34,7 +34,7 @@ public interface ModelLocator * or does not contain a POM file, the return value indicates the expected path to the POM file. Sub directories of * the project directory will not be considered when locating the POM file. The return value will be an absolute * path if the project directory is given as an absolute path. - * + * * @param projectDirectory The (possibly non-existent) base directory to locate the POM file in, must not be {@code * null}. * @return The path to the (possibly non-existent) POM file, never {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java index 8524dde50e..3b70a09c97 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java @@ -25,7 +25,7 @@ /** * Handles injection of dependency management into the model. - * + * * @author Benjamin Bentmann */ public interface DependencyManagementInjector @@ -33,7 +33,7 @@ public interface DependencyManagementInjector /** * Merges default values from the dependency management section of the given model into itself. - * + * * @param model The model into which to merge the values specified by its dependency management sections, must not * be null. * @param request The model building request that holds further settings, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java index 2576b5ef7a..7384fdf045 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java @@ -25,7 +25,7 @@ /** * Handles injection of plugin management into the model. - * + * * @author Benjamin Bentmann */ public interface PluginManagementInjector @@ -33,7 +33,7 @@ public interface PluginManagementInjector /** * Merges default values from the plugin management section of the given model into itself. - * + * * @param model The model into which to merge the values specified by its plugin management section, must not be * null. * @param request The model building request that holds further settings, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java index 9163286a85..43078565d5 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java @@ -37,7 +37,7 @@ /** * Handles normalization of a model. - * + * * @author Benjamin Bentmann */ @Component( role = ModelNormalizer.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java index a2e642e483..7cab86b65c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java @@ -26,7 +26,7 @@ /** * Handles normalization of a model. In this context, normalization is the process of producing a canonical * representation for models that physically look different but are semantically equivalent. - * + * * @author Benjamin Bentmann */ public interface ModelNormalizer @@ -34,7 +34,7 @@ public interface ModelNormalizer /** * Merges duplicate elements like multiple declarations of the same build plugin in the specified model. - * + * * @param model The model whose duplicate elements should be merged, must not be {@code null}. * @param request The model building request that holds further settings, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. @@ -44,7 +44,7 @@ public interface ModelNormalizer /** * Sets default values in the specified model that for technical reasons cannot be set directly in the Modello * definition. - * + * * @param model The model in which to set the default values, must not be {@code null}. * @param request The model building request that holds further settings, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java index 3bc4925995..469e6235cd 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java @@ -33,7 +33,7 @@ /** * Resolves relative paths within a model against a specific base directory. - * + * * @author Benjamin Bentmann */ @Component( role = ModelPathTranslator.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java index 78b8260c97..0d40d48d19 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java @@ -30,7 +30,7 @@ /** * Normalizes URLs to remove the ugly parent references "../" that got potentially inserted by URL adjustment during * model inheritance. - * + * * @author Benjamin Bentmann */ @Component( role = ModelUrlNormalizer.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java index 757e278e92..7965253689 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java @@ -25,7 +25,7 @@ /** * Resolves relative paths against a specific base directory. - * + * * @author Benjamin Bentmann */ @Component( role = PathTranslator.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java index 538820d271..54d8a36260 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java @@ -23,7 +23,7 @@ /** * Normalizes a URL. - * + * * @author Benjamin Bentmann */ @Component( role = UrlNormalizer.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java index 1ba2509169..2bd39c5501 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java @@ -26,7 +26,7 @@ /** * Resolves relative paths of a model against a specific base directory. - * + * * @author Jason van Zyl */ public interface ModelPathTranslator @@ -35,7 +35,7 @@ public interface ModelPathTranslator /** * Resolves the well-known paths of the specified model against the given base directory. Paths within plugin * configuration are not processed. - * + * * @param model The model whose paths should be resolved, may be {@code null}. * @param basedir The base directory to resolve relative paths against, may be {@code null}. * @param request The model building request that holds further settings, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java index 6fa9caa31b..8325b05d35 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java @@ -25,7 +25,7 @@ /** * Normalizes URLs to remove the ugly parent references "../" that got potentially inserted by URL adjustment during * model inheritance. - * + * * @author Benjamin Bentmann */ public interface ModelUrlNormalizer @@ -33,7 +33,7 @@ public interface ModelUrlNormalizer /** * Normalizes the well-known URLs of the specified model. - * + * * @param model The model whose URLs should be normalized, may be {@code null}. * @param request The model building request that holds further settings, must not be {@code null}. */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java index 3613af8244..c416e6aba3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java @@ -23,7 +23,7 @@ /** * Resolves relative paths against a specific base directory. - * + * * @author Jason van Zyl */ public interface PathTranslator @@ -33,7 +33,7 @@ public interface PathTranslator * Resolves the specified path against the given base directory. The resolved path will be absolute and uses the * platform-specific file separator if a base directory is given. Otherwise, the input path will be returned * unaltered. - * + * * @param path The path to resolve, may be {@code null}. * @param basedir The base directory to resolve relative paths against, may be {@code null}. * @return The resolved path or {@code null} if the input path was {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java index dbcc902952..b2e4a7b1ce 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java @@ -22,7 +22,7 @@ /** * Normalizes a URL to remove the ugly parent references "../" that got potentially inserted by URL adjustment during * model inheritance. - * + * * @author Benjamin Bentmann */ public interface UrlNormalizer @@ -30,7 +30,7 @@ public interface UrlNormalizer /** * Normalizes the specified URL. - * + * * @param url The URL to normalize, may be {@code null}. * @return The normalized URL or {@code null} if the input was {@code null}. */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java index 04a57c5fd2..82430ed4fd 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java @@ -33,7 +33,7 @@ /** * Handles expansion of general build plugin configuration into individual executions. - * + * * @author Benjamin Bentmann */ @Component( role = PluginConfigurationExpander.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java index 3e6e3e042d..6b2849965d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java @@ -30,7 +30,7 @@ /** * Handles expansion of general report plugin configuration into individual report sets. - * + * * @author Benjamin Bentmann */ @Component( role = ReportConfigurationExpander.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java index 4d4d3159e9..9b81ccbcca 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java @@ -34,7 +34,7 @@ /** * Handles conversion of the legacy reporting section into the configuration of the new Maven Site Plugin. - * + * * @author Benjamin Bentmann */ @Component( role = ReportingConverter.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java index f6c55e9a00..9c0f06de1e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java @@ -25,7 +25,7 @@ /** * Handles injection of plugin executions induced by the lifecycle bindings for a packaging. - * + * * @author Benjamin Bentmann */ public interface LifecycleBindingsInjector @@ -35,7 +35,7 @@ public interface LifecycleBindingsInjector * Injects plugin executions induced by lifecycle bindings into the specified model. The model has already undergone * injection of plugin management so any plugins that are injected by lifecycle bindings and are not already present * in the model's plugin section need to be subjected to the model's plugin management. - * + * * @param model The model into which to inject the default plugin executions for its packaging, must not be * null. * @param request The model building request that holds further settings, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java index 1e08477a8f..23994aa6f3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java @@ -25,7 +25,7 @@ /** * Handles expansion of general build plugin configuration into individual executions. - * + * * @author Benjamin Bentmann */ public interface PluginConfigurationExpander @@ -33,7 +33,7 @@ public interface PluginConfigurationExpander /** * Merges values from general build plugin configuration into the individual plugin executions of the given model. - * + * * @param model The model whose build plugin configuration should be expanded, must not be null. * @param request The model building request that holds further settings, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java index b403236d86..28ad596249 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java @@ -25,7 +25,7 @@ /** * Handles expansion of general report plugin configuration into individual report sets. - * + * * @author Benjamin Bentmann */ public interface ReportConfigurationExpander @@ -33,7 +33,7 @@ public interface ReportConfigurationExpander /** * Merges values from general report plugin configuration into the individual reports sets of the given model. - * + * * @param model The model whose report plugin configuration should be expanded, must not be null. * @param request The model building request that holds further settings, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java index 7ffd9e29c6..c5ea338c85 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java @@ -25,7 +25,7 @@ /** * Handles conversion of the legacy reporting section into the configuration of the new Maven Site Plugin. - * + * * @author Benjamin Bentmann */ public interface ReportingConverter @@ -33,7 +33,7 @@ public interface ReportingConverter /** * Converts values from model's reporting section into the configuration for the new Maven Site Plugin. - * + * * @param model The model whose reporting section should be converted, must not be null. * @param request The model building request that holds further settings, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java index 38421bc4e9..bb6a0795d6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java @@ -43,7 +43,7 @@ /** * Handles profile injection into the model. - * + * * @author Benjamin Bentmann */ @Component( role = ProfileInjector.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java index 80a051a83c..db2bf626f3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java @@ -36,7 +36,7 @@ /** * Calculates the active profiles among a given collection of profiles. - * + * * @author Benjamin Bentmann */ @Component( role = ProfileSelector.class ) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java index fb9ea0cd89..d501e660a5 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java @@ -25,7 +25,7 @@ /** * Describes the environmental context used to determine the activation status of profiles. - * + * * @author Benjamin Bentmann */ public interface ProfileActivationContext @@ -33,14 +33,14 @@ public interface ProfileActivationContext /** * Gets the identifiers of those profiles that should be activated by explicit demand. - * + * * @return The identifiers of those profiles to activate, never {@code null}. */ List getActiveProfileIds(); /** * Gets the identifiers of those profiles that should be deactivated by explicit demand. - * + * * @return The identifiers of those profiles to deactivate, never {@code null}. */ List getInactiveProfileIds(); @@ -48,7 +48,7 @@ public interface ProfileActivationContext /** * Gets the system properties to use for interpolation and profile activation. The system properties are collected * from the runtime environment like {@link System#getProperties()} and environment variables. - * + * * @return The execution properties, never {@code null}. */ Map getSystemProperties(); @@ -57,14 +57,14 @@ public interface ProfileActivationContext * Gets the user properties to use for interpolation and profile activation. The user properties have been * configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command * line. - * + * * @return The user properties, never {@code null}. */ Map getUserProperties(); /** * Gets the base directory of the current project (if any). - * + * * @return The base directory of the current project or {@code null} if none. */ File getProjectDirectory(); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java index 5c1e8eae00..fbd7ddf022 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java @@ -26,7 +26,7 @@ /** * Handles profile injection into the model. - * + * * @author Benjamin Bentmann */ public interface ProfileInjector @@ -35,7 +35,7 @@ public interface ProfileInjector /** * Merges values from the specified profile into the given model. Implementations are expected to keep the profile * and model completely decoupled by injecting deep copies rather than the original objects from the profile. - * + * * @param model The model into which to merge the values defined by the profile, must not be null. * @param profile The (read-only) profile whose values should be injected, may be null. * @param request The model building request that holds further settings, must not be {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java index f58dcc8936..53ea8d9c04 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java @@ -27,7 +27,7 @@ /** * Calculates the active profiles among a given collection of profiles. - * + * * @author Benjamin Bentmann */ public interface ProfileSelector @@ -36,7 +36,7 @@ public interface ProfileSelector /** * Determines the profiles which are active in the specified activation context. Active profiles will eventually be * injected into the model. - * + * * @param profiles The profiles whose activation status should be determined, must not be {@code null}. * @param context The environmental context used to determine the activation status of a profile, must not be * {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java index e86f142eb1..b0bda3f506 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java @@ -44,7 +44,7 @@ * System properties and request properties. * ${project.basedir} is intentionally not supported as this form would suggest that other * ${project.*} expressions can be used, which is however beyond the design. - * + * * @author Benjamin Bentmann * @see ActivationFile * @see org.apache.maven.model.validation.DefaultModelValidator#validateRawModel diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java index 10747de6be..4dc5858e44 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java @@ -34,7 +34,7 @@ /** * Determines profile activation based on the version of the current Java runtime. - * + * * @author Benjamin Bentmann * @see Activation#getJdk() */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java index b6d3f052b5..2d53621a08 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java @@ -29,7 +29,7 @@ /** * Determines profile activation based on the operating system of the current runtime platform. - * + * * @author Benjamin Bentmann * @see ActivationOS */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java index 57487d47b1..0547e742f7 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java @@ -25,7 +25,7 @@ /** * Determines whether a profile should be activated. - * + * * @author Benjamin Bentmann */ public interface ProfileActivator @@ -33,7 +33,7 @@ public interface ProfileActivator /** * Determines whether the specified profile is active in the given activator context. - * + * * @param profile The profile whose activation status should be determined, must not be {@code null}. * @param context The environmental context used to determine the activation status of the profile, must not be * {@code null}. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java index e8e6e998ef..9a7c244a34 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java @@ -32,7 +32,7 @@ /** * Determines profile activation based on the existence or value of some execution property. - * + * * @author Benjamin Bentmann * @see ActivationProperty */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java index 7324adfc36..303aff08cf 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java @@ -23,7 +23,7 @@ /** * Signals an error when adding a repository to the model resolver. - * + * * @author Benjamin Bentmann */ public class InvalidRepositoryException @@ -37,7 +37,7 @@ public class InvalidRepositoryException /** * Creates a new exception with specified detail message and cause for the given repository. - * + * * @param message The detail message, may be {@code null}. * @param repository The repository that caused the error, may be {@code null}. * @param cause The cause, may be {@code null}. @@ -50,7 +50,7 @@ public InvalidRepositoryException( String message, Repository repository, Throwa /** * Creates a new exception with specified detail message for the given repository. - * + * * @param message The detail message, may be {@code null}. * @param repository The repository that caused the error, may be {@code null}. */ @@ -62,7 +62,7 @@ public InvalidRepositoryException( String message, Repository repository ) /** * Gets the repository that causes this error (if any). - * + * * @return The repository that causes this error or {@code null} if not known. */ public Repository getRepository() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java index aa48fa2586..733a276cc2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java @@ -21,7 +21,7 @@ /** * Signals an error when resolving the path to an external model. - * + * * @author Benjamin Bentmann */ public class UnresolvableModelException @@ -45,7 +45,7 @@ public class UnresolvableModelException /** * Creates a new exception with specified detail message and cause. - * + * * @param message The detail message, may be {@code null}. * @param groupId The group id of the unresolvable model, may be {@code null}. * @param artifactId The artifact id of the unresolvable model, may be {@code null}. @@ -63,7 +63,7 @@ public UnresolvableModelException( String message, String groupId, String artifa /** * Creates a new exception with specified detail message. - * + * * @param message The detail message, may be {@code null}. * @param groupId The group id of the unresolvable model, may be {@code null}. * @param artifactId The artifact id of the unresolvable model, may be {@code null}. @@ -79,7 +79,7 @@ public UnresolvableModelException( String message, String groupId, String artifa /** * Gets the group id of the unresolvable model. - * + * * @return The group id of the unresolvable model, can be empty but never {@code null}. */ public String getGroupId() @@ -89,7 +89,7 @@ public String getGroupId() /** * Gets the artifact id of the unresolvable model. - * + * * @return The artifact id of the unresolvable model, can be empty but never {@code null}. */ public String getArtifactId() @@ -99,7 +99,7 @@ public String getArtifactId() /** * Gets the version of the unresolvable model. - * + * * @return The version of the unresolvable model, can be empty but never {@code null}. */ public String getVersion() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java index 46d807fadc..3f44fb7e4e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java @@ -23,7 +23,7 @@ /** * Provides the super POM that all models implicitly inherit from. - * + * * @author Benjamin Bentmann */ public interface SuperPomProvider @@ -33,7 +33,7 @@ public interface SuperPomProvider * Gets the super POM for the specified model version. The returned model is supposed to be read-only, i.e. if the * caller intends to make updates to the model the return value must be cloned before updating to ensure the * modifications don't affect future retrievals of the super POM. - * + * * @param version The model version to retrieve the super POM for (e.g. "4.0.0"), must not be {@code null}. * @return The super POM, never {@code null}. */ diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index fd66323cac..6b2a98de12 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -747,7 +747,7 @@ private boolean validateIdWithWildcards( String fieldName, ModelProblemCollector } } - + private boolean validateStringNoExpression( String fieldName, ModelProblemCollector problems, Severity severity, Version version, String string, InputLocationTracker tracker ) { diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java index 34bd97a5dc..84e3faddc5 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java @@ -25,7 +25,7 @@ /** * Checks the model for missing or invalid values. - * + * * @author Trygve Laugstøl */ public interface ModelValidator @@ -34,7 +34,7 @@ public interface ModelValidator /** * Checks the specified (raw) model for missing or invalid values. The raw model is directly created from the POM * file and has not been subjected to inheritance, interpolation or profile/default injection. - * + * * @param model The model to validate, must not be {@code null}. * @param request The model building request that holds further settings, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. @@ -44,7 +44,7 @@ public interface ModelValidator /** * Checks the specified (effective) model for missing or invalid values. The effective model is fully assembled and * has undergone inheritance, interpolation and other model operations. - * + * * @param model The model to validate, must not be {@code null}. * @param request The model building request that holds further settings, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java index 06f1b1bb0c..bb0ccff942 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java @@ -27,7 +27,7 @@ /** * A simple model problem collector for testing the model building components. - * + * * @author Benjamin Bentmann */ public class SimpleProblemCollector diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java index 5d24f185bd..c4cae3d455 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java @@ -38,7 +38,7 @@ * @author Benjamin Bentmann */ public class StringSearchModelInterpolatorTest - extends AbstractModelInterpolatorTest + extends AbstractModelInterpolatorTest { protected ModelInterpolator interpolator; @@ -81,7 +81,7 @@ public void testInterpolateStringArray() final SimpleProblemCollector collector = new SimpleProblemCollector(); interpolator.interpolateObject( values, model, new File( "." ), config, collector ); - assertProblemFree( collector ); + assertProblemFree( collector ); assertEquals( "value", values[0] ); assertEquals( "value2", values[1] ); @@ -113,7 +113,7 @@ public void testInterpolateObjectWithStringArrayField() final SimpleProblemCollector collector = new SimpleProblemCollector(); interpolator.interpolateObject( obj, model, new File( "." ), config, collector ); - assertProblemFree( collector ); + assertProblemFree( collector ); assertEquals( "value", obj.values[0] ); assertEquals( "value2", obj.values[1] ); @@ -167,7 +167,7 @@ public void testInterpolateObjectWithStringListFieldAndOneLiteralValue() final SimpleProblemCollector collector = new SimpleProblemCollector(); interpolator.interpolateObject( obj, model, new File( "." ), config, collector ); - assertProblemFree( collector ); + assertProblemFree( collector ); assertEquals( "key", obj.values.get( 0 ) ); assertEquals( "value2", obj.values.get( 1 ) ); @@ -192,7 +192,7 @@ public void testInterpolateObjectWithUnmodifiableStringListField() final SimpleProblemCollector collector = new SimpleProblemCollector(); interpolator.interpolateObject( obj, model, new File( "." ), config, collector ); - assertProblemFree( collector ); + assertProblemFree( collector ); assertEquals( "${key}", obj.values.get( 0 ) ); } @@ -276,7 +276,7 @@ public void testInterpolateObjectWithStringToStringMapFieldAndOneLiteralValue() final SimpleProblemCollector collector = new SimpleProblemCollector(); interpolator.interpolateObject( obj, model, new File( "." ), config, collector ); - assertProblemFree( collector ); + assertProblemFree( collector ); assertEquals( "val", obj.values.get( "key" ) ); assertEquals( "value2", obj.values.get( "key2" ) ); @@ -329,7 +329,7 @@ public void testInterpolateObjectWithStringToStringArrayMapField() final SimpleProblemCollector collector = new SimpleProblemCollector(); interpolator.interpolateObject( obj, model, new File( "." ), config, collector ); - assertProblemFree( collector ); + assertProblemFree( collector ); assertEquals( "value", ( (String[]) obj.values.get( "key" ) )[0] ); assertEquals( "value2", ( (String[]) obj.values.get( "key" ) )[1] ); @@ -460,7 +460,7 @@ public String getFooBar() return fooBar; } } - + public void testFinalFieldsExcludedFromInterpolation() { Properties props = new Properties(); diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java index 7449c36b19..0ec3b326d4 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java @@ -30,7 +30,7 @@ /** * Provides common services to test {@link ProfileActivator} implementations. - * + * * @author Benjamin Bentmann */ public abstract class AbstractProfileActivatorTest diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java index e7bfe2cdb9..440f120bbb 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java @@ -26,7 +26,7 @@ /** * Tests {@link JdkVersionProfileActivator}. - * + * * @author Benjamin Bentmann */ public class JdkVersionProfileActivatorTest diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java index 6434864806..73ab967e53 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java @@ -27,7 +27,7 @@ /** * Tests {@link PropertyProfileActivator}. - * + * * @author Benjamin Bentmann */ public class PropertyProfileActivatorTest diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java index ac7ead0dfa..791a31893d 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java @@ -563,9 +563,9 @@ public void testBadDependencyExclusionId() "'dependencies.dependency.exclusions.exclusion.groupId' for gid:aid:jar" ); assertContains( result.getWarnings().get( 1 ), "'dependencies.dependency.exclusions.exclusion.artifactId' for gid:aid:jar" ); - + // MNG-3832: Aether (part of M3+) supports wildcard expressions for exclusions - + SimpleProblemCollector result_30 = validate( "bad-dependency-exclusion-id.xml" ); assertViolations( result_30, 0, 0, 0 ); diff --git a/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml b/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml index b050b13230..977f5db4e5 100644 --- a/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml +++ b/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml @@ -23,7 +23,7 @@ under the License. foo 99.44 bleh - + test-module diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java index c52dd8e644..648607ce0f 100644 --- a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java +++ b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java @@ -4,7 +4,7 @@ * These classes use * plexus-utils' * XML Pull Parser API for their internal XML handling and - * Xpp3DomBuilder + + * Xpp3DomBuilder + * Xpp3Dom for * DOM content representation (see <configuration> elements). */ diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java index fdaa1d9e4d..f88da58142 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java @@ -23,7 +23,7 @@ /** * Tests {@code ActivationFile}. - * + * * @author Benjamin Bentmann */ public class ActivationFileTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java index bcc56e8eeb..f0d3045078 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java @@ -23,7 +23,7 @@ /** * Tests {@code ActivationOS}. - * + * * @author Benjamin Bentmann */ public class ActivationOSTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java index 38b234ee46..5f5e048a90 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java @@ -23,7 +23,7 @@ /** * Tests {@code ActivationProperty}. - * + * * @author Benjamin Bentmann */ public class ActivationPropertyTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java index 96550d1c51..f6d0f91002 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Activation}. - * + * * @author Benjamin Bentmann */ public class ActivationTest diff --git a/maven-model/src/test/java/org/apache/maven/model/BuildTest.java b/maven-model/src/test/java/org/apache/maven/model/BuildTest.java index 630d812828..80a60d57ea 100644 --- a/maven-model/src/test/java/org/apache/maven/model/BuildTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/BuildTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Build}. - * + * * @author Benjamin Bentmann */ public class BuildTest diff --git a/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java index 8803364275..7194c8442c 100644 --- a/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java @@ -23,7 +23,7 @@ /** * Tests {@code CiManagement}. - * + * * @author Benjamin Bentmann */ public class CiManagementTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java b/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java index d9cd17e626..491b99ae82 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Contributor}. - * + * * @author Benjamin Bentmann */ public class ContributorTest diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java index f964da4245..7702c62fd9 100644 --- a/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java @@ -23,7 +23,7 @@ /** * Tests {@code DependencyManagement}. - * + * * @author Benjamin Bentmann */ public class DependencyManagementTest diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java b/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java index d0e7dd95dd..ec0a833655 100644 --- a/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Dependency}. - * + * * @author Benjamin Bentmann */ public class DependencyTest diff --git a/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java b/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java index 19843567e8..169ec65079 100644 --- a/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java @@ -23,7 +23,7 @@ /** * Tests {@code DeploymentRepository}. - * + * * @author Benjamin Bentmann */ public class DeploymentRepositoryTest diff --git a/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java b/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java index 5c9c480dab..c0dfe56dfa 100644 --- a/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Developer}. - * + * * @author Benjamin Bentmann */ public class DeveloperTest diff --git a/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java index d3110df9ca..0314d61b71 100644 --- a/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java @@ -23,7 +23,7 @@ /** * Tests {@code DistributionManagement}. - * + * * @author Benjamin Bentmann */ public class DistributionManagementTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java b/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java index b80c2e8ec8..6febacebed 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Exclusion}. - * + * * @author Benjamin Bentmann */ public class ExclusionTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java b/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java index 34afb8e87a..4b8cd8a117 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Extension}. - * + * * @author Benjamin Bentmann */ public class ExtensionTest diff --git a/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java index bcd25ec622..5e50c15715 100644 --- a/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java @@ -23,7 +23,7 @@ /** * Tests {@code IssueManagement}. - * + * * @author Benjamin Bentmann */ public class IssueManagementTest diff --git a/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java b/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java index 012a5ddf1a..179921b2b7 100644 --- a/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java @@ -23,7 +23,7 @@ /** * Tests {@code License}. - * + * * @author Benjamin Bentmann */ public class LicenseTest diff --git a/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java b/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java index f702673d0b..612969520d 100644 --- a/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java @@ -23,7 +23,7 @@ /** * Tests {@code MailingList}. - * + * * @author Benjamin Bentmann */ public class MailingListTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ModelTest.java b/maven-model/src/test/java/org/apache/maven/model/ModelTest.java index 9fcadfad95..c9ec4da96a 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ModelTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ModelTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Model}. - * + * * @author Benjamin Bentmann */ public class ModelTest diff --git a/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java b/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java index bbafb6b96a..4e5d0685ca 100644 --- a/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Notifier}. - * + * * @author Benjamin Bentmann */ public class NotifierTest diff --git a/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java b/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java index b7ea28e419..48abe77e2b 100644 --- a/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Organization}. - * + * * @author Benjamin Bentmann */ public class OrganizationTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ParentTest.java b/maven-model/src/test/java/org/apache/maven/model/ParentTest.java index 04f5a7461f..78d45672a3 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ParentTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ParentTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Parent}. - * + * * @author Benjamin Bentmann */ public class ParentTest diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java index 08a9531767..cbb123d5ab 100644 --- a/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java @@ -23,7 +23,7 @@ /** * Tests {@code PluginConfiguration}. - * + * * @author Benjamin Bentmann */ public class PluginConfigurationTest diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java index 8c1277373e..878298cf3e 100644 --- a/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java @@ -23,7 +23,7 @@ /** * Tests {@code PluginContainer}. - * + * * @author Benjamin Bentmann */ public class PluginContainerTest diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java index 72d73fd5de..e8fff5129a 100644 --- a/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java @@ -23,7 +23,7 @@ /** * Tests {@code PluginExecution}. - * + * * @author Benjamin Bentmann */ public class PluginExecutionTest diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java index fb80a77ea1..571399feb0 100644 --- a/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java @@ -23,7 +23,7 @@ /** * Tests {@code PluginManagement}. - * + * * @author Benjamin Bentmann */ public class PluginManagementTest diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginTest.java index 6e2d12a396..582145e096 100644 --- a/maven-model/src/test/java/org/apache/maven/model/PluginTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/PluginTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Plugin}. - * + * * @author Benjamin Bentmann */ public class PluginTest diff --git a/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java b/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java index 7b352e20b7..727f2c3f23 100644 --- a/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Prerequisites}. - * + * * @author Benjamin Bentmann */ public class PrerequisitesTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java b/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java index 9085964378..512e2a8892 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Profile}. - * + * * @author Benjamin Bentmann */ public class ProfileTest diff --git a/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java b/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java index 9319d20874..265304d8da 100644 --- a/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Relocation}. - * + * * @author Benjamin Bentmann */ public class RelocationTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java index 53e8a00651..d10cb791d5 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java @@ -23,7 +23,7 @@ /** * Tests {@code ReportPlugin}. - * + * * @author Benjamin Bentmann */ public class ReportPluginTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java index b3a789afad..2f51415329 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java @@ -23,7 +23,7 @@ /** * Tests {@code ReportSet}. - * + * * @author Benjamin Bentmann */ public class ReportSetTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java index 46f22a390c..dbc0fa2256 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Reporting}. - * + * * @author Benjamin Bentmann */ public class ReportingTest diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java b/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java index f983df9bfd..3ae3435040 100644 --- a/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java @@ -23,7 +23,7 @@ /** * Tests {@code RepositoryPolicy}. - * + * * @author Benjamin Bentmann */ public class RepositoryPolicyTest diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java b/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java index 3b27b14359..b68b70a1ff 100644 --- a/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Repository}. - * + * * @author Benjamin Bentmann */ public class RepositoryTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java b/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java index 012be551d9..fa40ab43d9 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Resource}. - * + * * @author Benjamin Bentmann */ public class ResourceTest diff --git a/maven-model/src/test/java/org/apache/maven/model/ScmTest.java b/maven-model/src/test/java/org/apache/maven/model/ScmTest.java index 57dba9c5ef..4d7699310e 100644 --- a/maven-model/src/test/java/org/apache/maven/model/ScmTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/ScmTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Scm}. - * + * * @author Benjamin Bentmann */ public class ScmTest diff --git a/maven-model/src/test/java/org/apache/maven/model/SiteTest.java b/maven-model/src/test/java/org/apache/maven/model/SiteTest.java index 7813670815..84896bb4d7 100644 --- a/maven-model/src/test/java/org/apache/maven/model/SiteTest.java +++ b/maven-model/src/test/java/org/apache/maven/model/SiteTest.java @@ -23,7 +23,7 @@ /** * Tests {@code Site}. - * + * * @author Benjamin Bentmann */ public class SiteTest diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java index ab4568c081..4d99546ae2 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java @@ -31,7 +31,7 @@ public class MojoNotFoundException private String goal; private PluginDescriptor pluginDescriptor; - + public MojoNotFoundException( String goal, PluginDescriptor pluginDescriptor ) { super( toMessage( goal, pluginDescriptor ) ); @@ -48,7 +48,7 @@ public String getGoal() public PluginDescriptor getPluginDescriptor() { return pluginDescriptor; - } + } private static String toMessage( String goal, PluginDescriptor pluginDescriptor ) { diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java index 7ebb04a2f7..bc2d55547a 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java @@ -291,7 +291,7 @@ public void setDependencyCollectionRequired( String requiresDependencyCollection * resolution, this does not include the download of the files for the dependency artifacts. It is meant for mojos * that only want to analyze the set of transitive dependencies, in particular during early lifecycle phases where * full dependency resolution might fail due to projects which haven't been built yet. - * + * * @return The scope of (transitive) dependencies that should be collected or {@code null} if none. * @since 3.0-alpha-3 */ diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java index b15f7e0c54..1d6f1be4c9 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java @@ -251,7 +251,7 @@ public void setArtifacts( List artifacts ) /** * The map of artifacts accessible by the versionlessKey, i.e. groupId:artifactId - * + * * @return a Map of artifacts, never {@code null} * @see #getArtifacts() */ diff --git a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java index 5fbf76e001..799e3af0e2 100644 --- a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java +++ b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java @@ -32,7 +32,7 @@ /** * Tests {@link PluginDescriptorBuilder}. - * + * * @author Benjamin Bentmann */ public class PluginDescriptorBuilderTest diff --git a/maven-plugin-api/src/test/resources/plugin.xml b/maven-plugin-api/src/test/resources/plugin.xml index 49db31671c..6b972113a7 100644 --- a/maven-plugin-api/src/test/resources/plugin.xml +++ b/maven-plugin-api/src/test/resources/plugin.xml @@ -55,7 +55,7 @@ under the License. finalName jarName java.lang.String - java.lang.String + java.lang.String false true parameter-description diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java index 74709aea98..29a431822a 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java @@ -44,7 +44,7 @@ /** * Builds the effective settings from a user settings file and/or a global settings file. - * + * * @author Benjamin Bentmann */ @Component( role = SettingsBuilder.class ) diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java index cb7d4c5c4c..e728ec5503 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java @@ -31,7 +31,7 @@ * is only meant as a utility for developers that want to employ the settings builder outside of the Maven build system, * Maven plugins should always acquire settings builder instances via dependency injection. Developers might want to * subclass this factory to provide custom implementations for some of the components used by the settings builder. - * + * * @author Benjamin Bentmann */ public class DefaultSettingsBuilderFactory @@ -54,7 +54,7 @@ protected SettingsValidator newSettingsValidator() /** * Creates a new settings builder instance. - * + * * @return The new settings builder instance, never {@code null}. */ public DefaultSettingsBuilder newInstance() diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java index 08c93fce43..14dc2281c2 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java @@ -24,7 +24,7 @@ /** * Collects settings that control building of effective settings. - * + * * @author Benjamin Bentmann */ public class DefaultSettingsBuildingRequest diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java index de9d73a205..e6d51c9aec 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java @@ -26,7 +26,7 @@ /** * Collects the output of the settings builder. - * + * * @author Benjamin Bentmann */ class DefaultSettingsBuildingResult diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java index 9f56aefea8..cf15a03db2 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java @@ -23,7 +23,7 @@ * Describes a problem that was encountered during settings building. A problem can either be an exception that was * thrown or a simple string message. In addition, a problem carries a hint about its source, e.g. the settings file * that exhibits the problem. - * + * * @author Benjamin Bentmann */ public class DefaultSettingsProblem @@ -44,7 +44,7 @@ public class DefaultSettingsProblem /** * Creates a new problem with the specified message and exception. - * + * * @param message The message describing the problem, may be {@code null}. * @param severity The severity level of the problem, may be {@code null} to default to * {@link SettingsProblem.Severity#ERROR}. diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java index 75eeec49f6..bcab779c3a 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java @@ -26,7 +26,7 @@ /** * Collects problems that are encountered during settings building. - * + * * @author Benjamin Bentmann */ class DefaultSettingsProblemCollector diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java index 80c5e782d1..a821e08839 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java @@ -26,7 +26,7 @@ /** * Wraps an ordinary {@link File} as a settings source. - * + * * @author Benjamin Bentmann */ public class FileSettingsSource @@ -37,7 +37,7 @@ public class FileSettingsSource /** * Creates a new settings source backed by the specified file. - * + * * @param settingsFile The settings file, must not be {@code null}. */ public FileSettingsSource( File settingsFile ) @@ -62,7 +62,7 @@ public String getLocation() /** * Gets the settings file of this model source. - * + * * @return The underlying settings file, never {@code null}. */ public File getSettingsFile() diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java index ed9c986a4d..61e34e990b 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java @@ -21,7 +21,7 @@ /** * Builds the effective settings from a user settings file and/or a global settings file. - * + * * @author Benjamin Bentmann */ public interface SettingsBuilder @@ -29,7 +29,7 @@ public interface SettingsBuilder /** * Builds the effective settings of the specified settings files. - * + * * @param request The settings building request that holds the parameters, must not be {@code null}. * @return The result of the settings building, never {@code null}. * @throws SettingsBuildingException If the effective settings could not be built. diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java index 438e96110f..f7d48e4b36 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java @@ -28,7 +28,7 @@ * Signals one ore more errors during settings building. The settings builder tries to collect as many problems as * possible before eventually failing to provide callers with rich error information. Use {@link #getProblems()} to * query the details of the failure. - * + * * @author Benjamin Bentmann */ public class SettingsBuildingException @@ -39,7 +39,7 @@ public class SettingsBuildingException /** * Creates a new exception with the specified problems. - * + * * @param problems The problems that causes this exception, may be {@code null}. */ public SettingsBuildingException( List problems ) @@ -55,7 +55,7 @@ public SettingsBuildingException( List problems ) /** * Gets the problems that caused this exception. - * + * * @return The problems that caused this exception, never {@code null}. */ public List getProblems() diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java index cc76e320bf..92d87d80d7 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java @@ -24,7 +24,7 @@ /** * Collects settings that control the building of effective settings. - * + * * @author Benjamin Bentmann */ public interface SettingsBuildingRequest @@ -32,7 +32,7 @@ public interface SettingsBuildingRequest /** * Gets the global settings file. - * + * * @return The global settings file or {@code null} if none. */ File getGlobalSettingsFile(); @@ -40,7 +40,7 @@ public interface SettingsBuildingRequest /** * Sets the global settings file. A non-existent settings file is equivalent to empty settings. If both user * settings and global settings are given, the user settings take precedence. - * + * * @param globalSettingsFile The global settings file, may be {@code null} to disable global settings. * @return This request, never {@code null}. */ @@ -48,7 +48,7 @@ public interface SettingsBuildingRequest /** * Gets the global settings source. - * + * * @return The global settings source or {@code null} if none. */ SettingsSource getGlobalSettingsSource(); @@ -56,7 +56,7 @@ public interface SettingsBuildingRequest /** * Sets the global settings source. If both user settings and a global settings are given, the user settings take * precedence. - * + * * @param globalSettingsSource The global settings source, may be {@code null} to disable global settings. * @return This request, never {@code null}. */ @@ -64,7 +64,7 @@ public interface SettingsBuildingRequest /** * Gets the user settings file. - * + * * @return The user settings file or {@code null} if none. */ File getUserSettingsFile(); @@ -72,7 +72,7 @@ public interface SettingsBuildingRequest /** * Sets the user settings file. A non-existent settings file is equivalent to empty settings. If both a user * settings file and a global settings file are given, the user settings take precedence. - * + * * @param userSettingsFile The user settings file, may be {@code null} to disable user settings. * @return This request, never {@code null}. */ @@ -80,7 +80,7 @@ public interface SettingsBuildingRequest /** * Gets the user settings source. - * + * * @return The user settings source or {@code null} if none. */ SettingsSource getUserSettingsSource(); @@ -88,7 +88,7 @@ public interface SettingsBuildingRequest /** * Sets the user settings source. If both user settings and a global settings are given, the user settings take * precedence. - * + * * @param userSettingsSource The user settings source, may be {@code null} to disable user settings. * @return This request, never {@code null}. */ @@ -97,7 +97,7 @@ public interface SettingsBuildingRequest /** * Gets the system properties to use for interpolation. The system properties are collected from the runtime * environment like {@link System#getProperties()} and environment variables. - * + * * @return The system properties, never {@code null}. */ Properties getSystemProperties(); @@ -105,7 +105,7 @@ public interface SettingsBuildingRequest /** * Sets the system properties to use for interpolation. The system properties are collected from the runtime * environment like {@link System#getProperties()} and environment variables. - * + * * @param systemProperties The system properties, may be {@code null}. * @return This request, never {@code null}. */ @@ -114,7 +114,7 @@ public interface SettingsBuildingRequest /** * Gets the user properties to use for interpolation. The user properties have been configured directly by the user * on his discretion, e.g. via the {@code -Dkey=value} parameter on the command line. - * + * * @return The user properties, never {@code null}. */ Properties getUserProperties(); @@ -122,7 +122,7 @@ public interface SettingsBuildingRequest /** * Sets the user properties to use for interpolation. The user properties have been configured directly by the user * on his discretion, e.g. via the {@code -Dkey=value} parameter on the command line. - * + * * @param userProperties The user properties, may be {@code null}. * @return This request, never {@code null}. */ diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java index 3fb6327bda..43b2359fac 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java @@ -25,7 +25,7 @@ /** * Collects the output of the settings builder. - * + * * @author Benjamin Bentmann */ public interface SettingsBuildingResult @@ -33,7 +33,7 @@ public interface SettingsBuildingResult /** * Gets the assembled settings. - * + * * @return The assembled settings, never {@code null}. */ Settings getEffectiveSettings(); @@ -42,7 +42,7 @@ public interface SettingsBuildingResult * Gets the problems that were encountered during the settings building. Note that only problems of severity * {@link SettingsProblem.Severity#WARNING} and below are reported here. Problems with a higher severity level cause * the settings builder to fail with a {@link SettingsBuildingException}. - * + * * @return The problems that were encountered during the settings building, can be empty but never {@code null}. */ List getProblems(); diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java index c0798cd3b9..e9e563d9e7 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java @@ -23,7 +23,7 @@ * Describes a problem that was encountered during settings building. A problem can either be an exception that was * thrown or a simple string message. In addition, a problem carries a hint about its source, e.g. the settings file * that exhibits the problem. - * + * * @author Benjamin Bentmann */ public interface SettingsProblem @@ -46,7 +46,7 @@ enum Severity * creator of the problem, the general expectation is that the hint provides sufficient information to the user to * track the problem back to its origin. A concrete example for such a source hint can be the file path or URL from * which the settings were read. - * + * * @return The hint about the source of the problem or an empty string if unknown, never {@code null}. */ String getSource(); @@ -54,7 +54,7 @@ enum Severity /** * Gets the one-based index of the line containing the problem. The line number should refer to some text file that * is given by {@link #getSource()}. - * + * * @return The one-based index of the line containing the problem or a non-positive value if unknown. */ int getLineNumber(); @@ -62,7 +62,7 @@ enum Severity /** * Gets the one-based index of the column containing the problem. The column number should refer to some text file * that is given by {@link #getSource()}. - * + * * @return The one-based index of the column containing the problem or non-positive value if unknown. */ int getColumnNumber(); @@ -71,28 +71,28 @@ enum Severity * Gets the location of the problem. The location is a user-friendly combination of the values from * {@link #getSource()}, {@link #getLineNumber()} and {@link #getColumnNumber()}. The exact syntax of the returned * value is undefined. - * + * * @return The location of the problem, never {@code null}. */ String getLocation(); /** * Gets the exception that caused this problem (if any). - * + * * @return The exception that caused this problem or {@code null} if not applicable. */ Exception getException(); /** * Gets the message that describes this problem. - * + * * @return The message describing this problem, never {@code null}. */ String getMessage(); /** * Gets the severity level of this problem. - * + * * @return The severity level of this problem, never {@code null}. */ Severity getSeverity(); diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java index 74f5659513..63869c0af9 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java @@ -21,7 +21,7 @@ /** * Collects problems that are encountered during settings building. - * + * * @author Benjamin Bentmann */ public interface SettingsProblemCollector @@ -29,7 +29,7 @@ public interface SettingsProblemCollector /** * Adds the specified problem. - * + * * @param severity The severity of the problem, must not be {@code null}. * @param message The detail message of the problem, may be {@code null}. * @param line The one-based index of the line containing the problem or {@code -1} if unknown. diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java index 82274e5373..3297ab43a7 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java @@ -24,7 +24,7 @@ /** * Provides access to the contents of settings independently of the backing store (e.g. file system, database, memory). - * + * * @author Benjamin Bentmann */ public interface SettingsSource @@ -33,7 +33,7 @@ public interface SettingsSource /** * Gets a byte stream to the settings contents. Closing the returned stream is the responsibility of the caller. * Note that each invocation of this method returns a new/fresh stream which represents the entire contents. - * + * * @return A byte stream to the settings contents, never {@code null}. */ InputStream getInputStream() @@ -42,7 +42,7 @@ InputStream getInputStream() /** * Provides a user-friendly hint about the location of the settings. This could be a local file path, a URI or just * an empty string. The intention is to assist users during error reporting. - * + * * @return A user-friendly hint about the location of the settings, never {@code null}. */ String getLocation(); diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java index 384d0c0b9b..5136f1bb23 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java @@ -25,7 +25,7 @@ /** * Wraps an ordinary {@link CharSequence} as a settings source. - * + * * @author Benjamin Bentmann */ public class StringSettingsSource @@ -38,7 +38,7 @@ public class StringSettingsSource /** * Creates a new settings source backed by the specified string. - * + * * @param settings The settings' string representation, may be empty or {@code null}. */ public StringSettingsSource( CharSequence settings ) @@ -48,7 +48,7 @@ public StringSettingsSource( CharSequence settings ) /** * Creates a new settings source backed by the specified string. - * + * * @param settings The settings' string representation, may be empty or {@code null}. * @param location The location to report for this use, may be {@code null}. */ @@ -71,7 +71,7 @@ public String getLocation() /** * Gets the character sequence of this settings source. - * + * * @return The underlying character stream, never {@code null}. */ public String getSettings() diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java index c358ecc9e8..04a09f6e07 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java @@ -25,7 +25,7 @@ /** * Wraps an ordinary {@link URL} as a settings source. - * + * * @author Benjamin Bentmann */ public class UrlSettingsSource @@ -36,7 +36,7 @@ public class UrlSettingsSource /** * Creates a new model source backed by the specified URL. - * + * * @param settingsUrl The settings URL, must not be {@code null}. */ public UrlSettingsSource( URL settingsUrl ) @@ -61,7 +61,7 @@ public String getLocation() /** * Gets the settings URL of this model source. - * + * * @return The underlying settings URL, never {@code null}. */ public URL getSettingsUrl() diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java index 04c540a12d..c09cf4ca5a 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java @@ -34,7 +34,7 @@ /** * Decrypts passwords in the settings. - * + * * @author Benjamin Bentmann */ @Component( role = SettingsDecrypter.class ) diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java index 093f49fe16..884a632aa2 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java @@ -29,7 +29,7 @@ /** * Collects parameters that control the decryption of settings. - * + * * @author Benjamin Bentmann */ public class DefaultSettingsDecryptionRequest @@ -50,7 +50,7 @@ public DefaultSettingsDecryptionRequest() /** * Creates a new request to decrypt the specified settings. - * + * * @param settings The settings to decrypt, must not be {@code null}. */ public DefaultSettingsDecryptionRequest( Settings settings ) @@ -61,7 +61,7 @@ public DefaultSettingsDecryptionRequest( Settings settings ) /** * Creates a new request to decrypt the specified server. - * + * * @param server The server to decrypt, must not be {@code null}. */ public DefaultSettingsDecryptionRequest( Server server ) @@ -71,7 +71,7 @@ public DefaultSettingsDecryptionRequest( Server server ) /** * Creates a new request to decrypt the specified proxy. - * + * * @param proxy The proxy to decrypt, must not be {@code null}. */ public DefaultSettingsDecryptionRequest( Proxy proxy ) diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java index cfb9b672ce..1e9fd72398 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java @@ -28,7 +28,7 @@ /** * Collects the output of the settings decrypter. - * + * * @author Benjamin Bentmann */ class DefaultSettingsDecryptionResult diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java index d12c525422..b34c3944b5 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java @@ -21,7 +21,7 @@ /** * Decrypts passwords in the settings. - * + * * @author Benjamin Bentmann */ public interface SettingsDecrypter @@ -29,7 +29,7 @@ public interface SettingsDecrypter /** * Decrypts passwords in the settings. - * + * * @param request The settings decryption request that holds the parameters, must not be {@code null}. * @return The result of the settings decryption, never {@code null}. */ diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java index defce890ec..b344a99ed9 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java @@ -26,7 +26,7 @@ /** * Collects parameters that control the decryption of settings. - * + * * @author Benjamin Bentmann */ public interface SettingsDecryptionRequest @@ -34,14 +34,14 @@ public interface SettingsDecryptionRequest /** * Gets the servers whose passwords should be decrypted. - * + * * @return The servers to decrypt, never {@code null}. */ List getServers(); /** * Sets the servers whose passwords should be decrypted. - * + * * @param servers The servers to decrypt, may be {@code null}. * @return This request, never {@code null}. */ @@ -49,14 +49,14 @@ public interface SettingsDecryptionRequest /** * Gets the proxies whose passwords should be decrypted. - * + * * @return The proxies to decrypt, never {@code null}. */ List getProxies(); /** * Sets the proxies whose passwords should be decrypted. - * + * * @param proxies The proxies to decrypt, may be {@code null}. * @return This request, never {@code null}. */ diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java index 2c846914c7..5b7b1f4b5a 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java @@ -27,7 +27,7 @@ /** * Collects the output of the settings decrypter. - * + * * @author Benjamin Bentmann */ public interface SettingsDecryptionResult @@ -35,35 +35,35 @@ public interface SettingsDecryptionResult /** * Gets the decrypted server. This is a convenience method to retrieve the first element from {@link #getServers()}. - * + * * @return The decrypted server or {@code null}. */ Server getServer(); /** * Gets the decrypted servers. - * + * * @return The decrypted server, can be empty but never {@code null}. */ List getServers(); /** * Gets the decrypted proxy. This is a convenience method to retrieve the first element from {@link #getProxies()}. - * + * * @return The decrypted proxy or {@code null}. */ Proxy getProxy(); /** * Gets the decrypted proxies. - * + * * @return The decrypted proxy, can be empty but never {@code null}. */ List getProxies(); /** * Gets the problems that were encountered during the settings decryption. - * + * * @return The problems that were encountered during the decryption, can be empty but never {@code null}. */ List getProblems(); diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java index 20ce3fb973..c538c419c6 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java @@ -34,7 +34,7 @@ /** * Handles deserialization of settings from the default textual format. - * + * * @author Benjamin Bentmann */ @Component( role = SettingsReader.class ) diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java index b5afad3ced..28e09b4bfc 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java @@ -34,7 +34,7 @@ /** * Handles serialization of settings into the default textual format. - * + * * @author Benjamin Bentmann */ @Component( role = SettingsWriter.class ) diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java index 991afb8b3f..425e6d8eb4 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java @@ -23,7 +23,7 @@ /** * Signals a failure to parse the settings due to invalid syntax (e.g. non-wellformed XML or unknown elements). - * + * * @author Benjamin Bentmann */ public class SettingsParseException @@ -42,7 +42,7 @@ public class SettingsParseException /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -56,7 +56,7 @@ public SettingsParseException( String message, int lineNumber, int columnNumber /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -72,7 +72,7 @@ public SettingsParseException( String message, int lineNumber, int columnNumber, /** * Gets the one-based index of the line containing the error. - * + * * @return The one-based index of the line containing the error or a non-positive value if unknown. */ public int getLineNumber() @@ -82,7 +82,7 @@ public int getLineNumber() /** * Gets the one-based index of the column containing the error. - * + * * @return The one-based index of the column containing the error or non-positive value if unknown. */ public int getColumnNumber() diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java index 1e519a5ba7..7817df6577 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java @@ -29,7 +29,7 @@ /** * Handles deserialization of settings from some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ public interface SettingsReader @@ -43,7 +43,7 @@ public interface SettingsReader /** * Reads the settings from the specified file. - * + * * @param input The file to deserialize the settings from, must not be {@code null}. * @param options The options to use for deserialization, may be {@code null} to use the default values. * @return The deserialized settings, never {@code null}. @@ -56,7 +56,7 @@ Settings read( File input, Map options ) /** * Reads the settings from the specified character reader. The reader will be automatically closed before the method * returns. - * + * * @param input The reader to deserialize the settings from, must not be {@code null}. * @param options The options to use for deserialization, may be {@code null} to use the default values. * @return The deserialized settings, never {@code null}. @@ -69,7 +69,7 @@ Settings read( Reader input, Map options ) /** * Reads the settings from the specified byte stream. The stream will be automatically closed before the method * returns. - * + * * @param input The stream to deserialize the settings from, must not be {@code null}. * @param options The options to use for deserialization, may be {@code null} to use the default values. * @return The deserialized settings, never {@code null}. diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java index 6ddf3a8052..54bfcf0ce1 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java @@ -29,7 +29,7 @@ /** * Handles serialization of settings into some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ public interface SettingsWriter @@ -38,7 +38,7 @@ public interface SettingsWriter /** * Writes the supplied settings to the specified file. Any non-existing parent directories of the output file will * be created automatically. - * + * * @param output The file to serialize the settings to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param settings The settings to serialize, must not be {@code null}. @@ -50,7 +50,7 @@ void write( File output, Map options, Settings settings ) /** * Writes the supplied settings to the specified character writer. The writer will be automatically closed before * the method returns. - * + * * @param output The writer to serialize the settings to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param settings The settings to serialize, must not be {@code null}. @@ -62,7 +62,7 @@ void write( Writer output, Map options, Settings settings ) /** * Writes the supplied settings to the specified byte stream. The stream will be automatically closed before the * method returns. - * + * * @param output The stream to serialize the settings to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param settings The settings to serialize, must not be {@code null}. diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java index f9943e34c5..79745ecaf1 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java @@ -24,7 +24,7 @@ /** * Validate a model settings - * + * * @author Milos Kleint */ public interface SettingsValidator @@ -32,7 +32,7 @@ public interface SettingsValidator /** * Validate the specified settings. - * + * * @param settings The settings to validate, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. */ diff --git a/pom.xml b/pom.xml index 2f5a1a3d09..567f3ec5a1 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.6 - 1.6 + 1.6 2.5.2 1.2 4.11 @@ -107,7 +107,7 @@ scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path} - + Stuart McCulloch @@ -513,9 +513,9 @@ The mission of the Apache Maven project is to create and maintain software - libraries that provide a widely-used project build tool, targeting mainly Java - development. Apache Maven promotes the use of dependencies via a - standardized coordinate system, binary plugins, and a standard build + libraries that provide a widely-used project build tool, targeting mainly Java + development. Apache Maven promotes the use of dependencies via a + standardized coordinate system, binary plugins, and a standard build lifecycle.