You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/12/01 23:11:01 UTC
[maven] branch MNG-7613 created (now 42c26b0c8)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MNG-7613
in repository https://gitbox.apache.org/repos/asf/maven.git
at 42c26b0c8 [MNG-7613] Parent POM 38 - code reformat
This branch includes the following new commits:
new a55f278a9 [MNG-7613] Upgrade Apache Maven parent POM to version 38
new 42c26b0c8 [MNG-7613] Parent POM 38 - code reformat
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 02/02: [MNG-7613] Parent POM 38 - code reformat
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-7613
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 42c26b0c8a4001b275c9086e1e5e8c3aa2e95943
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Dec 2 00:08:30 2022 +0100
[MNG-7613] Parent POM 38 - code reformat
---
apache-maven/pom.xml | 58 +-
.../apache/maven/settings/GlobalSettingsTest.java | 28 +-
maven-artifact/pom.xml | 2 -
.../java/org/apache/maven/artifact/Artifact.java | 61 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 182 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 451 ++-
.../maven/artifact/InvalidArtifactRTException.java | 49 +-
.../maven/artifact/handler/ArtifactHandler.java | 12 +-
.../maven/artifact/metadata/ArtifactMetadata.java | 11 +-
.../artifact/repository/ArtifactRepository.java | 40 +-
.../repository/ArtifactRepositoryPolicy.java | 161 +-
.../maven/artifact/repository/Authentication.java | 34 +-
.../layout/ArtifactRepositoryLayout.java | 14 +-
.../layout/ArtifactRepositoryLayout2.java | 13 +-
.../metadata/RepositoryMetadataStoreException.java | 20 +-
.../AbstractArtifactResolutionException.java | 384 ++-
.../resolver/ArtifactNotFoundException.java | 116 +-
.../resolver/ArtifactResolutionException.java | 64 +-
.../resolver/CyclicDependencyException.java | 18 +-
.../MultipleArtifactsNotFoundException.java | 85 +-
.../artifact/resolver/filter/ArtifactFilter.java | 10 +-
.../maven/artifact/versioning/ArtifactVersion.java | 11 +-
.../artifact/versioning/ComparableVersion.java | 525 ++--
.../versioning/DefaultArtifactVersion.java | 178 +-
.../InvalidVersionSpecificationException.java | 14 +-
.../OverConstrainedVersionException.java | 24 +-
.../maven/artifact/versioning/Restriction.java | 124 +-
.../maven/artifact/versioning/VersionRange.java | 446 +--
.../java/org/apache/maven/repository/Proxy.java | 54 +-
.../legacy/metadata/ArtifactMetadata.java | 17 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 65 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 131 +-
.../artifact/handler/ArtifactHandlerMock.java | 53 +-
.../artifact/versioning/ComparableVersionIT.java | 65 +-
.../artifact/versioning/ComparableVersionTest.java | 349 ++-
.../versioning/DefaultArtifactVersionTest.java | 303 +-
.../artifact/versioning/VersionRangeTest.java | 1316 ++++----
maven-builder-support/pom.xml | 2 -
.../org/apache/maven/building/DefaultProblem.java | 91 +-
.../maven/building/DefaultProblemCollector.java | 26 +-
.../java/org/apache/maven/building/FileSource.java | 27 +-
.../java/org/apache/maven/building/Problem.java | 12 +-
.../apache/maven/building/ProblemCollector.java | 19 +-
.../maven/building/ProblemCollectorFactory.java | 18 +-
.../java/org/apache/maven/building/Source.java | 10 +-
.../org/apache/maven/building/StringSource.java | 35 +-
.../java/org/apache/maven/building/UrlSource.java | 26 +-
.../building/DefaultProblemCollectorTest.java | 70 +-
.../apache/maven/building/DefaultProblemTest.java | 159 +-
.../org/apache/maven/building/FileSourceTest.java | 63 +-
.../building/ProblemCollectorFactoryTest.java | 27 +-
.../apache/maven/building/StringSourceTest.java | 47 +-
.../org/apache/maven/building/UrlSourceTest.java | 55 +-
maven-compat/pom.xml | 2 -
.../apache/maven/artifact/ArtifactScopeEnum.java | 82 +-
.../org/apache/maven/artifact/ArtifactStatus.java | 56 +-
.../artifact/UnknownRepositoryLayoutException.java | 23 +-
.../maven/artifact/deployer/ArtifactDeployer.java | 25 +-
.../deployer/ArtifactDeploymentException.java | 25 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 120 +-
.../installer/ArtifactInstallationException.java | 25 +-
.../artifact/installer/ArtifactInstaller.java | 17 +-
.../installer/DefaultArtifactInstaller.java | 89 +-
.../artifact/manager/DefaultWagonManager.java | 108 +-
.../manager/WagonConfigurationException.java | 17 +-
.../maven/artifact/manager/WagonManager.java | 25 +-
.../repository/ArtifactRepositoryFactory.java | 53 +-
.../repository/DefaultArtifactRepository.java | 172 +-
.../DefaultArtifactRepositoryFactory.java | 98 +-
.../repository/layout/FlatRepositoryLayout.java | 53 +-
.../metadata/DefaultRepositoryMetadataManager.java | 546 ++--
.../metadata/GroupRepositoryMetadata.java | 73 +-
.../repository/metadata/MetadataBridge.java | 104 +-
.../repository/metadata/MetadataUtils.java | 13 +-
.../metadata/RepositoryMetadataReadException.java | 20 +-
.../SnapshotArtifactRepositoryMetadata.java | 52 +-
.../maven/artifact/resolver/ArtifactCollector.java | 25 +-
.../maven/artifact/resolver/ArtifactResolver.java | 107 +-
.../artifact/resolver/DebugResolutionListener.java | 116 +-
.../resolver/DefaultArtifactCollector.java | 14 +-
.../artifact/resolver/DefaultArtifactResolver.java | 651 ++--
.../resolver/ResolutionListenerForDepMgmt.java | 17 +-
.../artifact/resolver/UnresolvedArtifacts.java | 24 +-
.../resolver/WarningResolutionListener.java | 62 +-
.../resolver/filter/InversionArtifactFilter.java | 32 +-
.../artifact/resolver/filter/OrArtifactFilter.java | 45 +-
.../resolver/filter/TypeArtifactFilter.java | 32 +-
.../artifact/versioning/ManagedVersionMap.java | 33 +-
.../maven/execution/DefaultRuntimeInformation.java | 26 +-
.../apache/maven/execution/RuntimeInformation.java | 8 +-
.../profiles/DefaultMavenProfilesBuilder.java | 64 +-
.../maven/profiles/DefaultProfileManager.java | 192 +-
.../maven/profiles/MavenProfilesBuilder.java | 14 +-
.../org/apache/maven/profiles/ProfileManager.java | 29 +-
.../maven/profiles/ProfilesConversionUtils.java | 112 +-
.../activation/DetectedProfileActivator.java | 17 +-
.../profiles/activation/FileProfileActivator.java | 69 +-
.../activation/JdkPrefixProfileActivator.java | 68 +-
.../OperatingSystemProfileActivator.java | 109 +-
.../activation/ProfileActivationException.java | 20 +-
.../profiles/activation/ProfileActivator.java | 14 +-
.../activation/SystemPropertyProfileActivator.java | 70 +-
.../maven/project/DefaultMavenProjectBuilder.java | 291 +-
.../DefaultProjectBuilderConfiguration.java | 48 +-
.../project/InvalidProjectModelException.java | 38 +-
.../apache/maven/project/MavenProjectBuilder.java | 63 +-
.../project/MissingRepositoryElementException.java | 21 +-
.../java/org/apache/maven/project/ModelUtils.java | 240 +-
.../maven/project/ProjectBuilderConfiguration.java | 20 +-
.../org/apache/maven/project/ProjectUtils.java | 83 +-
.../DefaultModelInheritanceAssembler.java | 562 ++--
.../inheritance/ModelInheritanceAssembler.java | 16 +-
.../AbstractStringBasedModelInterpolator.java | 350 +--
.../interpolation/BuildTimestampValueSource.java | 27 +-
.../interpolation/ModelInterpolationException.java | 38 +-
.../project/interpolation/ModelInterpolator.java | 35 +-
.../PathTranslatingPostProcessor.java | 34 +-
.../interpolation/RegexBasedModelInterpolator.java | 29 +-
.../StringSearchModelInterpolator.java | 406 +--
.../maven/project/path/DefaultPathTranslator.java | 185 +-
.../project/validation/DefaultModelValidator.java | 35 +-
.../project/validation/ModelValidationResult.java | 70 +-
.../maven/project/validation/ModelValidator.java | 11 +-
.../maven/reporting/MavenReportException.java | 18 +-
.../maven/repository/DefaultMirrorSelector.java | 139 +-
.../maven/repository/MavenArtifactMetadata.java | 56 +-
.../org/apache/maven/repository/MetadataGraph.java | 38 +-
.../apache/maven/repository/MetadataGraphNode.java | 52 +-
.../repository/MetadataResolutionRequest.java | 106 +-
.../maven/repository/MetadataResolutionResult.java | 209 +-
.../apache/maven/repository/MirrorSelector.java | 10 +-
.../repository/UserLocalArtifactRepository.java | 36 +-
.../maven/repository/VersionNotFoundException.java | 38 +-
.../repository/legacy/ChecksumFailedException.java | 20 +-
.../legacy/DefaultUpdateCheckManager.java | 393 +--
.../repository/legacy/DefaultWagonManager.java | 828 ++---
.../repository/legacy/LegacyRepositorySystem.java | 862 +++---
.../maven/repository/legacy/MavenArtifact.java | 49 +-
.../repository/legacy/TransferListenerAdapter.java | 151 +-
.../repository/legacy/UpdateCheckManager.java | 20 +-
.../legacy/WagonConfigurationException.java | 29 +-
.../maven/repository/legacy/WagonManager.java | 65 +-
.../repository/ArtifactRepositoryFactory.java | 51 +-
.../DefaultArtifactRepositoryFactory.java | 121 +-
.../resolver/DefaultLegacyArtifactCollector.java | 775 +++--
.../legacy/resolver/LegacyArtifactCollector.java | 55 +-
.../legacy/resolver/conflict/ConflictResolver.java | 10 +-
.../resolver/conflict/ConflictResolverFactory.java | 11 +-
.../ConflictResolverNotFoundException.java | 14 +-
.../resolver/conflict/DefaultConflictResolver.java | 12 +-
.../conflict/DefaultConflictResolverFactory.java | 36 +-
.../conflict/FarthestConflictResolver.java | 20 +-
.../resolver/conflict/NearestConflictResolver.java | 20 +-
.../resolver/conflict/NewestConflictResolver.java | 29 +-
.../resolver/conflict/OldestConflictResolver.java | 29 +-
.../transform/AbstractVersionTransformation.java | 88 +-
.../resolver/transform/ArtifactTransformation.java | 33 +-
.../transform/ArtifactTransformationManager.java | 29 +-
.../DefaultArtifactTransformationManager.java | 63 +-
.../transform/LatestArtifactTransformation.java | 50 +-
.../transform/ReleaseArtifactTransformation.java | 70 +-
.../resolver/transform/SnapshotTransformation.java | 135 +-
.../repository/metadata/ArtifactMetadata.java | 265 +-
.../repository/metadata/ClasspathContainer.java | 89 +-
.../metadata/ClasspathTransformation.java | 12 +-
.../metadata/DefaultClasspathTransformation.java | 174 +-
.../DefaultGraphConflictResolutionPolicy.java | 36 +-
.../metadata/DefaultGraphConflictResolver.java | 197 +-
.../metadata/GraphConflictResolutionException.java | 29 +-
.../metadata/GraphConflictResolutionPolicy.java | 11 +-
.../repository/metadata/GraphConflictResolver.java | 12 +-
.../maven/repository/metadata/MetadataGraph.java | 436 ++-
.../repository/metadata/MetadataGraphEdge.java | 128 +-
.../MetadataGraphTransformationException.java | 29 +-
.../repository/metadata/MetadataGraphVertex.java | 150 +-
.../repository/metadata/MetadataResolution.java | 41 +-
.../metadata/MetadataResolutionException.java | 28 +-
.../metadata/MetadataResolutionRequest.java | 46 +-
.../MetadataResolutionRequestTypeEnum.java | 29 +-
.../metadata/MetadataResolutionResult.java | 141 +-
.../metadata/MetadataRetrievalException.java | 34 +-
.../maven/repository/metadata/MetadataSource.java | 17 +-
.../repository/metadata/MetadataTreeNode.java | 95 +-
.../plugin/ExpressionDocumentationException.java | 20 +-
.../usability/plugin/ExpressionDocumenter.java | 104 +-
.../AbstractArtifactComponentTestCase.java | 290 +-
.../artifact/deployer/ArtifactDeployerTest.java | 54 +-
.../deployer/SimpleArtifactMetadataSource.java | 45 +-
.../factory/DefaultArtifactFactoryTest.java | 58 +-
.../artifact/installer/ArtifactInstallerTest.java | 48 +-
.../artifact/metadata/TestMetadataSource.java | 82 +-
.../repository/MavenArtifactRepositoryTest.java | 38 +-
.../resolver/ArtifactResolutionExceptionTest.java | 26 +-
.../artifact/resolver/ArtifactResolverTest.java | 242 +-
.../resolver/DefaultArtifactResolverTest.java | 64 +-
.../maven/artifact/resolver/TestFileWagon.java | 64 +-
.../artifact/resolver/TestTransferListener.java | 19 +-
.../resolver/filter/AndArtifactFilterTest.java | 36 +-
.../resolver/filter/FilterHashEqualsTest.java | 29 +-
.../resolver/filter/OrArtifactFilterTest.java | 36 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 91 +-
.../maven/artifact/testutils/TestFileManager.java | 158 +-
.../transform/TransformationManagerTest.java | 53 +-
.../manager/DefaultProfileManagerTest.java | 146 +-
.../project/AbstractMavenProjectTestCase.java | 155 +-
.../maven/project/ClasspathArtifactResolver.java | 61 +-
.../maven/project/EmptyLifecycleExecutor.java | 68 +-
.../project/EmptyLifecyclePluginAnalyzer.java | 47 +-
.../project/LegacyLocalRepositoryManager.java | 138 +-
.../org/apache/maven/project/ModelUtilsTest.java | 530 ++--
.../apache/maven/project/ProjectClasspathTest.java | 150 +-
.../apache/maven/project/TestArtifactResolver.java | 35 +-
.../maven/project/TestMavenRepositorySystem.java | 33 +-
.../apache/maven/project/TestProjectBuilder.java | 79 +-
.../AbstractProjectInheritanceTestCase.java | 30 +-
.../inheritance/t00/ProjectInheritanceTest.java | 29 +-
.../inheritance/t01/ProjectInheritanceTest.java | 33 +-
.../inheritance/t02/ProjectInheritanceTest.java | 92 +-
.../inheritance/t03/ProjectInheritanceTest.java | 24 +-
.../inheritance/t04/ProjectInheritanceTest.java | 48 +-
.../inheritance/t05/ProjectInheritanceTest.java | 42 +-
.../inheritance/t06/ProjectInheritanceTest.java | 43 +-
.../inheritance/t07/ProjectInheritanceTest.java | 41 +-
.../inheritance/t08/ProjectInheritanceTest.java | 45 +-
.../inheritance/t09/ProjectInheritanceTest.java | 61 +-
.../inheritance/t10/ProjectInheritanceTest.java | 47 +-
.../inheritance/t11/ProjectInheritanceTest.java | 29 +-
.../inheritance/t12/ProjectInheritanceTest.java | 30 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 126 +-
.../project/path/DefaultPathTranslatorTest.java | 40 +-
.../repository/DefaultMirrorSelectorTest.java | 20 +-
.../maven/repository/LegacyRepositoryLayout.java | 58 +-
.../repository/LegacyRepositorySystemTest.java | 199 +-
.../maven/repository/MirrorProcessorTest.java | 263 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 190 +-
.../repository/legacy/DefaultWagonManagerTest.java | 381 +--
.../legacy/LegacyRepositorySystemTest.java | 82 +-
.../maven/repository/legacy/PerLookupWagon.java | 17 +-
.../maven/repository/legacy/StringWagon.java | 64 +-
.../org/apache/maven/repository/legacy/WagonA.java | 22 +-
.../org/apache/maven/repository/legacy/WagonB.java | 22 +-
.../org/apache/maven/repository/legacy/WagonC.java | 22 +-
.../apache/maven/repository/legacy/WagonMock.java | 16 +-
.../resolver/DefaultArtifactCollectorTest.java | 1229 ++++----
.../conflict/AbstractConflictResolverTest.java | 81 +-
.../conflict/FarthestConflictResolverTest.java | 53 +-
.../conflict/NearestConflictResolverTest.java | 53 +-
.../conflict/NewestConflictResolverTest.java | 53 +-
.../conflict/OldestConflictResolverTest.java | 54 +-
.../DefaultClasspathTransformationTest.java | 190 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 83 +-
.../metadata/DefaultGraphConflictResolverTest.java | 326 +-
.../repository/metadata/TestMetadataSource.java | 78 +-
maven-compat/src/test/resources/pom.xml | 19 -
maven-core/pom.xml | 6 +-
.../maven/AbstractMavenLifecycleParticipant.java | 20 +-
.../org/apache/maven/ArtifactFilterManager.java | 16 +-
.../maven/ArtifactFilterManagerDelegate.java | 13 +-
.../src/main/java/org/apache/maven/BuildAbort.java | 18 +-
.../org/apache/maven/BuildFailureException.java | 19 +-
.../apache/maven/DefaultArtifactFilterManager.java | 58 +-
.../main/java/org/apache/maven/DefaultMaven.java | 462 ++-
.../maven/DefaultProjectDependenciesResolver.java | 171 +-
.../apache/maven/DuplicateProjectException.java | 18 +-
.../org/apache/maven/InternalErrorException.java | 13 +-
.../src/main/java/org/apache/maven/Maven.java | 14 +-
.../org/apache/maven/MavenExecutionException.java | 28 +-
.../org/apache/maven/MissingModuleException.java | 21 +-
.../apache/maven/ProjectBuildFailureException.java | 20 +-
.../org/apache/maven/ProjectCycleException.java | 21 +-
.../apache/maven/ProjectDependenciesResolver.java | 36 +-
.../main/java/org/apache/maven/ReactorReader.java | 178 +-
.../java/org/apache/maven/RepositoryUtils.java | 391 ++-
.../main/java/org/apache/maven/SessionScoped.java | 14 +-
.../DependencyResolutionRequiredException.java | 14 +-
.../maven/artifact/InvalidRepositoryException.java | 33 +-
.../maven/artifact/factory/ArtifactFactory.java | 63 +-
.../artifact/factory/DefaultArtifactFactory.java | 177 +-
.../artifact/handler/DefaultArtifactHandler.java | 67 +-
.../handler/manager/ArtifactHandlerManager.java | 13 +-
.../manager/DefaultArtifactHandlerManager.java | 44 +-
.../metadata/AbstractArtifactMetadata.java | 15 +-
.../ArtifactMetadataRetrievalException.java | 29 +-
.../artifact/metadata/ArtifactMetadataSource.java | 38 +-
.../maven/artifact/metadata/ResolutionGroup.java | 29 +-
.../repository/DefaultRepositoryRequest.java | 64 +-
.../repository/LegacyLocalRepositoryManager.java | 302 +-
.../repository/MavenArtifactRepository.java | 281 +-
.../maven/artifact/repository/RepositoryCache.java | 11 +-
.../artifact/repository/RepositoryRequest.java | 15 +-
.../repository/layout/DefaultRepositoryLayout.java | 77 +-
.../metadata/AbstractRepositoryMetadata.java | 175 +-
.../metadata/ArtifactRepositoryMetadata.java | 68 +-
.../repository/metadata/RepositoryMetadata.java | 16 +-
.../RepositoryMetadataDeploymentException.java | 20 +-
.../RepositoryMetadataInstallationException.java | 20 +-
.../metadata/RepositoryMetadataManager.java | 36 +-
.../RepositoryMetadataResolutionException.java | 20 +-
.../metadata/io/DefaultMetadataReader.java | 60 +-
.../metadata/io/MetadataParseException.java | 26 +-
.../repository/metadata/io/MetadataReader.java | 17 +-
.../resolver/ArtifactResolutionRequest.java | 152 +-
.../resolver/ArtifactResolutionResult.java | 215 +-
.../resolver/DefaultResolutionErrorHandler.java | 61 +-
.../artifact/resolver/ResolutionErrorHandler.java | 11 +-
.../artifact/resolver/ResolutionListener.java | 40 +-
.../maven/artifact/resolver/ResolutionNode.java | 152 +-
.../filter/AbstractScopeArtifactFilter.java | 58 +-
.../resolver/filter/AndArtifactFilter.java | 51 +-
.../filter/CumulativeScopeArtifactFilter.java | 61 +-
.../resolver/filter/ExcludesArtifactFilter.java | 20 +-
.../resolver/filter/ExclusionArtifactFilter.java | 42 +-
.../resolver/filter/ExclusionSetFilter.java | 41 +-
.../resolver/filter/IncludesArtifactFilter.java | 43 +-
.../resolver/filter/ScopeArtifactFilter.java | 34 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 822 +++--
.../classrealm/ArtifactClassRealmConstituent.java | 33 +-
.../maven/classrealm/ClassRealmConstituent.java | 7 +-
.../apache/maven/classrealm/ClassRealmManager.java | 20 +-
.../classrealm/ClassRealmManagerDelegate.java | 10 +-
.../apache/maven/classrealm/ClassRealmRequest.java | 10 +-
.../maven/classrealm/DefaultClassRealmManager.java | 318 +-
.../maven/classrealm/DefaultClassRealmRequest.java | 35 +-
.../BasedirBeanConfigurationPathTranslator.java | 30 +-
.../configuration/BeanConfigurationException.java | 18 +-
.../BeanConfigurationPathTranslator.java | 9 +-
.../configuration/BeanConfigurationRequest.java | 19 +-
.../BeanConfigurationValuePreprocessor.java | 10 +-
.../maven/configuration/BeanConfigurator.java | 10 +-
.../DefaultBeanConfigurationRequest.java | 101 +-
.../internal/DefaultBeanConfigurator.java | 100 +-
.../apache/maven/eventspy/AbstractEventSpy.java | 23 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 20 +-
.../eventspy/internal/EventSpyDispatcher.java | 108 +-
.../internal/EventSpyExecutionListener.java | 130 +-
.../internal/EventSpyRepositoryListener.java | 144 +-
.../maven/exception/DefaultExceptionHandler.java | 223 +-
.../apache/maven/exception/ExceptionHandler.java | 10 +-
.../apache/maven/exception/ExceptionSummary.java | 39 +-
.../maven/execution/AbstractExecutionListener.java | 59 +-
.../org/apache/maven/execution/BuildFailure.java | 16 +-
.../org/apache/maven/execution/BuildSuccess.java | 13 +-
.../org/apache/maven/execution/BuildSummary.java | 19 +-
.../execution/DefaultMavenExecutionRequest.java | 729 ++---
.../DefaultMavenExecutionRequestPopulator.java | 241 +-
.../execution/DefaultMavenExecutionResult.java | 56 +-
.../org/apache/maven/execution/ExecutionEvent.java | 10 +-
.../apache/maven/execution/ExecutionListener.java | 41 +-
.../maven/execution/MavenExecutionRequest.java | 133 +-
.../MavenExecutionRequestPopulationException.java | 25 +-
.../execution/MavenExecutionRequestPopulator.java | 22 +-
.../maven/execution/MavenExecutionResult.java | 23 +-
.../org/apache/maven/execution/MavenSession.java | 313 +-
.../apache/maven/execution/MojoExecutionEvent.java | 31 +-
.../maven/execution/MojoExecutionListener.java | 14 +-
.../maven/execution/ProjectDependencyGraph.java | 12 +-
.../maven/execution/ProjectExecutionEvent.java | 40 +-
.../maven/execution/ProjectExecutionListener.java | 17 +-
.../org/apache/maven/execution/ReactorManager.java | 144 +-
.../apache/maven/execution/SettingsAdapter.java | 50 +-
.../maven/execution/scope/MojoExecutionScoped.java | 14 +-
.../execution/scope/WeakMojoExecutionListener.java | 14 +-
.../scope/internal/MojoExecutionScope.java | 141 +-
.../internal/MojoExecutionScopeCoreModule.java | 21 +-
.../scope/internal/MojoExecutionScopeModule.java | 39 +-
.../maven/extension/internal/CoreExports.java | 37 +-
.../extension/internal/CoreExportsProvider.java | 21 +-
.../extension/internal/CoreExtensionEntry.java | 82 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 396 +--
.../maven/graph/DefaultProjectDependencyGraph.java | 124 +-
.../graph/FilteredProjectDependencyGraph.java | 60 +-
.../java/org/apache/maven/graph/GraphBuilder.java | 10 +-
.../maven/internal/MultilineMessageHelper.java | 73 +-
.../DefaultRepositorySystemSessionFactory.java | 277 +-
.../internal/aether/LoggingRepositoryListener.java | 121 +-
.../aether/MavenChainedWorkspaceReader.java | 53 +-
.../maven/internal/aether/ResolverLifecycle.java | 21 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 113 +-
.../apache/maven/lifecycle/DefaultLifecycles.java | 96 +-
.../maven/lifecycle/LifeCyclePluginAnalyzer.java | 10 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 36 +-
.../lifecycle/LifecycleExecutionException.java | 87 +-
.../apache/maven/lifecycle/LifecycleExecutor.java | 49 +-
.../maven/lifecycle/LifecycleMappingDelegate.java | 17 +-
.../lifecycle/LifecycleNotFoundException.java | 18 +-
.../lifecycle/LifecyclePhaseNotFoundException.java | 18 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 124 +-
.../maven/lifecycle/MissingProjectException.java | 13 +-
.../maven/lifecycle/MojoExecutionConfigurator.java | 10 +-
.../maven/lifecycle/NoGoalSpecifiedException.java | 13 +-
.../lifecycle/internal/BuildListCalculator.java | 56 +-
.../lifecycle/internal/BuildThreadFactory.java | 14 +-
.../internal/CompoundProjectExecutionListener.java | 48 +-
.../lifecycle/internal/DefaultExecutionEvent.java | 26 +-
.../internal/DefaultExecutionEventCatapult.java | 64 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 509 ++--
.../internal/DefaultLifecycleMappingDelegate.java | 105 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 199 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 102 +-
.../internal/DefaultMojoExecutionConfigurator.java | 178 +-
.../internal/DefaultProjectArtifactFactory.java | 23 +-
.../lifecycle/internal/DependencyContext.java | 60 +-
.../lifecycle/internal/ExecutionEventCatapult.java | 11 +-
.../lifecycle/internal/ExecutionPlanItem.java | 44 +-
.../apache/maven/lifecycle/internal/GoalTask.java | 14 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 143 +-
.../internal/LifecycleDependencyResolver.java | 351 +--
.../internal/LifecycleExecutionPlanCalculator.java | 52 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 92 +-
.../internal/LifecyclePluginResolver.java | 62 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 97 +-
.../maven/lifecycle/internal/LifecycleTask.java | 17 +-
.../internal/LifecycleTaskSegmentCalculator.java | 30 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 205 +-
.../maven/lifecycle/internal/MojoExecutor.java | 501 ++-
.../maven/lifecycle/internal/PhaseRecorder.java | 42 +-
.../lifecycle/internal/ProjectArtifactFactory.java | 14 +-
.../maven/lifecycle/internal/ProjectBuildList.java | 91 +-
.../maven/lifecycle/internal/ProjectIndex.java | 37 +-
.../maven/lifecycle/internal/ProjectSegment.java | 36 +-
.../lifecycle/internal/ReactorBuildStatus.java | 48 +-
.../maven/lifecycle/internal/ReactorContext.java | 29 +-
.../maven/lifecycle/internal/TaskSegment.java | 27 +-
.../maven/lifecycle/internal/builder/Builder.java | 19 +-
.../lifecycle/internal/builder/BuilderCommon.java | 138 +-
.../internal/builder/BuilderNotFoundException.java | 14 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 84 +-
.../multithreaded/MultiThreadedBuilder.java | 197 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 343 +--
.../singlethreaded/SingleThreadedBuilder.java | 41 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 89 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 47 +-
.../maven/lifecycle/mapping/LifecycleMapping.java | 13 +-
.../maven/lifecycle/mapping/LifecycleMojo.java | 41 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 98 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 130 +-
.../maven/monitor/event/EventDispatcher.java | 19 +-
.../apache/maven/monitor/event/EventMonitor.java | 17 +-
.../apache/maven/plugin/BuildPluginManager.java | 32 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 110 +-
.../plugin/CompoundMojoExecutionListener.java | 40 +-
.../CycleDetectedInPluginGraphException.java | 17 +-
.../maven/plugin/DebugConfigurationListener.java | 60 +-
.../maven/plugin/DefaultBuildPluginManager.java | 210 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 109 +-
.../plugin/DefaultMojosExecutionStrategy.java | 24 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 142 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 140 +-
.../maven/plugin/DefaultPluginRealmCache.java | 154 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 36 +-
.../plugin/InvalidPluginDescriptorException.java | 25 +-
.../maven/plugin/InvalidPluginException.java | 25 +-
.../org/apache/maven/plugin/LegacySupport.java | 9 +-
.../apache/maven/plugin/MavenPluginManager.java | 48 +-
.../apache/maven/plugin/MavenPluginValidator.java | 39 +-
.../org/apache/maven/plugin/MojoExecution.java | 111 +-
.../apache/maven/plugin/MojoExecutionRunner.java | 8 +-
.../maven/plugin/MojosExecutionStrategy.java | 12 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 41 +-
.../maven/plugin/PluginConfigurationException.java | 40 +-
.../maven/plugin/PluginContainerException.java | 45 +-
.../apache/maven/plugin/PluginDescriptorCache.java | 17 +-
.../plugin/PluginDescriptorParsingException.java | 27 +-
.../maven/plugin/PluginExecutionException.java | 59 +-
.../maven/plugin/PluginIncompatibleException.java | 15 +-
.../apache/maven/plugin/PluginLoaderException.java | 78 +-
.../org/apache/maven/plugin/PluginManager.java | 56 +-
.../maven/plugin/PluginManagerException.java | 90 +-
.../maven/plugin/PluginNotFoundException.java | 44 +-
.../maven/plugin/PluginParameterException.java | 186 +-
.../plugin/PluginParameterExpressionEvaluator.java | 418 +--
.../org/apache/maven/plugin/PluginRealmCache.java | 39 +-
.../maven/plugin/PluginResolutionException.java | 21 +-
.../AbstractMavenPluginParametersValidator.java | 109 +-
.../plugin/internal/DefaultLegacySupport.java | 38 +-
.../plugin/internal/DefaultMavenPluginManager.java | 890 +++---
.../DefaultPluginDependenciesResolver.java | 289 +-
.../plugin/internal/DefaultPluginManager.java | 201 +-
.../plugin/internal/DeprecatedPluginValidator.java | 72 +-
.../MavenPluginConfigurationValidator.java | 15 +-
.../internal/PluginDependenciesResolver.java | 22 +-
.../PluginDependencyResolutionListener.java | 104 +-
.../ReadOnlyPluginParametersValidator.java | 47 +-
.../internal/ValidatingConfigurationListener.java | 55 +-
.../maven/plugin/internal/WagonExcluder.java | 65 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 77 +-
.../prefix/NoPluginFoundForPrefixException.java | 40 +-
.../maven/plugin/prefix/PluginPrefixRequest.java | 18 +-
.../maven/plugin/prefix/PluginPrefixResolver.java | 10 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 9 +-
.../internal/DefaultPluginPrefixResolver.java | 235 +-
.../prefix/internal/DefaultPluginPrefixResult.java | 35 +-
.../version/DefaultPluginVersionRequest.java | 79 +-
.../version/PluginVersionNotFoundException.java | 21 +-
.../maven/plugin/version/PluginVersionRequest.java | 18 +-
.../version/PluginVersionResolutionException.java | 58 +-
.../plugin/version/PluginVersionResolver.java | 10 +-
.../maven/plugin/version/PluginVersionResult.java | 7 +-
.../internal/DefaultPluginVersionResolver.java | 391 +--
.../internal/DefaultPluginVersionResult.java | 26 +-
.../DefaultDependencyResolutionRequest.java | 36 +-
.../project/DefaultDependencyResolutionResult.java | 63 +-
.../maven/project/DefaultMavenProjectHelper.java | 97 +-
.../project/DefaultModelBuildingListener.java | 97 +-
.../maven/project/DefaultProjectBuilder.java | 1028 +++----
.../project/DefaultProjectBuildingHelper.java | 180 +-
.../project/DefaultProjectBuildingRequest.java | 219 +-
.../project/DefaultProjectBuildingResult.java | 45 +-
.../DefaultProjectDependenciesResolver.java | 294 +-
.../maven/project/DefaultProjectRealmCache.java | 88 +-
.../project/DependencyResolutionException.java | 16 +-
.../maven/project/DependencyResolutionRequest.java | 13 +-
.../maven/project/DependencyResolutionResult.java | 10 +-
.../DuplicateArtifactAttachmentException.java | 23 +-
.../maven/project/DuplicateProjectException.java | 35 +-
.../apache/maven/project/ExtensionDescriptor.java | 46 +-
.../maven/project/ExtensionDescriptorBuilder.java | 98 +-
.../project/InvalidProjectVersionException.java | 38 +-
.../org/apache/maven/project/MavenProject.java | 1306 +++-----
.../apache/maven/project/MavenProjectHelper.java | 20 +-
.../org/apache/maven/project/ProjectBuilder.java | 29 +-
.../maven/project/ProjectBuildingException.java | 104 +-
.../maven/project/ProjectBuildingHelper.java | 24 +-
.../maven/project/ProjectBuildingRequest.java | 47 +-
.../maven/project/ProjectBuildingResult.java | 8 +-
.../maven/project/ProjectDependenciesResolver.java | 10 +-
.../apache/maven/project/ProjectModelResolver.java | 242 +-
.../apache/maven/project/ProjectRealmCache.java | 32 +-
.../org/apache/maven/project/ProjectSorter.java | 284 +-
.../apache/maven/project/ReactorModelCache.java | 56 +-
.../org/apache/maven/project/ReactorModelPool.java | 52 +-
.../maven/project/RepositorySessionDecorator.java | 12 +-
.../project/artifact/ActiveProjectArtifact.java | 249 +-
.../project/artifact/ArtifactWithDependencies.java | 10 +-
.../maven/project/artifact/AttachedArtifact.java | 153 +-
.../artifact/DefaultMavenMetadataCache.java | 286 +-
.../project/artifact/DefaultMetadataSource.java | 11 +-
.../artifact/DefaultProjectArtifactsCache.java | 202 +-
.../InvalidDependencyVersionException.java | 25 +-
.../maven/project/artifact/MavenMetadataCache.java | 26 +-
.../project/artifact/MavenMetadataSource.java | 655 ++--
.../maven/project/artifact/PluginArtifact.java | 59 +-
.../maven/project/artifact/ProjectArtifact.java | 69 +-
.../project/artifact/ProjectArtifactMetadata.java | 78 +-
.../project/artifact/ProjectArtifactsCache.java | 43 +-
.../apache/maven/project/path/PathTranslator.java | 17 +-
.../properties/internal/EnvironmentUtils.java | 30 +-
.../properties/internal/SystemProperties.java | 25 +-
.../repository/ArtifactDoesNotExistException.java | 17 +-
.../maven/repository/ArtifactTransferEvent.java | 164 +-
.../ArtifactTransferFailedException.java | 18 +-
.../maven/repository/ArtifactTransferListener.java | 19 +-
.../maven/repository/ArtifactTransferResource.java | 7 +-
.../DelegatingLocalArtifactRepository.java | 118 +-
.../maven/repository/LocalArtifactRepository.java | 9 +-
.../LocalRepositoryNotAccessibleException.java | 20 +-
.../apache/maven/repository/RepositorySystem.java | 90 +-
.../legacy/metadata/AbstractArtifactMetadata.java | 34 +-
.../ArtifactMetadataRetrievalException.java | 35 +-
.../legacy/metadata/ArtifactMetadataSource.java | 34 +-
.../metadata/DefaultMetadataResolutionRequest.java | 66 +-
.../legacy/metadata/MetadataResolutionRequest.java | 19 +-
.../legacy/metadata/ResolutionGroup.java | 41 +-
.../apache/maven/rtinfo/RuntimeInformation.java | 9 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 97 +-
.../maven/session/scope/internal/SessionScope.java | 103 +-
.../session/scope/internal/SessionScopeModule.java | 38 +-
.../settings/DefaultMavenSettingsBuilder.java | 107 +-
.../maven/settings/MavenSettingsBuilder.java | 25 +-
.../settings/SettingsConfigurationException.java | 37 +-
.../org/apache/maven/settings/SettingsUtils.java | 237 +-
.../apache/maven/toolchain/DefaultToolchain.java | 110 +-
.../maven/toolchain/DefaultToolchainManager.java | 113 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 58 +-
.../maven/toolchain/DefaultToolchainsBuilder.java | 39 +-
.../toolchain/MisconfiguredToolchainException.java | 21 +-
.../apache/maven/toolchain/RequirementMatcher.java | 12 +-
.../maven/toolchain/RequirementMatcherFactory.java | 80 +-
.../java/org/apache/maven/toolchain/Toolchain.java | 12 +-
.../apache/maven/toolchain/ToolchainFactory.java | 13 +-
.../apache/maven/toolchain/ToolchainManager.java | 14 +-
.../maven/toolchain/ToolchainManagerPrivate.java | 16 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 17 +-
.../apache/maven/toolchain/ToolchainsBuilder.java | 11 +-
.../building/DefaultToolchainsBuilder.java | 198 +-
.../building/DefaultToolchainsBuildingRequest.java | 22 +-
.../building/DefaultToolchainsBuildingResult.java | 30 +-
.../toolchain/building/ToolchainsBuilder.java | 10 +-
.../building/ToolchainsBuildingException.java | 52 +-
.../building/ToolchainsBuildingRequest.java | 10 +-
.../building/ToolchainsBuildingResult.java | 10 +-
.../toolchain/io/DefaultToolchainsReader.java | 59 +-
.../toolchain/io/DefaultToolchainsWriter.java | 29 +-
.../toolchain/io/ToolchainsParseException.java | 26 +-
.../maven/toolchain/io/ToolchainsReader.java | 17 +-
.../maven/toolchain/io/ToolchainsWriter.java | 14 +-
.../maven/toolchain/java/DefaultJavaToolChain.java | 27 +-
.../apache/maven/toolchain/java/JavaToolchain.java | 75 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 81 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 52 +-
.../toolchain/merge/MavenToolchainMerger.java | 83 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 284 +-
.../java/org/apache/maven/DefaultMavenTest.java | 115 +-
.../maven/MavenLifecycleParticipantTest.java | 169 +-
.../src/test/java/org/apache/maven/MavenTest.java | 51 +-
.../maven/ProjectDependenciesResolverTest.java | 84 +-
.../artifact/handler/ArtifactHandlerTest.java | 97 +-
.../filter/ExclusionArtifactFilterTest.java | 158 +-
.../configuration/DefaultBeanConfiguratorTest.java | 95 +-
.../exception/DefaultExceptionHandlerTest.java | 56 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 53 +-
.../maven/execution/DefaultMavenExecutionTest.java | 29 +-
.../scope/internal/MojoExecutionScopeTest.java | 129 +-
.../graph/DefaultProjectDependencyGraphTest.java | 184 +-
.../maven/internal/MultilineMessageHelperTest.java | 72 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 63 +-
.../lifecycle/DelegatingMojoExecutionListener.java | 48 +-
.../DelegatingProjectExecutionListener.java | 56 +-
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 47 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 80 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 748 +++--
.../maven/lifecycle/MavenExecutionPlanTest.java | 69 +-
.../lifecycle/MojoExecutionXPathContainer.java | 48 +-
.../internal/BuildListCalculatorTest.java | 63 +-
.../lifecycle/internal/BuilderCommonTest.java | 77 +-
.../internal/ConcurrencyDependencyGraphTest.java | 99 +-
.../internal/LifecycleDependencyResolverTest.java | 65 +-
.../LifecycleExecutionPlanCalculatorTest.java | 92 +-
.../internal/LifecycleModuleBuilderTest.java | 110 +-
.../LifecycleTaskSegmentCalculatorImplTest.java | 37 +-
.../lifecycle/internal/PhaseRecorderTest.java | 52 +-
.../lifecycle/internal/ProjectBuildListTest.java | 50 +-
.../ConcurrencyDependencyGraphTest.java | 86 +-
.../multithreaded/ThreadOutputMuxerTest.java | 165 +-
.../internal/stub/BuildPluginManagerStub.java | 50 +-
.../internal/stub/CompletionServiceStub.java | 72 +-
.../internal/stub/DefaultLifecyclesStub.java | 73 +-
.../internal/stub/ExecutionEventCatapultStub.java | 18 +-
.../internal/stub/LifeCyclePluginAnalyzerStub.java | 75 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 255 +-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 79 +-
.../maven/lifecycle/internal/stub/LoggerStub.java | 98 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 65 +-
.../internal/stub/PluginPrefixResolverStub.java | 46 +-
.../internal/stub/PluginVersionResolverStub.java | 43 +-
.../stub/ProjectDependenciesResolverStub.java | 102 +-
.../internal/stub/ProjectDependencyGraphStub.java | 198 +-
.../stub/ProjectDependencyGraphStubTest.java | 70 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 91 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 224 +-
.../maven/plugin/PluginParameterExceptionTest.java | 189 +-
.../PluginParameterExpressionEvaluatorTest.java | 364 +--
.../plugin/internal/DefaultLegacySupportTest.java | 18 +-
.../project/AbstractMavenProjectTestCase.java | 161 +-
.../project/DefaultMavenProjectBuilderTest.java | 522 ++--
.../maven/project/EmptyLifecycleExecutor.java | 68 +-
.../maven/project/EmptyProjectBuildingHelper.java | 35 +-
.../project/ExtensionDescriptorBuilderTest.java | 53 +-
.../project/LegacyLocalRepositoryManager.java | 138 +-
.../org/apache/maven/project/MavenProjectTest.java | 200 +-
.../apache/maven/project/PomConstructionTest.java | 2618 ++++++++--------
.../apache/maven/project/ProjectBuilderTest.java | 364 +--
.../maven/project/ProjectModelResolverTest.java | 259 +-
.../apache/maven/project/ProjectSorterTest.java | 350 +--
.../apache/maven/project/TestMetadataSource.java | 28 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 49 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 74 +-
.../project/artifact/MavenMetadataSourceTest.java | 25 +-
.../canonical/CanonicalProjectBuilderTest.java | 51 +-
.../maven/project/harness/PomTestWrapper.java | 90 +-
.../project/harness/Xpp3DomAttributeIterator.java | 44 +-
.../project/harness/Xpp3DomAttributePointer.java | 48 +-
.../maven/project/harness/Xpp3DomNodeIterator.java | 83 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 91 +-
.../project/harness/Xpp3DomPointerFactory.java | 30 +-
.../maven/repository/LegacyRepositoryLayout.java | 58 +-
.../maven/repository/TestArtifactHandler.java | 37 +-
.../maven/repository/TestRepositoryConnector.java | 128 +-
.../repository/TestRepositoryConnectorFactory.java | 20 +-
.../maven/repository/TestRepositorySystem.java | 300 +-
.../internal/DefaultRuntimeInformationTest.java | 71 +-
.../settings/PomConstructionWithSettingsTest.java | 113 +-
.../apache/maven/settings/SettingsUtilsTest.java | 153 +-
.../DefaultToolchainManagerPrivateTest.java | 106 +-
.../toolchain/DefaultToolchainManagerTest.java | 109 +-
.../maven/toolchain/DefaultToolchainTest.java | 116 +-
.../toolchain/RequirementMatcherFactoryTest.java | 52 +-
.../building/DefaultToolchainsBuilderTest.java | 340 ++-
.../building/ToolchainsBuildingExceptionTest.java | 63 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 150 +-
maven-embedder/pom.xml | 2 -
.../main/java/org/apache/maven/embedder/App.java | 14 -
.../java/org/apache/maven/embedder/AppTest.java | 14 -
.../main/java/org/apache/maven/cli/CLIManager.java | 256 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 167 +-
.../java/org/apache/maven/cli/CleanArgument.java | 80 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 50 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 1574 ++++------
.../java/org/apache/maven/cli/ResolveFile.java | 28 +-
.../cli/configuration/ConfigurationProcessor.java | 9 +-
.../SettingsXmlConfigurationProcessor.java | 192 +-
.../maven/cli/event/DefaultEventSpyContext.java | 12 +-
.../maven/cli/event/ExecutionEventLogger.java | 432 ++-
.../internal/BootstrapCoreExtensionManager.java | 173 +-
.../cli/internal/ExtensionResolutionException.java | 22 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 19 +-
.../maven/cli/logging/Slf4jConfiguration.java | 15 +-
.../cli/logging/Slf4jConfigurationFactory.java | 36 +-
.../org/apache/maven/cli/logging/Slf4jLogger.java | 89 +-
.../maven/cli/logging/Slf4jLoggerManager.java | 47 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 253 +-
.../cli/logging/impl/Log4j2Configuration.java | 18 +-
.../cli/logging/impl/LogbackConfiguration.java | 18 +-
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 18 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 32 +-
.../transfer/AbstractMavenTransferListener.java | 200 +-
.../transfer/BatchModeMavenTransferListener.java | 15 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 128 +-
.../cli/transfer/QuietMavenTransferListener.java | 11 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 68 +-
.../src/main/java/org/slf4j/MavenSlf4jFriend.java | 9 +-
.../org/slf4j/impl/MavenSlf4jSimpleFriend.java | 14 +-
.../maven/cli/CLIManagerDocumentationTest.java | 97 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 24 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 28 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 44 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 344 +--
.../maven/cli/event/ExecutionEventLoggerTest.java | 179 +-
.../maven/cli/transfer/FileSizeFormatTest.java | 346 +--
maven-model-builder/pom.xml | 2 -
.../building/AbstractModelBuildingListener.java | 11 +-
.../maven/model/building/DefaultModelBuilder.java | 1330 ++++----
.../model/building/DefaultModelBuilderFactory.java | 163 +-
.../model/building/DefaultModelBuildingEvent.java | 20 +-
.../building/DefaultModelBuildingRequest.java | 224 +-
.../model/building/DefaultModelBuildingResult.java | 96 +-
.../maven/model/building/DefaultModelProblem.java | 101 +-
.../building/DefaultModelProblemCollector.java | 131 +-
.../model/building/DefaultModelProcessor.java | 43 +-
.../maven/model/building/FileModelSource.java | 64 +-
.../model/building/FilterModelBuildingRequest.java | 150 +-
.../apache/maven/model/building/ModelBuilder.java | 16 +-
.../maven/model/building/ModelBuildingEvent.java | 7 +-
.../model/building/ModelBuildingEventCatapult.java | 17 +-
.../model/building/ModelBuildingException.java | 106 +-
.../model/building/ModelBuildingListener.java | 9 +-
.../maven/model/building/ModelBuildingRequest.java | 42 +-
.../maven/model/building/ModelBuildingResult.java | 12 +-
.../apache/maven/model/building/ModelCache.java | 11 +-
.../apache/maven/model/building/ModelCacheTag.java | 53 +-
.../org/apache/maven/model/building/ModelData.java | 81 +-
.../apache/maven/model/building/ModelProblem.java | 17 +-
.../model/building/ModelProblemCollector.java | 9 +-
.../model/building/ModelProblemCollectorExt.java | 7 +-
.../building/ModelProblemCollectorRequest.java | 38 +-
.../maven/model/building/ModelProblemUtils.java | 108 +-
.../maven/model/building/ModelProcessor.java | 10 +-
.../apache/maven/model/building/ModelSource.java | 8 +-
.../apache/maven/model/building/ModelSource2.java | 9 +-
.../org/apache/maven/model/building/Result.java | 146 +-
.../maven/model/building/StringModelSource.java | 19 +-
.../maven/model/building/UrlModelSource.java | 15 +-
.../DefaultDependencyManagementImporter.java | 48 +-
.../composition/DependencyManagementImporter.java | 15 +-
.../inheritance/DefaultInheritanceAssembler.java | 306 +-
.../model/inheritance/InheritanceAssembler.java | 11 +-
.../AbstractStringBasedModelInterpolator.java | 175 +-
.../interpolation/BuildTimestampValueSource.java | 23 +-
.../DefaultModelVersionProcessor.java | 39 +-
.../model/interpolation/MavenBuildTimestamp.java | 45 +-
.../model/interpolation/ModelInterpolator.java | 15 +-
.../model/interpolation/ModelVersionProcessor.java | 16 +-
.../PathTranslatingPostProcessor.java | 38 +-
.../interpolation/ProblemDetectingValueSource.java | 37 +-
.../StringSearchModelInterpolator.java | 499 ++-
.../StringVisitorModelInterpolator.java | 1350 ++++-----
.../interpolation/UrlNormalizingPostProcessor.java | 35 +-
.../apache/maven/model/io/DefaultModelReader.java | 78 +-
.../apache/maven/model/io/DefaultModelWriter.java | 49 +-
.../apache/maven/model/io/ModelParseException.java | 26 +-
.../org/apache/maven/model/io/ModelReader.java | 17 +-
.../org/apache/maven/model/io/ModelWriter.java | 17 +-
.../maven/model/locator/DefaultModelLocator.java | 14 +-
.../apache/maven/model/locator/ModelLocator.java | 9 +-
.../DefaultDependencyManagementInjector.java | 65 +-
.../DefaultPluginManagementInjector.java | 93 +-
.../management/DependencyManagementInjector.java | 9 +-
.../model/management/PluginManagementInjector.java | 9 +-
.../apache/maven/model/merge/MavenModelMerger.java | 620 ++--
.../normalization/DefaultModelNormalizer.java | 81 +-
.../maven/model/normalization/ModelNormalizer.java | 11 +-
.../model/path/DefaultModelPathTranslator.java | 68 +-
.../model/path/DefaultModelUrlNormalizer.java | 44 +-
.../maven/model/path/DefaultPathTranslator.java | 34 +-
.../maven/model/path/DefaultUrlNormalizer.java | 46 +-
.../maven/model/path/ModelPathTranslator.java | 12 +-
.../maven/model/path/ModelUrlNormalizer.java | 11 +-
.../apache/maven/model/path/PathTranslator.java | 11 +-
.../ProfileActivationFilePathInterpolator.java | 54 +-
.../org/apache/maven/model/path/UrlNormalizer.java | 11 +-
.../plugin/DefaultPluginConfigurationExpander.java | 39 +-
.../plugin/DefaultReportConfigurationExpander.java | 28 +-
.../model/plugin/DefaultReportingConverter.java | 218 +-
.../model/plugin/LifecycleBindingsInjector.java | 9 +-
.../model/plugin/PluginConfigurationExpander.java | 9 +-
.../model/plugin/ReportConfigurationExpander.java | 9 +-
.../maven/model/plugin/ReportingConverter.java | 9 +-
.../profile/DefaultProfileActivationContext.java | 128 +-
.../model/profile/DefaultProfileInjector.java | 222 +-
.../model/profile/DefaultProfileSelector.java | 101 +-
.../model/profile/ProfileActivationContext.java | 7 +-
.../maven/model/profile/ProfileInjector.java | 9 +-
.../maven/model/profile/ProfileSelector.java | 12 +-
.../profile/activation/FileProfileActivator.java | 71 +-
.../activation/JdkVersionProfileActivator.java | 168 +-
.../OperatingSystemProfileActivator.java | 94 +-
.../model/profile/activation/ProfileActivator.java | 11 +-
.../activation/PropertyProfileActivator.java | 68 +-
.../resolution/InvalidRepositoryException.java | 21 +-
.../maven/model/resolution/ModelResolver.java | 22 +-
.../resolution/UnresolvableModelException.java | 46 +-
.../model/resolution/WorkspaceModelResolver.java | 19 +-
.../model/superpom/DefaultSuperPomProvider.java | 55 +-
.../maven/model/superpom/SuperPomProvider.java | 9 +-
.../model/validation/DefaultModelValidator.java | 1879 +++++++-----
.../maven/model/validation/ModelValidator.java | 13 +-
.../model/building/ComplexActivationTest.java | 44 +-
.../building/DefaultModelBuilderFactoryTest.java | 88 +-
.../model/building/DefaultModelBuilderTest.java | 148 +-
.../maven/model/building/FileModelSourceTest.java | 54 +-
.../model/building/SimpleProblemCollector.java | 43 +-
.../DefaultInheritanceAssemblerTest.java | 183 +-
.../AbstractModelInterpolatorTest.java | 430 ++-
.../interpolation/MavenBuildTimestampTest.java | 19 +-
.../StringSearchModelInterpolatorTest.java | 520 ++--
.../maven/model/merge/MavenModelMergerTest.java | 80 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 65 +-
.../activation/AbstractProfileActivatorTest.java | 44 +-
.../activation/FileProfileActivatorTest.java | 103 +-
.../activation/JdkVersionProfileActivatorTest.java | 208 +-
.../activation/PropertyProfileActivatorTest.java | 150 +-
.../validation/DefaultModelValidatorTest.java | 922 +++---
maven-model/pom.xml | 2 -
.../apache/maven/model/io/xpp3/package-info.java | 19 -
.../org/apache/maven/model/merge/ModelMerger.java | 3175 ++++++++------------
.../org/apache/maven/model/merge/package-info.java | 19 -
.../java/org/apache/maven/model/package-info.java | 19 -
.../org/apache/maven/model/ActivationFileTest.java | 28 +-
.../org/apache/maven/model/ActivationOSTest.java | 28 +-
.../apache/maven/model/ActivationPropertyTest.java | 28 +-
.../org/apache/maven/model/ActivationTest.java | 28 +-
.../java/org/apache/maven/model/BuildTest.java | 28 +-
.../org/apache/maven/model/CiManagementTest.java | 28 +-
.../org/apache/maven/model/ContributorTest.java | 28 +-
.../maven/model/DependencyManagementTest.java | 28 +-
.../org/apache/maven/model/DependencyTest.java | 28 +-
.../maven/model/DeploymentRepositoryTest.java | 28 +-
.../java/org/apache/maven/model/DeveloperTest.java | 28 +-
.../maven/model/DistributionManagementTest.java | 28 +-
.../java/org/apache/maven/model/ExclusionTest.java | 28 +-
.../java/org/apache/maven/model/ExtensionTest.java | 28 +-
.../apache/maven/model/IssueManagementTest.java | 28 +-
.../java/org/apache/maven/model/LicenseTest.java | 28 +-
.../org/apache/maven/model/MailingListTest.java | 28 +-
.../java/org/apache/maven/model/ModelTest.java | 28 +-
.../java/org/apache/maven/model/NotifierTest.java | 28 +-
.../org/apache/maven/model/OrganizationTest.java | 28 +-
.../java/org/apache/maven/model/ParentTest.java | 28 +-
.../maven/model/PluginConfigurationTest.java | 28 +-
.../apache/maven/model/PluginContainerTest.java | 28 +-
.../apache/maven/model/PluginExecutionTest.java | 28 +-
.../apache/maven/model/PluginManagementTest.java | 28 +-
.../java/org/apache/maven/model/PluginTest.java | 28 +-
.../org/apache/maven/model/PrerequisitesTest.java | 28 +-
.../java/org/apache/maven/model/ProfileTest.java | 28 +-
.../org/apache/maven/model/RelocationTest.java | 28 +-
.../org/apache/maven/model/ReportPluginTest.java | 28 +-
.../java/org/apache/maven/model/ReportSetTest.java | 28 +-
.../java/org/apache/maven/model/ReportingTest.java | 28 +-
.../apache/maven/model/RepositoryPolicyTest.java | 28 +-
.../org/apache/maven/model/RepositoryTest.java | 28 +-
.../java/org/apache/maven/model/ResourceTest.java | 28 +-
.../test/java/org/apache/maven/model/ScmTest.java | 28 +-
.../test/java/org/apache/maven/model/SiteTest.java | 28 +-
.../apache/maven/model/merge/ModelMergerTest.java | 6 +-
maven-plugin-api/pom.xml | 6 +-
.../apache/maven/monitor/logging/DefaultLog.java | 97 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 29 +-
.../plugin/AbstractMojoExecutionException.java | 30 +-
.../org/apache/maven/plugin/ContextEnabled.java | 10 +-
.../main/java/org/apache/maven/plugin/Mojo.java | 13 +-
.../maven/plugin/MojoExecutionException.java | 35 +-
.../apache/maven/plugin/MojoFailureException.java | 30 +-
.../apache/maven/plugin/MojoNotFoundException.java | 50 +-
.../DuplicateMojoDescriptorException.java | 21 +-
.../descriptor/DuplicateParameterException.java | 15 +-
.../descriptor/InvalidParameterException.java | 21 +-
.../InvalidPluginDescriptorException.java | 20 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 271 +-
.../apache/maven/plugin/descriptor/Parameter.java | 105 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 277 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 296 +-
.../maven/plugin/descriptor/Requirement.java | 34 +-
.../java/org/apache/maven/plugin/logging/Log.java | 34 +-
.../maven/plugin/logging/SystemStreamLog.java | 114 +-
.../descriptor/PluginDescriptorBuilderTest.java | 184 +-
.../plugin/lifecycle/LifecycleXpp3ReaderTest.java | 16 +-
maven-repository-metadata/pom.xml | 2 -
.../artifact/repository/metadata/MetadataTest.java | 300 +-
maven-resolver-provider/pom.xml | 3 -
.../internal/ArtifactDescriptorReaderDelegate.java | 122 +-
.../internal/ArtifactDescriptorUtils.java | 38 +-
.../internal/DefaultArtifactDescriptorReader.java | 351 +--
.../repository/internal/DefaultModelCache.java | 57 +-
.../internal/DefaultModelCacheFactory.java | 13 +-
.../repository/internal/DefaultModelResolver.java | 214 +-
.../internal/DefaultVersionRangeResolver.java | 285 +-
.../internal/DefaultVersionResolver.java | 541 ++--
.../repository/internal/LocalSnapshotMetadata.java | 108 +-
.../internal/LocalSnapshotMetadataGenerator.java | 44 +-
.../maven/repository/internal/MavenMetadata.java | 93 +-
.../internal/MavenRepositorySystemUtils.java | 79 +-
.../repository/internal/MavenResolverModule.java | 56 +-
.../repository/internal/MavenSnapshotMetadata.java | 53 +-
.../repository/internal/MavenWorkspaceReader.java | 12 +-
.../repository/internal/ModelCacheFactory.java | 9 +-
.../maven/repository/internal/PluginsMetadata.java | 64 +-
.../internal/PluginsMetadataGenerator.java | 108 +-
.../internal/PluginsMetadataGeneratorFactory.java | 25 +-
.../repository/internal/RelocatedArtifact.java | 105 +-
.../internal/RemoteSnapshotMetadata.java | 104 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 64 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 25 +-
.../repository/internal/VersionsMetadata.java | 88 +-
.../internal/VersionsMetadataGenerator.java | 58 +-
.../internal/VersionsMetadataGeneratorFactory.java | 25 +-
.../maven/repository/internal/package-info.java | 19 -
.../internal/AbstractRepositoryTestCase.java | 51 +-
.../DefaultArtifactDescriptorReaderTest.java | 45 +-
.../internal/DefaultModelResolverTest.java | 237 +-
.../internal/DefaultVersionResolverTest.java | 69 +-
.../internal/MavenRepositorySystemUtilsTest.java | 23 +-
.../internal/RemoteSnapshotMetadataTest.java | 44 +-
.../repository/internal/RepositorySystemTest.java | 227 +-
.../internal/util/ConsoleRepositoryListener.java | 110 +-
.../internal/util/ConsoleTransferListener.java | 154 +-
maven-settings-builder/pom.xml | 2 -
.../settings/building/DefaultSettingsBuilder.java | 228 +-
.../building/DefaultSettingsBuilderFactory.java | 23 +-
.../building/DefaultSettingsBuildingRequest.java | 73 +-
.../building/DefaultSettingsBuildingResult.java | 20 +-
.../settings/building/DefaultSettingsProblem.java | 93 +-
.../building/DefaultSettingsProblemCollector.java | 30 +-
.../settings/building/FileSettingsSource.java | 18 +-
.../maven/settings/building/SettingsBuilder.java | 10 +-
.../building/SettingsBuildingException.java | 49 +-
.../settings/building/SettingsBuildingRequest.java | 19 +-
.../settings/building/SettingsBuildingResult.java | 8 +-
.../maven/settings/building/SettingsProblem.java | 12 +-
.../building/SettingsProblemCollector.java | 9 +-
.../maven/settings/building/SettingsSource.java | 10 +-
.../settings/building/StringSettingsSource.java | 23 +-
.../maven/settings/building/UrlSettingsSource.java | 19 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 92 +-
.../crypto/DefaultSettingsDecryptionRequest.java | 47 +-
.../crypto/DefaultSettingsDecryptionResult.java | 37 +-
.../maven/settings/crypto/SettingsDecrypter.java | 9 +-
.../settings/crypto/SettingsDecryptionRequest.java | 12 +-
.../settings/crypto/SettingsDecryptionResult.java | 8 +-
.../maven/settings/io/DefaultSettingsReader.java | 59 +-
.../maven/settings/io/DefaultSettingsWriter.java | 49 +-
.../maven/settings/io/SettingsParseException.java | 26 +-
.../apache/maven/settings/io/SettingsReader.java | 17 +-
.../apache/maven/settings/io/SettingsWriter.java | 17 +-
.../maven/settings/merge/MavenSettingsMerger.java | 93 +-
.../validation/DefaultSettingsValidator.java | 274 +-
.../settings/validation/SettingsValidator.java | 11 +-
.../DefaultSettingsBuilderFactoryTest.java | 30 +-
.../validation/DefaultSettingsValidatorTest.java | 231 +-
maven-settings/pom.xml | 2 -
.../org/apache/maven/settings/RuntimeInfo.java | 27 +-
maven-slf4j-provider/pom.xml | 10 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 91 +-
.../org/slf4j/impl/MavenSimpleLoggerFactory.java | 23 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 21 +-
pom.xml | 170 +-
986 files changed, 41846 insertions(+), 58284 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index de61a4b27..71a33d053 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -100,6 +98,19 @@ under the License.
</dependency>
</dependencies>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<finalName>${distributionFileName}</finalName>
<pluginManagement>
@@ -170,10 +181,10 @@ under the License.
<executions>
<execution>
<id>create-distro-packages</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -185,19 +196,6 @@ under the License.
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<profiles>
<profile>
<id>create-distribution-in-dir</id>
@@ -213,10 +211,10 @@ under the License.
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
+ <id>clean-target-dir</id>
<goals>
<goal>clean</goal>
</goals>
- <id>clean-target-dir</id>
<phase>prepare-package</phase>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
@@ -234,10 +232,10 @@ under the License.
<executions>
<execution>
<id>create-distribution-dir</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<finalName>./</finalName>
<appendAssemblyId>false</appendAssemblyId>
@@ -262,10 +260,10 @@ under the License.
<executions>
<execution>
<id>make-src-assembly</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assembly/src.xml</descriptor>
@@ -279,14 +277,6 @@ under the License.
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>source-release-checksum</id>
- <goals>
- <goal>files</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<fileSets>
<fileSet>
@@ -301,12 +291,20 @@ under the License.
</fileSets>
<failIfNoFiles>true</failIfNoFiles>
</configuration>
+ <executions>
+ <execution>
+ <id>source-release-checksum</id>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
- </profile>
- <profile>
- <id>versionlessMavenDist</id>
+ </profile>
+ <profile>
+ <id>versionlessMavenDist</id>
<build>
<finalName>${project.artifactId}</finalName>
</build>
diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index 257350c90..a839d9554 100644
--- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.settings;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,37 +16,31 @@ package org.apache.maven.settings;
* specific language governing permissions and limitations
* under the License.
*/
-
-import junit.framework.TestCase;
-import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
+package org.apache.maven.settings;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
+import junit.framework.TestCase;
+import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
/**
* Tests that the global settings.xml shipped with the distribution is in good state.
*
* @author Benjamin Bentmann
*/
-public class GlobalSettingsTest
- extends TestCase
-{
+public class GlobalSettingsTest extends TestCase {
- public void testValidGlobalSettings()
- throws Exception
- {
- String basedir = System.getProperty( "basedir", System.getProperty( "user.dir" ) );
+ public void testValidGlobalSettings() throws Exception {
+ String basedir = System.getProperty("basedir", System.getProperty("user.dir"));
- File globalSettingsFile = new File( basedir, "src/conf/settings.xml" );
- assertTrue( globalSettingsFile.getAbsolutePath(), globalSettingsFile.isFile() );
+ File globalSettingsFile = new File(basedir, "src/conf/settings.xml");
+ assertTrue(globalSettingsFile.getAbsolutePath(), globalSettingsFile.isFile());
- try ( Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), StandardCharsets.UTF_8) )
- {
- new SettingsXpp3Reader().read( reader );
+ try (Reader reader = new InputStreamReader(new FileInputStream(globalSettingsFile), StandardCharsets.UTF_8)) {
+ new SettingsXpp3Reader().read(reader);
}
}
-
}
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 212e886ca..f76671123 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
index 377935da0..e85b7fa00 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact;
* "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
+ * 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
@@ -18,12 +16,12 @@ package org.apache.maven.artifact;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact;
import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.regex.Pattern;
-
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -36,9 +34,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
* Maven Artifact interface. Notice that it mixes artifact definition concepts (groupId, artifactId, version)
* with dependency information (version range, scope).
*/
-public interface Artifact
- extends Comparable<Artifact>
-{
+public interface Artifact extends Comparable<Artifact> {
String RELEASE_VERSION = "RELEASE";
@@ -46,7 +42,7 @@ public interface Artifact
String SNAPSHOT_VERSION = "SNAPSHOT";
- Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}\\.[0-9]{6})-([0-9]+)$" );
+ Pattern VERSION_FILE_PATTERN = Pattern.compile("^(.*)-([0-9]{8}\\.[0-9]{6})-([0-9]+)$");
// TODO into artifactScope handler
@@ -64,7 +60,7 @@ public interface Artifact
String SCOPE_SYSTEM = "system";
- String SCOPE_IMPORT = "import"; // Used to import dependencyManagement dependencies
+ String SCOPE_IMPORT = "import"; // Used to import dependencyManagement dependencies
String getGroupId();
@@ -72,7 +68,7 @@ public interface Artifact
String getVersion();
- void setVersion( String version );
+ void setVersion(String version);
String getScope();
@@ -84,78 +80,75 @@ public interface Artifact
File getFile();
- void setFile( File destination );
+ void setFile(File destination);
String getBaseVersion();
- void setBaseVersion( String baseVersion );
+ void setBaseVersion(String baseVersion);
String getId();
String getDependencyConflictId();
- void addMetadata( ArtifactMetadata metadata );
+ void addMetadata(ArtifactMetadata metadata);
Collection<ArtifactMetadata> getMetadataList();
- void setRepository( ArtifactRepository remoteRepository );
+ void setRepository(ArtifactRepository remoteRepository);
ArtifactRepository getRepository();
- void updateVersion( String version, ArtifactRepository localRepository );
+ void updateVersion(String version, ArtifactRepository localRepository);
String getDownloadUrl();
- void setDownloadUrl( String downloadUrl );
+ void setDownloadUrl(String downloadUrl);
ArtifactFilter getDependencyFilter();
- void setDependencyFilter( ArtifactFilter artifactFilter );
+ void setDependencyFilter(ArtifactFilter artifactFilter);
ArtifactHandler getArtifactHandler();
List<String> getDependencyTrail();
- void setDependencyTrail( List<String> dependencyTrail );
+ void setDependencyTrail(List<String> dependencyTrail);
- void setScope( String scope );
+ void setScope(String scope);
VersionRange getVersionRange();
- void setVersionRange( VersionRange newRange );
+ void setVersionRange(VersionRange newRange);
- void selectVersion( String version );
+ void selectVersion(String version);
- void setGroupId( String groupId );
+ void setGroupId(String groupId);
- void setArtifactId( String artifactId );
+ void setArtifactId(String artifactId);
boolean isSnapshot();
- void setResolved( boolean resolved );
+ void setResolved(boolean resolved);
boolean isResolved();
- void setResolvedVersion( String version );
+ void setResolvedVersion(String version);
- void setArtifactHandler( ArtifactHandler handler );
+ void setArtifactHandler(ArtifactHandler handler);
boolean isRelease();
- void setRelease( boolean release );
+ void setRelease(boolean release);
List<ArtifactVersion> getAvailableVersions();
- void setAvailableVersions( List<ArtifactVersion> versions );
+ void setAvailableVersions(List<ArtifactVersion> versions);
boolean isOptional();
- void setOptional( boolean optional );
-
- ArtifactVersion getSelectedVersion()
- throws OverConstrainedVersionException;
+ void setOptional(boolean optional);
- boolean isSelectedVersionKnown()
- throws OverConstrainedVersionException;
+ ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException;
+ boolean isSelectedVersionKnown() throws OverConstrainedVersionException;
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
index bd76edd11..8fd3db852 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,111 +24,93 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
-
import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.versioning.VersionRange;
/**
* ArtifactUtils
*/
-public final class ArtifactUtils
-{
-
- public static boolean isSnapshot( String version )
- {
- if ( version != null )
- {
- if ( version.regionMatches( true, version.length() - Artifact.SNAPSHOT_VERSION.length(),
- Artifact.SNAPSHOT_VERSION, 0, Artifact.SNAPSHOT_VERSION.length() ) )
- {
+public final class ArtifactUtils {
+
+ public static boolean isSnapshot(String version) {
+ if (version != null) {
+ if (version.regionMatches(
+ true,
+ version.length() - Artifact.SNAPSHOT_VERSION.length(),
+ Artifact.SNAPSHOT_VERSION,
+ 0,
+ Artifact.SNAPSHOT_VERSION.length())) {
return true;
- }
- else if ( Artifact.VERSION_FILE_PATTERN.matcher( version ).matches() )
- {
+ } else if (Artifact.VERSION_FILE_PATTERN.matcher(version).matches()) {
return true;
}
}
return false;
}
- public static String toSnapshotVersion( String version )
- {
- notBlank( version, "version can neither be null, empty nor blank" );
-
- int lastHyphen = version.lastIndexOf( '-' );
- if ( lastHyphen > 0 )
- {
- int prevHyphen = version.lastIndexOf( '-', lastHyphen - 1 );
- if ( prevHyphen > 0 )
- {
- Matcher m = Artifact.VERSION_FILE_PATTERN.matcher( version );
- if ( m.matches() )
- {
- return m.group( 1 ) + "-" + Artifact.SNAPSHOT_VERSION;
+ public static String toSnapshotVersion(String version) {
+ notBlank(version, "version can neither be null, empty nor blank");
+
+ int lastHyphen = version.lastIndexOf('-');
+ if (lastHyphen > 0) {
+ int prevHyphen = version.lastIndexOf('-', lastHyphen - 1);
+ if (prevHyphen > 0) {
+ Matcher m = Artifact.VERSION_FILE_PATTERN.matcher(version);
+ if (m.matches()) {
+ return m.group(1) + "-" + Artifact.SNAPSHOT_VERSION;
}
}
}
return version;
}
- public static String versionlessKey( Artifact artifact )
- {
- return versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
+ public static String versionlessKey(Artifact artifact) {
+ return versionlessKey(artifact.getGroupId(), artifact.getArtifactId());
}
- public static String versionlessKey( String groupId, String artifactId )
- {
- notBlank( groupId, "groupId can neither be null, empty nor blank" );
- notBlank( artifactId, "artifactId can neither be null, empty nor blank" );
+ public static String versionlessKey(String groupId, String artifactId) {
+ notBlank(groupId, "groupId can neither be null, empty nor blank");
+ notBlank(artifactId, "artifactId can neither be null, empty nor blank");
return groupId + ":" + artifactId;
}
- public static String key( Artifact artifact )
- {
- return key( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
+ public static String key(Artifact artifact) {
+ return key(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
}
- public static String key( String groupId, String artifactId, String version )
- {
- notBlank( groupId, "groupId can neither be null, empty nor blank" );
- notBlank( artifactId, "artifactId can neither be null, empty nor blank" );
- notBlank( version, "version can neither be null, empty nor blank" );
+ public static String key(String groupId, String artifactId, String version) {
+ notBlank(groupId, "groupId can neither be null, empty nor blank");
+ notBlank(artifactId, "artifactId can neither be null, empty nor blank");
+ notBlank(version, "version can neither be null, empty nor blank");
return groupId + ":" + artifactId + ":" + version;
}
- private static void notBlank( String str, String message )
- {
- int c = str != null && str.length() > 0 ? str.charAt( 0 ) : 0;
- if ( ( c < '0' || c > '9' ) && ( c < 'a' || c > 'z' ) )
- {
- Validate.notBlank( str, message );
+ private static void notBlank(String str, String message) {
+ int c = str != null && str.length() > 0 ? str.charAt(0) : 0;
+ if ((c < '0' || c > '9') && (c < 'a' || c > 'z')) {
+ Validate.notBlank(str, message);
}
}
- public static Map<String, Artifact> artifactMapByVersionlessId( Collection<Artifact> artifacts )
- {
+ public static Map<String, Artifact> artifactMapByVersionlessId(Collection<Artifact> artifacts) {
Map<String, Artifact> artifactMap = new LinkedHashMap<>();
- if ( artifacts != null )
- {
- for ( Artifact artifact : artifacts )
- {
- artifactMap.put( versionlessKey( artifact ), artifact );
+ if (artifacts != null) {
+ for (Artifact artifact : artifacts) {
+ artifactMap.put(versionlessKey(artifact), artifact);
}
}
return artifactMap;
}
- public static Artifact copyArtifactSafe( Artifact artifact )
- {
- return ( artifact != null ) ? copyArtifact( artifact ) : null;
+ public static Artifact copyArtifactSafe(Artifact artifact) {
+ return (artifact != null) ? copyArtifact(artifact) : null;
}
- public static Artifact copyArtifact( Artifact artifact )
- {
+ public static Artifact copyArtifact(Artifact artifact) {
VersionRange range = artifact.getVersionRange();
// For some reason with the introduction of MNG-1577 we have the case in Yoko where a depMan section has
@@ -147,70 +128,65 @@ public final class ArtifactUtils
//
// And the range is not set so we'll check here and set it. jvz.
- if ( range == null )
- {
- range = VersionRange.createFromVersion( artifact.getVersion() );
+ if (range == null) {
+ range = VersionRange.createFromVersion(artifact.getVersion());
}
- DefaultArtifact clone = new DefaultArtifact( artifact.getGroupId(), artifact.getArtifactId(), range,
- artifact.getScope(), artifact.getType(), artifact.getClassifier(),
- artifact.getArtifactHandler(), artifact.isOptional() );
- clone.setRelease( artifact.isRelease() );
- clone.setResolvedVersion( artifact.getVersion() );
- clone.setResolved( artifact.isResolved() );
- clone.setFile( artifact.getFile() );
-
- clone.setAvailableVersions( copyList( artifact.getAvailableVersions() ) );
- if ( artifact.getVersion() != null )
- {
- clone.setBaseVersion( artifact.getBaseVersion() );
+ DefaultArtifact clone = new DefaultArtifact(
+ artifact.getGroupId(),
+ artifact.getArtifactId(),
+ range,
+ artifact.getScope(),
+ artifact.getType(),
+ artifact.getClassifier(),
+ artifact.getArtifactHandler(),
+ artifact.isOptional());
+ clone.setRelease(artifact.isRelease());
+ clone.setResolvedVersion(artifact.getVersion());
+ clone.setResolved(artifact.isResolved());
+ clone.setFile(artifact.getFile());
+
+ clone.setAvailableVersions(copyList(artifact.getAvailableVersions()));
+ if (artifact.getVersion() != null) {
+ clone.setBaseVersion(artifact.getBaseVersion());
}
- clone.setDependencyFilter( artifact.getDependencyFilter() );
- clone.setDependencyTrail( copyList( artifact.getDependencyTrail() ) );
- clone.setDownloadUrl( artifact.getDownloadUrl() );
- clone.setRepository( artifact.getRepository() );
+ clone.setDependencyFilter(artifact.getDependencyFilter());
+ clone.setDependencyTrail(copyList(artifact.getDependencyTrail()));
+ clone.setDownloadUrl(artifact.getDownloadUrl());
+ clone.setRepository(artifact.getRepository());
return clone;
}
/** Returns <code>to</code> collection */
- public static <T extends Collection<Artifact>> T copyArtifacts( Collection<Artifact> from, T to )
- {
- for ( Artifact artifact : from )
- {
- to.add( ArtifactUtils.copyArtifact( artifact ) );
+ public static <T extends Collection<Artifact>> T copyArtifacts(Collection<Artifact> from, T to) {
+ for (Artifact artifact : from) {
+ to.add(ArtifactUtils.copyArtifact(artifact));
}
return to;
}
- public static <K, T extends Map<K, Artifact>> T copyArtifacts( Map<K, ? extends Artifact> from, T to )
- {
- if ( from != null )
- {
- for ( Map.Entry<K, ? extends Artifact> entry : from.entrySet() )
- {
- to.put( entry.getKey(), ArtifactUtils.copyArtifact( entry.getValue() ) );
+ public static <K, T extends Map<K, Artifact>> T copyArtifacts(Map<K, ? extends Artifact> from, T to) {
+ if (from != null) {
+ for (Map.Entry<K, ? extends Artifact> entry : from.entrySet()) {
+ to.put(entry.getKey(), ArtifactUtils.copyArtifact(entry.getValue()));
}
}
return to;
}
- private static <T> List<T> copyList( List<T> original )
- {
+ private static <T> List<T> copyList(List<T> original) {
List<T> copy = null;
- if ( original != null )
- {
+ if (original != null) {
copy = new ArrayList<>();
- if ( !original.isEmpty() )
- {
- copy.addAll( original );
+ if (!original.isEmpty()) {
+ copy.addAll(original);
}
}
return copy;
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index d63d6c98f..7c585eaf6 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact;
import java.io.File;
import java.util.Collection;
@@ -25,7 +24,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -39,9 +37,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* @author Jason van Zyl
*/
-public class DefaultArtifact
- implements Artifact
-{
+public class DefaultArtifact implements Artifact {
private String groupId;
private String artifactId;
@@ -80,23 +76,46 @@ public class DefaultArtifact
private boolean optional;
- public DefaultArtifact( String groupId, String artifactId, String version, String scope, String type,
- String classifier, ArtifactHandler artifactHandler )
- {
- this( groupId, artifactId, VersionRange.createFromVersion( version ), scope, type, classifier, artifactHandler,
- false );
- }
-
- public DefaultArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type,
- String classifier, ArtifactHandler artifactHandler )
- {
- this( groupId, artifactId, versionRange, scope, type, classifier, artifactHandler, false );
- }
-
- @SuppressWarnings( "checkstyle:parameternumber" )
- public DefaultArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type,
- String classifier, ArtifactHandler artifactHandler, boolean optional )
- {
+ public DefaultArtifact(
+ String groupId,
+ String artifactId,
+ String version,
+ String scope,
+ String type,
+ String classifier,
+ ArtifactHandler artifactHandler) {
+ this(
+ groupId,
+ artifactId,
+ VersionRange.createFromVersion(version),
+ scope,
+ type,
+ classifier,
+ artifactHandler,
+ false);
+ }
+
+ public DefaultArtifact(
+ String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String scope,
+ String type,
+ String classifier,
+ ArtifactHandler artifactHandler) {
+ this(groupId, artifactId, versionRange, scope, type, classifier, artifactHandler, false);
+ }
+
+ @SuppressWarnings("checkstyle:parameternumber")
+ public DefaultArtifact(
+ String groupId,
+ String artifactId,
+ VersionRange versionRange,
+ String scope,
+ String type,
+ String classifier,
+ ArtifactHandler artifactHandler,
+ boolean optional) {
this.groupId = groupId;
this.artifactId = artifactId;
@@ -111,8 +130,7 @@ public class DefaultArtifact
this.type = type;
- if ( classifier == null )
- {
+ if (classifier == null) {
classifier = artifactHandler.getClassifier();
}
@@ -123,97 +141,78 @@ public class DefaultArtifact
validateIdentity();
}
- private void validateIdentity()
- {
- if ( empty( groupId ) )
- {
- throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The groupId cannot be empty." );
+ private void validateIdentity() {
+ if (empty(groupId)) {
+ throw new InvalidArtifactRTException(
+ groupId, artifactId, getVersion(), type, "The groupId cannot be empty.");
}
- if ( artifactId == null )
- {
- throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The artifactId cannot be empty." );
+ if (artifactId == null) {
+ throw new InvalidArtifactRTException(
+ groupId, artifactId, getVersion(), type, "The artifactId cannot be empty.");
}
- if ( type == null )
- {
- throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The type cannot be empty." );
+ if (type == null) {
+ throw new InvalidArtifactRTException(groupId, artifactId, getVersion(), type, "The type cannot be empty.");
}
- if ( ( version == null ) && ( versionRange == null ) )
- {
- throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
- "The version cannot be empty." );
+ if ((version == null) && (versionRange == null)) {
+ throw new InvalidArtifactRTException(
+ groupId, artifactId, getVersion(), type, "The version cannot be empty.");
}
}
- private boolean empty( String value )
- {
- return ( value == null ) || ( value.trim().length() < 1 );
+ private boolean empty(String value) {
+ return (value == null) || (value.trim().length() < 1);
}
- public String getClassifier()
- {
+ public String getClassifier() {
return classifier;
}
- public boolean hasClassifier()
- {
- return StringUtils.isNotEmpty( classifier );
+ public boolean hasClassifier() {
+ return StringUtils.isNotEmpty(classifier);
}
- public String getScope()
- {
+ public String getScope() {
return scope;
}
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public void setVersion( String version )
- {
+ public void setVersion(String version) {
this.version = version;
- setBaseVersionInternal( version );
+ setBaseVersionInternal(version);
versionRange = null;
}
- public String getType()
- {
+ public String getType() {
return type;
}
- public void setFile( File file )
- {
+ public void setFile(File file) {
this.file = file;
}
- public File getFile()
- {
+ public File getFile() {
return file;
}
- public ArtifactRepository getRepository()
- {
+ public ArtifactRepository getRepository() {
return repository;
}
- public void setRepository( ArtifactRepository repository )
- {
+ public void setRepository(ArtifactRepository repository) {
this.repository = repository;
}
@@ -221,136 +220,107 @@ public class DefaultArtifact
//
// ----------------------------------------------------------------------
- public String getId()
- {
+ public String getId() {
return getDependencyConflictId() + ":" + getBaseVersion();
}
- public String getDependencyConflictId()
- {
- StringBuilder sb = new StringBuilder( 128 );
- sb.append( getGroupId() );
- sb.append( ':' );
- appendArtifactTypeClassifierString( sb );
+ public String getDependencyConflictId() {
+ StringBuilder sb = new StringBuilder(128);
+ sb.append(getGroupId());
+ sb.append(':');
+ appendArtifactTypeClassifierString(sb);
return sb.toString();
}
- private void appendArtifactTypeClassifierString( StringBuilder sb )
- {
- sb.append( getArtifactId() );
- sb.append( ':' );
- sb.append( getType() );
- if ( hasClassifier() )
- {
- sb.append( ':' );
- sb.append( getClassifier() );
+ private void appendArtifactTypeClassifierString(StringBuilder sb) {
+ sb.append(getArtifactId());
+ sb.append(':');
+ sb.append(getType());
+ if (hasClassifier()) {
+ sb.append(':');
+ sb.append(getClassifier());
}
}
- public void addMetadata( ArtifactMetadata metadata )
- {
- if ( metadataMap == null )
- {
+ public void addMetadata(ArtifactMetadata metadata) {
+ if (metadataMap == null) {
metadataMap = new HashMap<>();
}
- ArtifactMetadata m = metadataMap.get( metadata.getKey() );
- if ( m != null )
- {
- m.merge( metadata );
- }
- else
- {
- metadataMap.put( metadata.getKey(), metadata );
+ ArtifactMetadata m = metadataMap.get(metadata.getKey());
+ if (m != null) {
+ m.merge(metadata);
+ } else {
+ metadataMap.put(metadata.getKey(), metadata);
}
}
- public Collection<ArtifactMetadata> getMetadataList()
- {
- if ( metadataMap == null )
- {
+ public Collection<ArtifactMetadata> getMetadataList() {
+ if (metadataMap == null) {
return Collections.emptyList();
}
- return Collections.unmodifiableCollection( metadataMap.values() );
+ return Collections.unmodifiableCollection(metadataMap.values());
}
// ----------------------------------------------------------------------
// Object overrides
// ----------------------------------------------------------------------
- public String toString()
- {
+ public String toString() {
StringBuilder sb = new StringBuilder();
- if ( getGroupId() != null )
- {
- sb.append( getGroupId() );
- sb.append( ':' );
+ if (getGroupId() != null) {
+ sb.append(getGroupId());
+ sb.append(':');
}
- appendArtifactTypeClassifierString( sb );
- sb.append( ':' );
- if ( getBaseVersionInternal() != null )
- {
- sb.append( getBaseVersionInternal() );
+ appendArtifactTypeClassifierString(sb);
+ sb.append(':');
+ if (getBaseVersionInternal() != null) {
+ sb.append(getBaseVersionInternal());
+ } else {
+ sb.append(versionRange.toString());
}
- else
- {
- sb.append( versionRange.toString() );
- }
- if ( scope != null )
- {
- sb.append( ':' );
- sb.append( scope );
+ if (scope != null) {
+ sb.append(':');
+ sb.append(scope);
}
return sb.toString();
}
- public int hashCode()
- {
+ public int hashCode() {
int result = 17;
result = 37 * result + groupId.hashCode();
result = 37 * result + artifactId.hashCode();
result = 37 * result + type.hashCode();
- if ( version != null )
- {
+ if (version != null) {
result = 37 * result + version.hashCode();
}
- result = 37 * result + ( classifier != null ? classifier.hashCode() : 0 );
+ result = 37 * result + (classifier != null ? classifier.hashCode() : 0);
return result;
}
- public boolean equals( Object o )
- {
- if ( o == this )
- {
+ public boolean equals(Object o) {
+ if (o == this) {
return true;
}
- if ( !( o instanceof Artifact ) )
- {
+ if (!(o instanceof Artifact)) {
return false;
}
Artifact a = (Artifact) o;
- if ( !a.getGroupId().equals( groupId ) )
- {
+ if (!a.getGroupId().equals(groupId)) {
return false;
- }
- else if ( !a.getArtifactId().equals( artifactId ) )
- {
+ } else if (!a.getArtifactId().equals(artifactId)) {
return false;
- }
- else if ( !a.getVersion().equals( version ) )
- {
+ } else if (!a.getVersion().equals(version)) {
return false;
- }
- else if ( !a.getType().equals( type ) )
- {
+ } else if (!a.getType().equals(type)) {
return false;
- }
- else if ( a.getClassifier() == null ? classifier != null : !a.getClassifier().equals( classifier ) )
- {
+ } else if (a.getClassifier() == null
+ ? classifier != null
+ : !a.getClassifier().equals(classifier)) {
return false;
}
@@ -359,70 +329,52 @@ public class DefaultArtifact
return true;
}
- public String getBaseVersion()
- {
- if ( baseVersion == null && version != null )
- {
- setBaseVersionInternal( version );
+ public String getBaseVersion() {
+ if (baseVersion == null && version != null) {
+ setBaseVersionInternal(version);
}
return baseVersion;
}
- protected String getBaseVersionInternal()
- {
- if ( ( baseVersion == null ) && ( version != null ) )
- {
- setBaseVersionInternal( version );
+ protected String getBaseVersionInternal() {
+ if ((baseVersion == null) && (version != null)) {
+ setBaseVersionInternal(version);
}
return baseVersion;
}
- public void setBaseVersion( String baseVersion )
- {
- setBaseVersionInternal( baseVersion );
+ public void setBaseVersion(String baseVersion) {
+ setBaseVersionInternal(baseVersion);
}
- protected void setBaseVersionInternal( String baseVersion )
- {
- this.baseVersion = ArtifactUtils.toSnapshotVersion( baseVersion );
+ protected void setBaseVersionInternal(String baseVersion) {
+ this.baseVersion = ArtifactUtils.toSnapshotVersion(baseVersion);
}
- public int compareTo( Artifact a )
- {
- int result = groupId.compareTo( a.getGroupId() );
- if ( result == 0 )
- {
- result = artifactId.compareTo( a.getArtifactId() );
- if ( result == 0 )
- {
- result = type.compareTo( a.getType() );
- if ( result == 0 )
- {
- if ( classifier == null )
- {
- if ( a.getClassifier() != null )
- {
+ public int compareTo(Artifact a) {
+ int result = groupId.compareTo(a.getGroupId());
+ if (result == 0) {
+ result = artifactId.compareTo(a.getArtifactId());
+ if (result == 0) {
+ result = type.compareTo(a.getType());
+ if (result == 0) {
+ if (classifier == null) {
+ if (a.getClassifier() != null) {
result = 1;
}
- }
- else
- {
- if ( a.getClassifier() != null )
- {
- result = classifier.compareTo( a.getClassifier() );
- }
- else
- {
+ } else {
+ if (a.getClassifier() != null) {
+ result = classifier.compareTo(a.getClassifier());
+ } else {
result = -1;
}
}
- if ( result == 0 )
- {
+ if (result == 0) {
// We don't consider the version range in the comparison, just the resolved version
- result = new DefaultArtifactVersion( version ).compareTo(
- new DefaultArtifactVersion( a.getVersion() ) );
+ result = new DefaultArtifactVersion(version)
+ .compareTo(new DefaultArtifactVersion(a.getVersion()));
}
}
}
@@ -430,159 +382,126 @@ public class DefaultArtifact
return result;
}
- public void updateVersion( String version, ArtifactRepository localRepository )
- {
- setResolvedVersion( version );
- setFile( new File( localRepository.getBasedir(), localRepository.pathOf( this ) ) );
+ public void updateVersion(String version, ArtifactRepository localRepository) {
+ setResolvedVersion(version);
+ setFile(new File(localRepository.getBasedir(), localRepository.pathOf(this)));
}
- public String getDownloadUrl()
- {
+ public String getDownloadUrl() {
return downloadUrl;
}
- public void setDownloadUrl( String downloadUrl )
- {
+ public void setDownloadUrl(String downloadUrl) {
this.downloadUrl = downloadUrl;
}
- public ArtifactFilter getDependencyFilter()
- {
+ public ArtifactFilter getDependencyFilter() {
return dependencyFilter;
}
- public void setDependencyFilter( ArtifactFilter artifactFilter )
- {
+ public void setDependencyFilter(ArtifactFilter artifactFilter) {
dependencyFilter = artifactFilter;
}
- public ArtifactHandler getArtifactHandler()
- {
+ public ArtifactHandler getArtifactHandler() {
return artifactHandler;
}
- public List<String> getDependencyTrail()
- {
+ public List<String> getDependencyTrail() {
return dependencyTrail;
}
- public void setDependencyTrail( List<String> dependencyTrail )
- {
+ public void setDependencyTrail(List<String> dependencyTrail) {
this.dependencyTrail = dependencyTrail;
}
- public void setScope( String scope )
- {
+ public void setScope(String scope) {
this.scope = scope;
}
- public VersionRange getVersionRange()
- {
+ public VersionRange getVersionRange() {
return versionRange;
}
- public void setVersionRange( VersionRange versionRange )
- {
+ public void setVersionRange(VersionRange versionRange) {
this.versionRange = versionRange;
selectVersionFromNewRangeIfAvailable();
}
- private void selectVersionFromNewRangeIfAvailable()
- {
- if ( ( versionRange != null ) && ( versionRange.getRecommendedVersion() != null ) )
- {
- selectVersion( versionRange.getRecommendedVersion().toString() );
- }
- else
- {
+ private void selectVersionFromNewRangeIfAvailable() {
+ if ((versionRange != null) && (versionRange.getRecommendedVersion() != null)) {
+ selectVersion(versionRange.getRecommendedVersion().toString());
+ } else {
version = null;
baseVersion = null;
}
}
- public void selectVersion( String version )
- {
+ public void selectVersion(String version) {
this.version = version;
- setBaseVersionInternal( version );
+ setBaseVersionInternal(version);
}
- public void setGroupId( String groupId )
- {
+ public void setGroupId(String groupId) {
this.groupId = groupId;
}
- public void setArtifactId( String artifactId )
- {
+ public void setArtifactId(String artifactId) {
this.artifactId = artifactId;
}
- public boolean isSnapshot()
- {
+ public boolean isSnapshot() {
return getBaseVersion() != null
- && ( getBaseVersion().endsWith( SNAPSHOT_VERSION ) || getBaseVersion().equals( LATEST_VERSION ) );
+ && (getBaseVersion().endsWith(SNAPSHOT_VERSION)
+ || getBaseVersion().equals(LATEST_VERSION));
}
- public void setResolved( boolean resolved )
- {
+ public void setResolved(boolean resolved) {
this.resolved = resolved;
}
- public boolean isResolved()
- {
+ public boolean isResolved() {
return resolved;
}
- public void setResolvedVersion( String version )
- {
+ public void setResolvedVersion(String version) {
this.version = version;
// retain baseVersion
}
- public void setArtifactHandler( ArtifactHandler artifactHandler )
- {
+ public void setArtifactHandler(ArtifactHandler artifactHandler) {
this.artifactHandler = artifactHandler;
}
- public void setRelease( boolean release )
- {
+ public void setRelease(boolean release) {
this.release = release;
}
- public boolean isRelease()
- {
+ public boolean isRelease() {
return release;
}
- public List<ArtifactVersion> getAvailableVersions()
- {
+ public List<ArtifactVersion> getAvailableVersions() {
return availableVersions;
}
- public void setAvailableVersions( List<ArtifactVersion> availableVersions )
- {
+ public void setAvailableVersions(List<ArtifactVersion> availableVersions) {
this.availableVersions = availableVersions;
}
- public boolean isOptional()
- {
+ public boolean isOptional() {
return optional;
}
- public ArtifactVersion getSelectedVersion()
- throws OverConstrainedVersionException
- {
- return versionRange.getSelectedVersion( this );
+ public ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException {
+ return versionRange.getSelectedVersion(this);
}
- public boolean isSelectedVersionKnown()
- throws OverConstrainedVersionException
- {
- return versionRange.isSelectedVersionKnown( this );
+ public boolean isSelectedVersionKnown() throws OverConstrainedVersionException {
+ return versionRange.isSelectedVersionKnown(this);
}
- public void setOptional( boolean optional )
- {
+ public void setOptional(boolean optional) {
this.optional = optional;
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
index adf656d16..9287e9c0c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact;
* "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
+ * 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
@@ -18,14 +16,13 @@ package org.apache.maven.artifact;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact;
/**
* Exception thrown when the identity of an artifact can not be established,
* eg. one of groupId, artifactId, version or type is null.
*/
-public class InvalidArtifactRTException
- extends RuntimeException
-{
+public class InvalidArtifactRTException extends RuntimeException {
private final String groupId;
private final String artifactId;
@@ -33,12 +30,7 @@ public class InvalidArtifactRTException
private final String type;
private final String baseMessage;
- public InvalidArtifactRTException( String groupId,
- String artifactId,
- String version,
- String type,
- String message )
- {
+ public InvalidArtifactRTException(String groupId, String artifactId, String version, String type, String message) {
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
@@ -46,14 +38,9 @@ public class InvalidArtifactRTException
this.baseMessage = message;
}
- public InvalidArtifactRTException( String groupId,
- String artifactId,
- String version,
- String type,
- String message,
- Throwable cause )
- {
- super( cause );
+ public InvalidArtifactRTException(
+ String groupId, String artifactId, String version, String type, String message, Throwable cause) {
+ super(cause);
this.groupId = groupId;
this.artifactId = artifactId;
@@ -62,39 +49,31 @@ public class InvalidArtifactRTException
this.baseMessage = message;
}
- public String getMessage()
- {
+ public String getMessage() {
return "For artifact {" + getArtifactKey() + "}: " + getBaseMessage();
}
- public String getBaseMessage()
- {
+ public String getBaseMessage() {
return baseMessage;
}
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
- public String getType()
- {
+ public String getType() {
return type;
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public String getArtifactKey()
- {
+ public String getArtifactKey() {
return groupId + ":" + artifactId + ":" + version + ":" + type;
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
index cd07d8aeb..4506b2f39 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.handler;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.handler;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.handler;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.handler;
/**
* An artifact handler defines for a dependency type, defined as Plexus role:<ul>
@@ -25,11 +24,10 @@ package org.apache.maven.artifact.handler;
* <li>information on how to use the artifact: whether to add it to the classpath, or to take into account its
* dependencies.</li>
* </ul>
- *
+ *
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
-public interface ArtifactHandler
-{
+public interface ArtifactHandler {
String ROLE = ArtifactHandler.class.getName();
/**
@@ -43,7 +41,7 @@ public interface ArtifactHandler
/**
* Get the classifier associated to the dependency type.
- *
+ *
* @return the classifier
*/
String getClassifier();
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
index 7bf8c6128..fd079999a 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.metadata;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.metadata;
* "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
+ * 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
@@ -18,13 +16,12 @@ package org.apache.maven.artifact.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.metadata;
/**
* Contains metadata about an artifact, and methods to retrieve/store it from an artifact repository.
*/
@Deprecated
-public interface ArtifactMetadata
- extends org.apache.maven.repository.legacy.metadata.ArtifactMetadata
-{
- void merge( ArtifactMetadata metadata );
+public interface ArtifactMetadata extends org.apache.maven.repository.legacy.metadata.ArtifactMetadata {
+ void merge(ArtifactMetadata metadata);
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
index 47839eadc..4fade72f0 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.repository;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.repository;
* "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
+ * 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
@@ -18,9 +16,9 @@ package org.apache.maven.artifact.repository;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.repository;
import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -30,17 +28,16 @@ import org.apache.maven.repository.Proxy;
* Abstraction of an artifact repository. Artifact repositories can be remote, local, or even build reactor or
* IDE workspace.
*/
-public interface ArtifactRepository
-{
- String pathOf( Artifact artifact );
+public interface ArtifactRepository {
+ String pathOf(Artifact artifact);
- String pathOfRemoteRepositoryMetadata( ArtifactMetadata artifactMetadata );
+ String pathOfRemoteRepositoryMetadata(ArtifactMetadata artifactMetadata);
- String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository );
+ String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository);
String getUrl();
- void setUrl( String url );
+ void setUrl(String url);
String getBasedir();
@@ -48,19 +45,19 @@ public interface ArtifactRepository
String getId();
- void setId( String id );
+ void setId(String id);
ArtifactRepositoryPolicy getSnapshots();
- void setSnapshotUpdatePolicy( ArtifactRepositoryPolicy policy );
+ void setSnapshotUpdatePolicy(ArtifactRepositoryPolicy policy);
ArtifactRepositoryPolicy getReleases();
- void setReleaseUpdatePolicy( ArtifactRepositoryPolicy policy );
+ void setReleaseUpdatePolicy(ArtifactRepositoryPolicy policy);
ArtifactRepositoryLayout getLayout();
- void setLayout( ArtifactRepositoryLayout layout );
+ void setLayout(ArtifactRepositoryLayout layout);
String getKey();
@@ -71,13 +68,13 @@ public interface ArtifactRepository
boolean isBlacklisted();
@Deprecated
- void setBlacklisted( boolean blackListed );
+ void setBlacklisted(boolean blackListed);
/** @since 3.8.1 **/
boolean isBlocked();
/** @since 3.8.1 **/
- void setBlocked( boolean blocked );
+ void setBlocked(boolean blocked);
//
// New interface methods for the repository system.
@@ -87,7 +84,7 @@ public interface ArtifactRepository
* @param artifact
* @since 3.0-alpha-3
*/
- Artifact find( Artifact artifact );
+ Artifact find(Artifact artifact);
/**
* Finds the versions of the specified artifact that are available in this repository.
@@ -96,7 +93,7 @@ public interface ArtifactRepository
* @return The available versions of the artifact or an empty list if none, never {@code null}.
* @since 3.0-alpha-3
*/
- List<String> findVersions( Artifact artifact );
+ List<String> findVersions(Artifact artifact);
/**
* Indicates whether this repository is backed by actual projects. For instance, the build reactor or IDE workspace
@@ -110,7 +107,7 @@ public interface ArtifactRepository
/**
* @since 3.0-alpha-3
*/
- void setAuthentication( Authentication authentication );
+ void setAuthentication(Authentication authentication);
/**
* @since 3.0-alpha-3
*/
@@ -119,7 +116,7 @@ public interface ArtifactRepository
/**
* @since 3.0-alpha-3
*/
- void setProxy( Proxy proxy );
+ void setProxy(Proxy proxy);
/**
* @since 3.0-alpha-3
*/
@@ -135,6 +132,5 @@ public interface ArtifactRepository
* @since 3.0.3
* @param mirroredRepositories the repositories that the actual one mirrors
*/
- void setMirroredRepositories( List<ArtifactRepository> mirroredRepositories );
-
+ void setMirroredRepositories(List<ArtifactRepository> mirroredRepositories);
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
index 5ce317f20..3c8425b02 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.repository;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.repository;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.repository;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.repository;
import java.util.Calendar;
import java.util.Date;
@@ -27,8 +26,7 @@ import java.util.Date;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class ArtifactRepositoryPolicy
-{
+public class ArtifactRepositoryPolicy {
public static final String UPDATE_POLICY_NEVER = "never";
public static final String UPDATE_POLICY_ALWAYS = "always";
@@ -49,100 +47,79 @@ public class ArtifactRepositoryPolicy
private String checksumPolicy;
- public ArtifactRepositoryPolicy()
- {
- this( true, null, null );
+ public ArtifactRepositoryPolicy() {
+ this(true, null, null);
}
- public ArtifactRepositoryPolicy( ArtifactRepositoryPolicy policy )
- {
- this( policy.isEnabled(), policy.getUpdatePolicy(), policy.getChecksumPolicy() );
+ public ArtifactRepositoryPolicy(ArtifactRepositoryPolicy policy) {
+ this(policy.isEnabled(), policy.getUpdatePolicy(), policy.getChecksumPolicy());
}
- public ArtifactRepositoryPolicy( boolean enabled, String updatePolicy, String checksumPolicy )
- {
+ public ArtifactRepositoryPolicy(boolean enabled, String updatePolicy, String checksumPolicy) {
this.enabled = enabled;
- if ( updatePolicy == null )
- {
+ if (updatePolicy == null) {
updatePolicy = UPDATE_POLICY_DAILY;
}
this.updatePolicy = updatePolicy;
- if ( checksumPolicy == null )
- {
+ if (checksumPolicy == null) {
checksumPolicy = CHECKSUM_POLICY_WARN;
}
this.checksumPolicy = checksumPolicy;
}
- public void setEnabled( boolean enabled )
- {
+ public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
- public void setUpdatePolicy( String updatePolicy )
- {
- if ( updatePolicy != null )
- {
+ public void setUpdatePolicy(String updatePolicy) {
+ if (updatePolicy != null) {
this.updatePolicy = updatePolicy;
}
}
- public void setChecksumPolicy( String checksumPolicy )
- {
- if ( checksumPolicy != null )
- {
+ public void setChecksumPolicy(String checksumPolicy) {
+ if (checksumPolicy != null) {
this.checksumPolicy = checksumPolicy;
}
}
- public boolean isEnabled()
- {
+ public boolean isEnabled() {
return enabled;
}
- public String getUpdatePolicy()
- {
+ public String getUpdatePolicy() {
return updatePolicy;
}
- public String getChecksumPolicy()
- {
+ public String getChecksumPolicy() {
return checksumPolicy;
}
- public boolean checkOutOfDate( Date lastModified )
- {
+ public boolean checkOutOfDate(Date lastModified) {
boolean checkForUpdates = false;
- if ( UPDATE_POLICY_ALWAYS.equals( updatePolicy ) )
- {
+ if (UPDATE_POLICY_ALWAYS.equals(updatePolicy)) {
checkForUpdates = true;
- }
- else if ( UPDATE_POLICY_DAILY.equals( updatePolicy ) )
- {
+ } else if (UPDATE_POLICY_DAILY.equals(updatePolicy)) {
// Get local midnight boundary
Calendar cal = Calendar.getInstance();
- cal.set( Calendar.HOUR_OF_DAY, 0 );
- cal.set( Calendar.MINUTE, 0 );
- cal.set( Calendar.SECOND, 0 );
- cal.set( Calendar.MILLISECOND, 0 );
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
- if ( cal.getTime().after( lastModified ) )
- {
+ if (cal.getTime().after(lastModified)) {
checkForUpdates = true;
}
- }
- else if ( updatePolicy.startsWith( UPDATE_POLICY_INTERVAL ) )
- {
- String s = updatePolicy.substring( UPDATE_POLICY_INTERVAL.length() + 1 );
- int minutes = Integer.parseInt( s );
+ } else if (updatePolicy.startsWith(UPDATE_POLICY_INTERVAL)) {
+ String s = updatePolicy.substring(UPDATE_POLICY_INTERVAL.length() + 1);
+ int minutes = Integer.parseInt(s);
Calendar cal = Calendar.getInstance();
- cal.add( Calendar.MINUTE, -minutes );
- if ( cal.getTime().after( lastModified ) )
- {
+ cal.add(Calendar.MINUTE, -minutes);
+ if (cal.getTime().after(lastModified)) {
checkForUpdates = true;
}
}
@@ -151,73 +128,53 @@ public class ArtifactRepositoryPolicy
}
@Override
- public String toString()
- {
- StringBuilder buffer = new StringBuilder( 64 );
- buffer.append( "{enabled=" );
- buffer.append( enabled );
- buffer.append( ", checksums=" );
- buffer.append( checksumPolicy );
- buffer.append( ", updates=" );
- buffer.append( updatePolicy );
- buffer.append( '}' );
+ public String toString() {
+ StringBuilder buffer = new StringBuilder(64);
+ buffer.append("{enabled=");
+ buffer.append(enabled);
+ buffer.append(", checksums=");
+ buffer.append(checksumPolicy);
+ buffer.append(", updates=");
+ buffer.append(updatePolicy);
+ buffer.append('}');
return buffer.toString();
}
- public void merge( ArtifactRepositoryPolicy policy )
- {
- if ( policy != null && policy.isEnabled() )
- {
- setEnabled( true );
+ public void merge(ArtifactRepositoryPolicy policy) {
+ if (policy != null && policy.isEnabled()) {
+ setEnabled(true);
- if ( ordinalOfCksumPolicy( policy.getChecksumPolicy() ) < ordinalOfCksumPolicy( getChecksumPolicy() ) )
- {
- setChecksumPolicy( policy.getChecksumPolicy() );
+ if (ordinalOfCksumPolicy(policy.getChecksumPolicy()) < ordinalOfCksumPolicy(getChecksumPolicy())) {
+ setChecksumPolicy(policy.getChecksumPolicy());
}
- if ( ordinalOfUpdatePolicy( policy.getUpdatePolicy() ) < ordinalOfUpdatePolicy( getUpdatePolicy() ) )
- {
- setUpdatePolicy( policy.getUpdatePolicy() );
+ if (ordinalOfUpdatePolicy(policy.getUpdatePolicy()) < ordinalOfUpdatePolicy(getUpdatePolicy())) {
+ setUpdatePolicy(policy.getUpdatePolicy());
}
}
}
- private int ordinalOfCksumPolicy( String policy )
- {
- if ( ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL.equals( policy ) )
- {
+ private int ordinalOfCksumPolicy(String policy) {
+ if (ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL.equals(policy)) {
return 2;
- }
- else if ( ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE.equals( policy ) )
- {
+ } else if (ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE.equals(policy)) {
return 0;
- }
- else
- {
+ } else {
return 1;
}
}
- @SuppressWarnings( "checkstyle:magicnumber" )
- private int ordinalOfUpdatePolicy( String policy )
- {
- if ( ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY.equals( policy ) )
- {
+ @SuppressWarnings("checkstyle:magicnumber")
+ private int ordinalOfUpdatePolicy(String policy) {
+ if (ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY.equals(policy)) {
return 1440;
- }
- else if ( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS.equals( policy ) )
- {
+ } else if (ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS.equals(policy)) {
return 0;
- }
- else if ( policy != null && policy.startsWith( ArtifactRepositoryPolicy.UPDATE_POLICY_INTERVAL ) )
- {
- String s = policy.substring( UPDATE_POLICY_INTERVAL.length() + 1 );
- return Integer.parseInt( s );
- }
- else
- {
+ } else if (policy != null && policy.startsWith(ArtifactRepositoryPolicy.UPDATE_POLICY_INTERVAL)) {
+ String s = policy.substring(UPDATE_POLICY_INTERVAL.length() + 1);
+ return Integer.parseInt(s);
+ } else {
return Integer.MAX_VALUE;
}
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
index f02d1c5d7..c35fc251e 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.repository;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,19 +16,18 @@ package org.apache.maven.artifact.repository;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.repository;
/**
* Authentication
*/
-public class Authentication
-{
+public class Authentication {
private String privateKey;
private String passphrase;
- public Authentication( String userName, String password )
- {
+ public Authentication(String userName, String password) {
this.username = userName;
this.password = password;
}
@@ -50,8 +47,7 @@ public class Authentication
*
* @return password of user
*/
- public String getPassword()
- {
+ public String getPassword() {
return password;
}
@@ -60,8 +56,7 @@ public class Authentication
*
* @param password password of the user
*/
- public void setPassword( String password )
- {
+ public void setPassword(String password) {
this.password = password;
}
@@ -70,8 +65,7 @@ public class Authentication
*
* @return username at repository
*/
- public String getUsername()
- {
+ public String getUsername() {
return username;
}
@@ -80,8 +74,7 @@ public class Authentication
*
* @param userName the username used to access repository
*/
- public void setUsername( final String userName )
- {
+ public void setUsername(final String userName) {
this.username = userName;
}
@@ -91,8 +84,7 @@ public class Authentication
*
* @return passphrase of the private key file
*/
- public String getPassphrase()
- {
+ public String getPassphrase() {
return passphrase;
}
@@ -101,8 +93,7 @@ public class Authentication
*
* @param passphrase passphrase of the private key file
*/
- public void setPassphrase( final String passphrase )
- {
+ public void setPassphrase(final String passphrase) {
this.passphrase = passphrase;
}
@@ -111,8 +102,7 @@ public class Authentication
*
* @return absolute path to private key
*/
- public String getPrivateKey()
- {
+ public String getPrivateKey() {
return privateKey;
}
@@ -121,9 +111,7 @@ public class Authentication
*
* @param privateKey path to private key in local file system
*/
- public void setPrivateKey( final String privateKey )
- {
+ public void setPrivateKey(final String privateKey) {
this.privateKey = privateKey;
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
index 2a18c863d..a71c04429 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.repository.layout;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.repository.layout;
* "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
+ * 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
@@ -18,21 +16,21 @@ package org.apache.maven.artifact.repository.layout;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.repository.layout;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
/** @author jdcasey */
-public interface ArtifactRepositoryLayout
-{
+public interface ArtifactRepositoryLayout {
String ROLE = ArtifactRepositoryLayout.class.getName();
String getId();
- String pathOf( Artifact artifact );
+ String pathOf(Artifact artifact);
- String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository );
+ String pathOfLocalRepositoryMetadata(ArtifactMetadata metadata, ArtifactRepository repository);
- String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata );
+ String pathOfRemoteRepositoryMetadata(ArtifactMetadata metadata);
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java
index f6bc57300..8cdc09d8a 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.repository.layout;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.repository.layout;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.repository.layout;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.repository.layout;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -25,10 +24,8 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
/**
* ArtifactRepositoryLayout2
*/
-public interface ArtifactRepositoryLayout2
- extends ArtifactRepositoryLayout
-{
+public interface ArtifactRepositoryLayout2 extends ArtifactRepositoryLayout {
- ArtifactRepository newMavenArtifactRepository( String id, String url, ArtifactRepositoryPolicy snapshots,
- ArtifactRepositoryPolicy releases );
+ ArtifactRepository newMavenArtifactRepository(
+ String id, String url, ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases);
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
index 384885220..3b369d134 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.repository.metadata;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.repository.metadata;
* "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
+ * 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
@@ -18,23 +16,19 @@ package org.apache.maven.artifact.repository.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.repository.metadata;
/**
* Problem storing the repository metadata in the local repository.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class RepositoryMetadataStoreException
- extends Exception
-{
- public RepositoryMetadataStoreException( String message )
- {
- super( message );
+public class RepositoryMetadataStoreException extends Exception {
+ public RepositoryMetadataStoreException(String message) {
+ super(message);
}
- public RepositoryMetadataStoreException( String message,
- Exception e )
- {
- super( message, e );
+ public RepositoryMetadataStoreException(String message, Exception e) {
+ super(message, e);
}
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
index a2917b5cd..baca0e154 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.resolver;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.resolver;
* "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
+ * 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
@@ -18,10 +16,10 @@ package org.apache.maven.artifact.resolver;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.resolver;
import java.util.Iterator;
import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -31,9 +29,7 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class AbstractArtifactResolutionException
- extends Exception
-{
+public class AbstractArtifactResolutionException extends Exception {
private String groupId;
private String artifactId;
@@ -54,31 +50,31 @@ public class AbstractArtifactResolutionException
static final String LS = System.lineSeparator();
- @SuppressWarnings( "checkstyle:parameternumber" )
- protected AbstractArtifactResolutionException( String message,
- String groupId,
- String artifactId,
- String version,
- String type,
- String classifier,
- List<ArtifactRepository> remoteRepositories,
- List<String> path )
- {
- this( message, groupId, artifactId, version, type, classifier, remoteRepositories, path, null );
+ @SuppressWarnings("checkstyle:parameternumber")
+ protected AbstractArtifactResolutionException(
+ String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ List<ArtifactRepository> remoteRepositories,
+ List<String> path) {
+ this(message, groupId, artifactId, version, type, classifier, remoteRepositories, path, null);
}
- @SuppressWarnings( "checkstyle:parameternumber" )
- protected AbstractArtifactResolutionException( String message,
- String groupId,
- String artifactId,
- String version,
- String type,
- String classifier,
- List<ArtifactRepository> remoteRepositories,
- List<String> path,
- Throwable t )
- {
- super( constructMessageBase( message, groupId, artifactId, version, type, remoteRepositories, path ), t );
+ @SuppressWarnings("checkstyle:parameternumber")
+ protected AbstractArtifactResolutionException(
+ String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ List<ArtifactRepository> remoteRepositories,
+ List<String> path,
+ Throwable t) {
+ super(constructMessageBase(message, groupId, artifactId, version, type, remoteRepositories, path), t);
this.originalMessage = message;
this.groupId = groupId;
@@ -87,261 +83,241 @@ public class AbstractArtifactResolutionException
this.classifier = classifier;
this.version = version;
this.remoteRepositories = remoteRepositories;
- this.path = constructArtifactPath( path, "" );
+ this.path = constructArtifactPath(path, "");
}
- protected AbstractArtifactResolutionException( String message,
- Artifact artifact )
- {
- this( message, artifact, null );
+ protected AbstractArtifactResolutionException(String message, Artifact artifact) {
+ this(message, artifact, null);
}
- protected AbstractArtifactResolutionException( String message,
- Artifact artifact,
- List<ArtifactRepository> remoteRepositories )
- {
- this( message, artifact, remoteRepositories, null );
+ protected AbstractArtifactResolutionException(
+ String message, Artifact artifact, List<ArtifactRepository> remoteRepositories) {
+ this(message, artifact, remoteRepositories, null);
}
- protected AbstractArtifactResolutionException( String message,
- Artifact artifact,
- List<ArtifactRepository> remoteRepositories,
- Throwable t )
- {
- this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
- artifact.getClassifier(), remoteRepositories, artifact.getDependencyTrail(), t );
+ protected AbstractArtifactResolutionException(
+ String message, Artifact artifact, List<ArtifactRepository> remoteRepositories, Throwable t) {
+ this(
+ message,
+ artifact.getGroupId(),
+ artifact.getArtifactId(),
+ artifact.getVersion(),
+ artifact.getType(),
+ artifact.getClassifier(),
+ remoteRepositories,
+ artifact.getDependencyTrail(),
+ t);
this.artifact = artifact;
}
- public Artifact getArtifact()
- {
+ public Artifact getArtifact() {
return artifact;
}
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public String getType()
- {
+ public String getType() {
return type;
}
/** @return the classifier */
- public String getClassifier()
- {
+ public String getClassifier() {
return this.classifier;
}
/** @return the path */
- public String getPath()
- {
+ public String getPath() {
return this.path;
}
- public List<ArtifactRepository> getRemoteRepositories()
- {
+ public List<ArtifactRepository> getRemoteRepositories() {
return remoteRepositories;
}
- public String getOriginalMessage()
- {
+ public String getOriginalMessage() {
return originalMessage;
}
- protected static String constructArtifactPath( List<String> path,
- String indentation )
- {
+ protected static String constructArtifactPath(List<String> path, String indentation) {
StringBuilder sb = new StringBuilder();
- if ( path != null )
- {
- sb.append( LS );
- sb.append( indentation );
- sb.append( "Path to dependency: " );
- sb.append( LS );
+ if (path != null) {
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append("Path to dependency: ");
+ sb.append(LS);
int num = 1;
- for ( Iterator<String> i = path.iterator(); i.hasNext(); num++ )
- {
- sb.append( indentation );
- sb.append( '\t' );
- sb.append( num );
- sb.append( ") " );
- sb.append( i.next() );
- sb.append( LS );
+ for (Iterator<String> i = path.iterator(); i.hasNext(); num++) {
+ sb.append(indentation);
+ sb.append('\t');
+ sb.append(num);
+ sb.append(") ");
+ sb.append(i.next());
+ sb.append(LS);
}
}
return sb.toString();
}
- private static String constructMessageBase( String message,
- String groupId,
- String artifactId,
- String version,
- String type,
- List<ArtifactRepository> remoteRepositories,
- List<String> path )
- {
+ private static String constructMessageBase(
+ String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ List<ArtifactRepository> remoteRepositories,
+ List<String> path) {
StringBuilder sb = new StringBuilder();
- sb.append( message );
-
- if ( message == null || !message.contains( "from the specified remote repositories:" ) )
- {
- sb.append( LS );
- sb.append( " " ).append( groupId ).append( ':' ).append( artifactId ).append( ':' ).append( type ).append(
- ':' ).append( version );
- sb.append( LS );
- if ( remoteRepositories != null )
- {
- sb.append( LS );
- sb.append( "from the specified remote repositories:" );
- sb.append( LS ).append( " " );
-
- if ( remoteRepositories.isEmpty() )
- {
- sb.append( "(none)" );
+ sb.append(message);
+
+ if (message == null || !message.contains("from the specified remote repositories:")) {
+ sb.append(LS);
+ sb.append(" ")
+ .append(groupId)
+ .append(':')
+ .append(artifactId)
+ .append(':')
+ .append(type)
+ .append(':')
+ .append(version);
+ sb.append(LS);
+ if (remoteRepositories != null) {
+ sb.append(LS);
+ sb.append("from the specified remote repositories:");
+ sb.append(LS).append(" ");
+
+ if (remoteRepositories.isEmpty()) {
+ sb.append("(none)");
}
- for ( Iterator<ArtifactRepository> i = remoteRepositories.iterator(); i.hasNext(); )
- {
+ for (Iterator<ArtifactRepository> i = remoteRepositories.iterator(); i.hasNext(); ) {
ArtifactRepository remoteRepository = i.next();
- sb.append( remoteRepository.getId() );
- sb.append( " (" );
- sb.append( remoteRepository.getUrl() );
+ sb.append(remoteRepository.getId());
+ sb.append(" (");
+ sb.append(remoteRepository.getUrl());
ArtifactRepositoryPolicy releases = remoteRepository.getReleases();
- if ( releases != null )
- {
- sb.append( ", releases=" ).append( releases.isEnabled() );
+ if (releases != null) {
+ sb.append(", releases=").append(releases.isEnabled());
}
ArtifactRepositoryPolicy snapshots = remoteRepository.getSnapshots();
- if ( snapshots != null )
- {
- sb.append( ", snapshots=" ).append( snapshots.isEnabled() );
+ if (snapshots != null) {
+ sb.append(", snapshots=").append(snapshots.isEnabled());
}
- sb.append( ')' );
- if ( i.hasNext() )
- {
- sb.append( ',' ).append( LS ).append( " " );
+ sb.append(')');
+ if (i.hasNext()) {
+ sb.append(',').append(LS).append(" ");
}
}
}
- sb.append( constructArtifactPath( path, "" ) );
- sb.append( LS );
+ sb.append(constructArtifactPath(path, ""));
+ sb.append(LS);
}
return sb.toString();
}
- @SuppressWarnings( "checkstyle:parameternumber" )
- protected static String constructMissingArtifactMessage( String message,
- String indentation,
- String groupId,
- String artifactId,
- String version,
- String type,
- String classifier,
- String downloadUrl,
- List<String> path )
- {
- StringBuilder sb = new StringBuilder( message );
-
- if ( !"pom".equals( type ) )
- {
- if ( downloadUrl != null )
- {
- sb.append( LS );
- sb.append( LS );
- sb.append( indentation );
- sb.append( "Try downloading the file manually from: " );
- sb.append( LS );
- sb.append( indentation );
- sb.append( " " );
- sb.append( downloadUrl );
- }
- else
- {
- sb.append( LS );
- sb.append( LS );
- sb.append( indentation );
- sb.append( "Try downloading the file manually from the project website." );
+ @SuppressWarnings("checkstyle:parameternumber")
+ protected static String constructMissingArtifactMessage(
+ String message,
+ String indentation,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ String downloadUrl,
+ List<String> path) {
+ StringBuilder sb = new StringBuilder(message);
+
+ if (!"pom".equals(type)) {
+ if (downloadUrl != null) {
+ sb.append(LS);
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append("Try downloading the file manually from: ");
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append(" ");
+ sb.append(downloadUrl);
+ } else {
+ sb.append(LS);
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append("Try downloading the file manually from the project website.");
}
- sb.append( LS );
- sb.append( LS );
- sb.append( indentation );
- sb.append( "Then, install it using the command: " );
- sb.append( LS );
- sb.append( indentation );
- sb.append( " mvn install:install-file -DgroupId=" );
- sb.append( groupId );
- sb.append( " -DartifactId=" );
- sb.append( artifactId );
- sb.append( " -Dversion=" );
- sb.append( version );
-
- //insert classifier only if it was used in the artifact
- if ( classifier != null && !classifier.equals( "" ) )
- {
- sb.append( " -Dclassifier=" );
- sb.append( classifier );
+ sb.append(LS);
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append("Then, install it using the command: ");
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append(" mvn install:install-file -DgroupId=");
+ sb.append(groupId);
+ sb.append(" -DartifactId=");
+ sb.append(artifactId);
+ sb.append(" -Dversion=");
+ sb.append(version);
+
+ // insert classifier only if it was used in the artifact
+ if (classifier != null && !classifier.equals("")) {
+ sb.append(" -Dclassifier=");
+ sb.append(classifier);
}
- sb.append( " -Dpackaging=" );
- sb.append( type );
- sb.append( " -Dfile=/path/to/file" );
- sb.append( LS );
+ sb.append(" -Dpackaging=");
+ sb.append(type);
+ sb.append(" -Dfile=/path/to/file");
+ sb.append(LS);
// If people want to deploy it
- sb.append( LS );
- sb.append( indentation );
- sb.append( "Alternatively, if you host your own repository you can deploy the file there: " );
- sb.append( LS );
- sb.append( indentation );
- sb.append( " mvn deploy:deploy-file -DgroupId=" );
- sb.append( groupId );
- sb.append( " -DartifactId=" );
- sb.append( artifactId );
- sb.append( " -Dversion=" );
- sb.append( version );
-
- //insert classifier only if it was used in the artifact
- if ( classifier != null && !classifier.equals( "" ) )
- {
- sb.append( " -Dclassifier=" );
- sb.append( classifier );
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append("Alternatively, if you host your own repository you can deploy the file there: ");
+ sb.append(LS);
+ sb.append(indentation);
+ sb.append(" mvn deploy:deploy-file -DgroupId=");
+ sb.append(groupId);
+ sb.append(" -DartifactId=");
+ sb.append(artifactId);
+ sb.append(" -Dversion=");
+ sb.append(version);
+
+ // insert classifier only if it was used in the artifact
+ if (classifier != null && !classifier.equals("")) {
+ sb.append(" -Dclassifier=");
+ sb.append(classifier);
}
- sb.append( " -Dpackaging=" );
- sb.append( type );
- sb.append( " -Dfile=/path/to/file" );
- sb.append( " -Durl=[url] -DrepositoryId=[id]" );
- sb.append( LS );
+ sb.append(" -Dpackaging=");
+ sb.append(type);
+ sb.append(" -Dfile=/path/to/file");
+ sb.append(" -Durl=[url] -DrepositoryId=[id]");
+ sb.append(LS);
}
- sb.append( constructArtifactPath( path, indentation ) );
- sb.append( LS );
+ sb.append(constructArtifactPath(path, indentation));
+ sb.append(LS);
return sb.toString();
}
- public String getArtifactPath()
- {
+ public String getArtifactPath() {
return path;
}
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
index 76f7b584c..8e4632e17 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.resolver;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.resolver;
* "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
+ * 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
@@ -18,68 +16,104 @@ package org.apache.maven.artifact.resolver;
* specific language governing permissions and limitations
* under the License.
*/
-
+package org.apache.maven.artifact.resolver;
import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
/**
* @author Jason van Zyl
*/
-public class ArtifactNotFoundException
- extends AbstractArtifactResolutionException
-{
+public class ArtifactNotFoundException extends AbstractArtifactResolutionException {
private String downloadUrl;
- protected ArtifactNotFoundException( String message, Artifact artifact,
- List<ArtifactRepository> remoteRepositories )
- {
- super( message, artifact, remoteRepositories );
+ protected ArtifactNotFoundException(
+ String message, Artifact artifact, List<ArtifactRepository> remoteRepositories) {
+ super(message, artifact, remoteRepositories);
}
- public ArtifactNotFoundException( String message, Artifact artifact )
- {
- this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
- artifact.getClassifier(), null, artifact.getDownloadUrl(), artifact.getDependencyTrail() );
+ public ArtifactNotFoundException(String message, Artifact artifact) {
+ this(
+ message,
+ artifact.getGroupId(),
+ artifact.getArtifactId(),
+ artifact.getVersion(),
+ artifact.getType(),
+ artifact.getClassifier(),
+ null,
+ artifact.getDownloadUrl(),
+ artifact.getDependencyTrail());
}
- protected ArtifactNotFoundException( String message, Artifact artifact,
- List<ArtifactRepository> remoteRepositories, Throwable cause )
- {
- this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
- artifact.getClassifier(), remoteRepositories, artifact.getDownloadUrl(), artifact.getDependencyTrail(),
- cause );
+ protected ArtifactNotFoundException(
+ String message, Artifact artifact, List<ArtifactRepository> remoteRepositories, Throwable cause) {
+ this(
+ message,
+ artifact.getGroupId(),
+ artifact.getArtifactId(),
+ artifact.getVersion(),
+ artifact.getType(),
+ artifact.getClassifier(),
+ remoteRepositories,
+ artifact.getDownloadUrl(),
+ artifact.getDependencyTrail(),
+ cause);
}
- @SuppressWarnings( "checkstyle:parameternumber" )
- public ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type,
- String classifier, List<ArtifactRepository> remoteRepositories,
- String downloadUrl, List<String> path, Throwable cause )
- {
- super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier,
- downloadUrl, path ), groupId, artifactId, version, type, classifier,
- remoteRepositories, null, cause );
+ @SuppressWarnings("checkstyle:parameternumber")
+ public ArtifactNotFoundException(
+ String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ List<ArtifactRepository> remoteRepositories,
+ String downloadUrl,
+ List<String> path,
+ Throwable cause) {
+ super(
+ constructMissingArtifactMessage(
+ message, "", groupId, artifactId, version, type, classifier, downloadUrl, path),
+ groupId,
+ artifactId,
+ version,
+ type,
+ classifier,
+ remoteRepositories,
+ null,
+ cause);
this.downloadUrl = downloadUrl;
}
- @SuppressWarnings( "checkstyle:parameternumber" )
- private ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type,
- String classifier, List<ArtifactRepository> remoteRepositories,
- String downloadUrl, List<String> path )
- {
- super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier,
- downloadUrl, path ), groupId, artifactId, version, type, classifier,
- remoteRepositories, null );
+ @SuppressWarnings("checkstyle:parameternumber")
+ private ArtifactNotFoundException(
+ String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ List<ArtifactRepository> remoteRepositories,
+ String downloadUrl,
+ List<String> path) {
+ super(
+ constructMissingArtifactMessage(
+ message, "", groupId, artifactId, version, type, classifier, downloadUrl, path),
+ groupId,
+ artifactId,
+ version,
+ type,
+ classifier,
+ remoteRepositories,
+ null);
this.downloadUrl = downloadUrl;
}
- public String getDownloadUrl()
- {
+ public String getDownloadUrl() {
return downloadUrl;
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
index 074d812ca..c6fa72360 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.resolver;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.resolver;
* "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
+ * 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
@@ -18,51 +16,55 @@ package org.apache.maven.artifact.resolver;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.resolver;
import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
/**
* @author Jason van Zyl
*/
-public class ArtifactResolutionException
- extends AbstractArtifactResolutionException
-{
- @SuppressWarnings( "checkstyle:parameternumber" )
- public ArtifactResolutionException( String message, String groupId, String artifactId, String version, String type,
- String classifier, List<ArtifactRepository> remoteRepositories,
- List<String> path, Throwable t )
- {
- super( message, groupId, artifactId, version, type, classifier, remoteRepositories, path, t );
+public class ArtifactResolutionException extends AbstractArtifactResolutionException {
+ @SuppressWarnings("checkstyle:parameternumber")
+ public ArtifactResolutionException(
+ String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ List<ArtifactRepository> remoteRepositories,
+ List<String> path,
+ Throwable t) {
+ super(message, groupId, artifactId, version, type, classifier, remoteRepositories, path, t);
}
- public ArtifactResolutionException( String message, String groupId, String artifactId, String version, String type,
- String classifier, Throwable t )
- {
- super( message, groupId, artifactId, version, type, classifier, null, null, t );
+ public ArtifactResolutionException(
+ String message,
+ String groupId,
+ String artifactId,
+ String version,
+ String type,
+ String classifier,
+ Throwable t) {
+ super(message, groupId, artifactId, version, type, classifier, null, null, t);
}
- public ArtifactResolutionException( String message, Artifact artifact )
- {
- super( message, artifact );
+ public ArtifactResolutionException(String message, Artifact artifact) {
+ super(message, artifact);
}
- public ArtifactResolutionException( String message, Artifact artifact, List<ArtifactRepository> remoteRepositories )
- {
- super( message, artifact, remoteRepositories );
+ public ArtifactResolutionException(String message, Artifact artifact, List<ArtifactRepository> remoteRepositories) {
+ super(message, artifact, remoteRepositories);
}
- public ArtifactResolutionException( String message, Artifact artifact, Throwable cause )
- {
- super( message, artifact, null, cause );
+ public ArtifactResolutionException(String message, Artifact artifact, Throwable cause) {
+ super(message, artifact, null, cause);
}
- public ArtifactResolutionException( String message, Artifact artifact, List<ArtifactRepository> remoteRepositories,
- Throwable cause )
- {
- super( message, artifact, remoteRepositories, cause );
+ public ArtifactResolutionException(
+ String message, Artifact artifact, List<ArtifactRepository> remoteRepositories, Throwable cause) {
+ super(message, artifact, remoteRepositories, cause);
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
index bbc6733e9..e66520131 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.resolver;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.resolver;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.resolver;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.resolver;
import org.apache.maven.artifact.Artifact;
@@ -26,20 +25,15 @@ import org.apache.maven.artifact.Artifact;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class CyclicDependencyException
- extends ArtifactResolutionException
-{
+public class CyclicDependencyException extends ArtifactResolutionException {
private Artifact artifact;
- public CyclicDependencyException( String message,
- Artifact artifact )
- {
- super( message, artifact );
+ public CyclicDependencyException(String message, Artifact artifact) {
+ super(message, artifact);
this.artifact = artifact;
}
- public Artifact getArtifact()
- {
+ public Artifact getArtifact() {
return artifact;
}
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
index 896710f57..92015c05a 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.resolver;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.resolver;
* "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
+ * 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
@@ -18,10 +16,10 @@ package org.apache.maven.artifact.resolver;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.resolver;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -29,19 +27,17 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
* Exception caused when one or more artifacts can not be resolved because they are not found in the
* local or remote repositories.
*/
-public class MultipleArtifactsNotFoundException
- extends ArtifactResolutionException
-{
+public class MultipleArtifactsNotFoundException extends ArtifactResolutionException {
private final List<Artifact> resolvedArtifacts;
private final List<Artifact> missingArtifacts;
/** @deprecated use {@link #MultipleArtifactsNotFoundException(Artifact, List, List, List)} */
@Deprecated
- public MultipleArtifactsNotFoundException( Artifact originatingArtifact,
- List<Artifact> missingArtifacts,
- List<ArtifactRepository> remoteRepositories )
- {
- this( originatingArtifact, new ArrayList<Artifact>(), missingArtifacts, remoteRepositories );
+ public MultipleArtifactsNotFoundException(
+ Artifact originatingArtifact,
+ List<Artifact> missingArtifacts,
+ List<ArtifactRepository> remoteRepositories) {
+ this(originatingArtifact, new ArrayList<Artifact>(), missingArtifacts, remoteRepositories);
}
/**
@@ -52,12 +48,12 @@ public class MultipleArtifactsNotFoundException
* @param missingArtifacts artifacts that could not be resolved
* @param remoteRepositories remote repositories where the missing artifacts were not found
*/
- public MultipleArtifactsNotFoundException( Artifact originatingArtifact,
- List<Artifact> resolvedArtifacts,
- List<Artifact> missingArtifacts,
- List<ArtifactRepository> remoteRepositories )
- {
- super( constructMessage( missingArtifacts ), originatingArtifact, remoteRepositories );
+ public MultipleArtifactsNotFoundException(
+ Artifact originatingArtifact,
+ List<Artifact> resolvedArtifacts,
+ List<Artifact> missingArtifacts,
+ List<ArtifactRepository> remoteRepositories) {
+ super(constructMessage(missingArtifacts), originatingArtifact, remoteRepositories);
this.resolvedArtifacts = resolvedArtifacts;
this.missingArtifacts = missingArtifacts;
}
@@ -67,8 +63,7 @@ public class MultipleArtifactsNotFoundException
*
* @return {@link List} of {@link Artifact}
*/
- public List<Artifact> getResolvedArtifacts()
- {
+ public List<Artifact> getResolvedArtifacts() {
return resolvedArtifacts;
}
@@ -77,47 +72,47 @@ public class MultipleArtifactsNotFoundException
*
* @return {@link List} of {@link Artifact}
*/
- public List<Artifact> getMissingArtifacts()
- {
+ public List<Artifact> getMissingArtifacts() {
return missingArtifacts;
}
- private static String constructMessage( List<Artifact> artifacts )
- {
- StringBuilder buffer = new StringBuilder( 256 );
+ private static String constructMessage(List<Artifact> artifacts) {
+ StringBuilder buffer = new StringBuilder(256);
- buffer.append( "Missing:\n" );
- buffer.append( "----------\n" );
+ buffer.append("Missing:\n");
+ buffer.append("----------\n");
int counter = 0;
- for ( Artifact artifact : artifacts )
- {
- String message = ( ++counter ) + ") " + artifact.getId();
-
- buffer.append( constructMissingArtifactMessage( message, " ", artifact.getGroupId(),
- artifact.getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getClassifier(),
- artifact.getDownloadUrl(), artifact.getDependencyTrail() ) );
+ for (Artifact artifact : artifacts) {
+ String message = (++counter) + ") " + artifact.getId();
+
+ buffer.append(constructMissingArtifactMessage(
+ message,
+ " ",
+ artifact.getGroupId(),
+ artifact.getArtifactId(),
+ artifact.getVersion(),
+ artifact.getType(),
+ artifact.getClassifier(),
+ artifact.getDownloadUrl(),
+ artifact.getDependencyTrail()));
}
- buffer.append( "----------\n" );
+ buffer.append("----------\n");
int size = artifacts.size();
- buffer.append( size ).append( " required artifact" );
+ buffer.append(size).append(" required artifact");
- if ( size > 1 )
- {
- buffer.append( "s are" );
- }
- else
- {
- buffer.append( " is" );
+ if (size > 1) {
+ buffer.append("s are");
+ } else {
+ buffer.append(" is");
}
- buffer.append( " missing.\n\nfor artifact: " );
+ buffer.append(" missing.\n\nfor artifact: ");
return buffer.toString();
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
index 27b08a88c..81c7fb471 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.resolver.filter;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.resolver.filter;
* "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
+ * 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
@@ -18,13 +16,13 @@ package org.apache.maven.artifact.resolver.filter;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.resolver.filter;
import org.apache.maven.artifact.Artifact;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
-public interface ArtifactFilter
-{
- boolean include( Artifact artifact );
+public interface ArtifactFilter {
+ boolean include(Artifact artifact);
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
index 5b516a91d..3afc57ec2 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
/**
* Describes an artifact version in terms of its components, converts it to/from a string and
@@ -25,9 +24,7 @@ package org.apache.maven.artifact.versioning;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface ArtifactVersion
- extends Comparable<ArtifactVersion>
-{
+public interface ArtifactVersion extends Comparable<ArtifactVersion> {
int getMajorVersion();
int getMinorVersion();
@@ -38,5 +35,5 @@ public interface ArtifactVersion
String getQualifier();
- void parseVersion( String version );
+ void parseVersion(String version);
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 41a9ad153..5af925a44 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
import java.math.BigInteger;
import java.util.ArrayDeque;
@@ -60,9 +59,7 @@ import java.util.Properties;
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
* @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
*/
-public class ComparableVersion
- implements Comparable<ComparableVersion>
-{
+public class ComparableVersion implements Comparable<ComparableVersion> {
private static final int MAX_INTITEM_LENGTH = 9;
private static final int MAX_LONGITEM_LENGTH = 18;
@@ -73,15 +70,14 @@ public class ComparableVersion
private ListItem items;
- private interface Item
- {
+ private interface Item {
int INT_ITEM = 3;
int LONG_ITEM = 4;
int BIGINTEGER_ITEM = 0;
int STRING_ITEM = 1;
int LIST_ITEM = 2;
- int compareTo( Item item );
+ int compareTo(Item item);
int getType();
@@ -91,48 +87,39 @@ public class ComparableVersion
/**
* Represents a numeric item in the version item list that can be represented with an int.
*/
- private static class IntItem
- implements Item
- {
+ private static class IntItem implements Item {
private final int value;
public static final IntItem ZERO = new IntItem();
- private IntItem()
- {
+ private IntItem() {
this.value = 0;
}
- IntItem( String str )
- {
- this.value = Integer.parseInt( str );
+ IntItem(String str) {
+ this.value = Integer.parseInt(str);
}
@Override
- public int getType()
- {
+ public int getType() {
return INT_ITEM;
}
@Override
- public boolean isNull()
- {
+ public boolean isNull() {
return value == 0;
}
@Override
- public int compareTo( Item item )
- {
- if ( item == null )
- {
- return ( value == 0 ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
+ public int compareTo(Item item) {
+ if (item == null) {
+ return (value == 0) ? 0 : 1; // 1.0 == 1, 1.1 > 1
}
- switch ( item.getType() )
- {
+ switch (item.getType()) {
case INT_ITEM:
- int itemValue = ( (IntItem) item ).value;
- return ( value < itemValue ) ? -1 : ( ( value == itemValue ) ? 0 : 1 );
+ int itemValue = ((IntItem) item).value;
+ return (value < itemValue) ? -1 : ((value == itemValue) ? 0 : 1);
case LONG_ITEM:
case BIGINTEGER_ITEM:
return -1;
@@ -144,81 +131,67 @@ public class ComparableVersion
return 1; // 1.1 > 1-1
default:
- throw new IllegalStateException( "invalid item: " + item.getClass() );
+ throw new IllegalStateException("invalid item: " + item.getClass());
}
}
@Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if ( o == null || getClass() != o.getClass() )
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
IntItem intItem = (IntItem) o;
return value == intItem.value;
-
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
return value;
}
@Override
- public String toString()
- {
- return Integer.toString( value );
+ public String toString() {
+ return Integer.toString(value);
}
}
/**
* Represents a numeric item in the version item list that can be represented with a long.
*/
- private static class LongItem
- implements Item
- {
+ private static class LongItem implements Item {
private final long value;
- LongItem( String str )
- {
- this.value = Long.parseLong( str );
+ LongItem(String str) {
+ this.value = Long.parseLong(str);
}
@Override
- public int getType()
- {
+ public int getType() {
return LONG_ITEM;
}
@Override
- public boolean isNull()
- {
+ public boolean isNull() {
return value == 0;
}
@Override
- public int compareTo( Item item )
- {
- if ( item == null )
- {
- return ( value == 0 ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
+ public int compareTo(Item item) {
+ if (item == null) {
+ return (value == 0) ? 0 : 1; // 1.0 == 1, 1.1 > 1
}
- switch ( item.getType() )
- {
+ switch (item.getType()) {
case INT_ITEM:
return 1;
case LONG_ITEM:
- long itemValue = ( (LongItem) item ).value;
- return ( value < itemValue ) ? -1 : ( ( value == itemValue ) ? 0 : 1 );
+ long itemValue = ((LongItem) item).value;
+ return (value < itemValue) ? -1 : ((value == itemValue) ? 0 : 1);
case BIGINTEGER_ITEM:
return -1;
@@ -229,82 +202,68 @@ public class ComparableVersion
return 1; // 1.1 > 1-1
default:
- throw new IllegalStateException( "invalid item: " + item.getClass() );
+ throw new IllegalStateException("invalid item: " + item.getClass());
}
}
@Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if ( o == null || getClass() != o.getClass() )
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
LongItem longItem = (LongItem) o;
return value == longItem.value;
-
}
@Override
- public int hashCode()
- {
- return (int) ( value ^ ( value >>> 32 ) );
+ public int hashCode() {
+ return (int) (value ^ (value >>> 32));
}
@Override
- public String toString()
- {
- return Long.toString( value );
+ public String toString() {
+ return Long.toString(value);
}
}
/**
* Represents a numeric item in the version item list.
*/
- private static class BigIntegerItem
- implements Item
- {
+ private static class BigIntegerItem implements Item {
private final BigInteger value;
- BigIntegerItem( String str )
- {
- this.value = new BigInteger( str );
+ BigIntegerItem(String str) {
+ this.value = new BigInteger(str);
}
@Override
- public int getType()
- {
+ public int getType() {
return BIGINTEGER_ITEM;
}
@Override
- public boolean isNull()
- {
- return BigInteger.ZERO.equals( value );
+ public boolean isNull() {
+ return BigInteger.ZERO.equals(value);
}
@Override
- public int compareTo( Item item )
- {
- if ( item == null )
- {
- return BigInteger.ZERO.equals( value ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
+ public int compareTo(Item item) {
+ if (item == null) {
+ return BigInteger.ZERO.equals(value) ? 0 : 1; // 1.0 == 1, 1.1 > 1
}
- switch ( item.getType() )
- {
+ switch (item.getType()) {
case INT_ITEM:
case LONG_ITEM:
return 1;
case BIGINTEGER_ITEM:
- return value.compareTo( ( (BigIntegerItem) item ).value );
+ return value.compareTo(((BigIntegerItem) item).value);
case STRING_ITEM:
return 1; // 1.1 > 1-sp
@@ -313,36 +272,30 @@ public class ComparableVersion
return 1; // 1.1 > 1-1
default:
- throw new IllegalStateException( "invalid item: " + item.getClass() );
+ throw new IllegalStateException("invalid item: " + item.getClass());
}
}
@Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if ( o == null || getClass() != o.getClass() )
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
BigIntegerItem that = (BigIntegerItem) o;
- return value.equals( that.value );
-
+ return value.equals(that.value);
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
return value.hashCode();
}
- public String toString()
- {
+ public String toString() {
return value.toString();
}
}
@@ -350,36 +303,31 @@ public class ComparableVersion
/**
* Represents a string in the version item list, usually a qualifier.
*/
- private static class StringItem
- implements Item
- {
+ private static class StringItem implements Item {
private static final List<String> QUALIFIERS =
- Arrays.asList( "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" );
+ Arrays.asList("alpha", "beta", "milestone", "rc", "snapshot", "", "sp");
private static final Properties ALIASES = new Properties();
- static
- {
- ALIASES.put( "ga", "" );
- ALIASES.put( "final", "" );
- ALIASES.put( "release", "" );
- ALIASES.put( "cr", "rc" );
+
+ static {
+ ALIASES.put("ga", "");
+ ALIASES.put("final", "");
+ ALIASES.put("release", "");
+ ALIASES.put("cr", "rc");
}
/**
* A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
* the version older than one without a qualifier, or more recent.
*/
- private static final String RELEASE_VERSION_INDEX = String.valueOf( QUALIFIERS.indexOf( "" ) );
+ private static final String RELEASE_VERSION_INDEX = String.valueOf(QUALIFIERS.indexOf(""));
private final String value;
- StringItem( String value, boolean followedByDigit )
- {
- if ( followedByDigit && value.length() == 1 )
- {
+ StringItem(String value, boolean followedByDigit) {
+ if (followedByDigit && value.length() == 1) {
// a1 = alpha-1, b1 = beta-1, m1 = milestone-1
- switch ( value.charAt( 0 ) )
- {
+ switch (value.charAt(0)) {
case 'a':
value = "alpha";
break;
@@ -392,19 +340,17 @@ public class ComparableVersion
default:
}
}
- this.value = ALIASES.getProperty( value , value );
+ this.value = ALIASES.getProperty(value, value);
}
@Override
- public int getType()
- {
+ public int getType() {
return STRING_ITEM;
}
@Override
- public boolean isNull()
- {
- return ( comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX ) == 0 );
+ public boolean isNull() {
+ return (comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX) == 0);
}
/**
@@ -420,65 +366,55 @@ public class ComparableVersion
* @param qualifier
* @return an equivalent value that can be used with lexical comparison
*/
- public static String comparableQualifier( String qualifier )
- {
- int i = QUALIFIERS.indexOf( qualifier );
+ public static String comparableQualifier(String qualifier) {
+ int i = QUALIFIERS.indexOf(qualifier);
- return i == -1 ? ( QUALIFIERS.size() + "-" + qualifier ) : String.valueOf( i );
+ return i == -1 ? (QUALIFIERS.size() + "-" + qualifier) : String.valueOf(i);
}
@Override
- public int compareTo( Item item )
- {
- if ( item == null )
- {
+ public int compareTo(Item item) {
+ if (item == null) {
// 1-rc < 1, 1-ga > 1
- return comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX );
+ return comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX);
}
- switch ( item.getType() )
- {
+ switch (item.getType()) {
case INT_ITEM:
case LONG_ITEM:
case BIGINTEGER_ITEM:
return -1; // 1.any < 1.1 ?
case STRING_ITEM:
- return comparableQualifier( value ).compareTo( comparableQualifier( ( (StringItem) item ).value ) );
+ return comparableQualifier(value).compareTo(comparableQualifier(((StringItem) item).value));
case LIST_ITEM:
return -1; // 1.any < 1-1
default:
- throw new IllegalStateException( "invalid item: " + item.getClass() );
+ throw new IllegalStateException("invalid item: " + item.getClass());
}
}
@Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if ( o == null || getClass() != o.getClass() )
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
StringItem that = (StringItem) o;
- return value.equals( that.value );
-
+ return value.equals(that.value);
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
return value.hashCode();
}
- public String toString()
- {
+ public String toString() {
return value;
}
}
@@ -487,62 +423,46 @@ public class ComparableVersion
* Represents a version list item. This class is used both for the global item list and for sub-lists (which start
* with '-(number)' in the version specification).
*/
- private static class ListItem
- extends ArrayList<Item>
- implements Item
- {
+ private static class ListItem extends ArrayList<Item> implements Item {
@Override
- public int getType()
- {
+ public int getType() {
return LIST_ITEM;
}
@Override
- public boolean isNull()
- {
- return ( size() == 0 );
+ public boolean isNull() {
+ return (size() == 0);
}
- void normalize()
- {
- for ( int i = size() - 1; i >= 0; i-- )
- {
- Item lastItem = get( i );
+ void normalize() {
+ for (int i = size() - 1; i >= 0; i--) {
+ Item lastItem = get(i);
- if ( lastItem.isNull() )
- {
+ if (lastItem.isNull()) {
// remove null trailing items: 0, "", empty list
- remove( i );
- }
- else if ( !( lastItem instanceof ListItem ) )
- {
+ remove(i);
+ } else if (!(lastItem instanceof ListItem)) {
break;
}
}
}
@Override
- public int compareTo( Item item )
- {
- if ( item == null )
- {
- if ( size() == 0 )
- {
+ public int compareTo(Item item) {
+ if (item == null) {
+ if (size() == 0) {
return 0; // 1-0 = 1- (normalize) = 1
}
// Compare the entire list of items with null - not just the first one, MNG-6964
- for ( Item i : this )
- {
- int result = i.compareTo( null );
- if ( result != 0 )
- {
+ for (Item i : this) {
+ int result = i.compareTo(null);
+ if (result != 0) {
return result;
}
}
return 0;
}
- switch ( item.getType() )
- {
+ switch (item.getType()) {
case INT_ITEM:
case LONG_ITEM:
case BIGINTEGER_ITEM:
@@ -553,18 +473,16 @@ public class ComparableVersion
case LIST_ITEM:
Iterator<Item> left = iterator();
- Iterator<Item> right = ( (ListItem) item ).iterator();
+ Iterator<Item> right = ((ListItem) item).iterator();
- while ( left.hasNext() || right.hasNext() )
- {
+ while (left.hasNext() || right.hasNext()) {
Item l = left.hasNext() ? left.next() : null;
Item r = right.hasNext() ? right.next() : null;
// if this is shorter, then invert the compare and mul with -1
- int result = l == null ? ( r == null ? 0 : -1 * r.compareTo( l ) ) : l.compareTo( r );
+ int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r);
- if ( result != 0 )
- {
+ if (result != 0) {
return result;
}
}
@@ -572,21 +490,18 @@ public class ComparableVersion
return 0;
default:
- throw new IllegalStateException( "invalid item: " + item.getClass() );
+ throw new IllegalStateException("invalid item: " + item.getClass());
}
}
@Override
- public String toString()
- {
+ public String toString() {
StringBuilder buffer = new StringBuilder();
- for ( Item item : this )
- {
- if ( buffer.length() > 0 )
- {
- buffer.append( ( item instanceof ListItem ) ? '-' : '.' );
+ for (Item item : this) {
+ if (buffer.length() > 0) {
+ buffer.append((item instanceof ListItem) ? '-' : '.');
}
- buffer.append( item );
+ buffer.append(item);
}
return buffer.toString();
}
@@ -594,191 +509,150 @@ public class ComparableVersion
/**
* Return the contents in the same format that is used when you call toString() on a List.
*/
- private String toListString()
- {
+ private String toListString() {
StringBuilder buffer = new StringBuilder();
- buffer.append( "[" );
- for ( Item item : this )
- {
- if ( buffer.length() > 1 )
- {
- buffer.append( ", " );
+ buffer.append("[");
+ for (Item item : this) {
+ if (buffer.length() > 1) {
+ buffer.append(", ");
}
- if ( item instanceof ListItem )
- {
- buffer.append( ( (ListItem ) item ).toListString() );
- }
- else
- {
- buffer.append( item );
+ if (item instanceof ListItem) {
+ buffer.append(((ListItem) item).toListString());
+ } else {
+ buffer.append(item);
}
}
- buffer.append( "]" );
+ buffer.append("]");
return buffer.toString();
}
}
- public ComparableVersion( String version )
- {
- parseVersion( version );
+ public ComparableVersion(String version) {
+ parseVersion(version);
}
- @SuppressWarnings( "checkstyle:innerassignment" )
- public final void parseVersion( String version )
- {
+ @SuppressWarnings("checkstyle:innerassignment")
+ public final void parseVersion(String version) {
this.value = version;
items = new ListItem();
- version = version.toLowerCase( Locale.ENGLISH );
+ version = version.toLowerCase(Locale.ENGLISH);
ListItem list = items;
Deque<Item> stack = new ArrayDeque<>();
- stack.push( list );
+ stack.push(list);
boolean isDigit = false;
int startIndex = 0;
- for ( int i = 0; i < version.length(); i++ )
- {
- char c = version.charAt( i );
+ for (int i = 0; i < version.length(); i++) {
+ char c = version.charAt(i);
- if ( c == '.' )
- {
- if ( i == startIndex )
- {
- list.add( IntItem.ZERO );
- }
- else
- {
- list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
+ if (c == '.') {
+ if (i == startIndex) {
+ list.add(IntItem.ZERO);
+ } else {
+ list.add(parseItem(isDigit, version.substring(startIndex, i)));
}
startIndex = i + 1;
- }
- else if ( c == '-' )
- {
- if ( i == startIndex )
- {
- list.add( IntItem.ZERO );
- }
- else
- {
- list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
+ } else if (c == '-') {
+ if (i == startIndex) {
+ list.add(IntItem.ZERO);
+ } else {
+ list.add(parseItem(isDigit, version.substring(startIndex, i)));
}
startIndex = i + 1;
- list.add( list = new ListItem() );
- stack.push( list );
- }
- else if ( Character.isDigit( c ) )
- {
- if ( !isDigit && i > startIndex )
- {
- list.add( new StringItem( version.substring( startIndex, i ), true ) );
+ list.add(list = new ListItem());
+ stack.push(list);
+ } else if (Character.isDigit(c)) {
+ if (!isDigit && i > startIndex) {
+ list.add(new StringItem(version.substring(startIndex, i), true));
startIndex = i;
- list.add( list = new ListItem() );
- stack.push( list );
+ list.add(list = new ListItem());
+ stack.push(list);
}
isDigit = true;
- }
- else
- {
- if ( isDigit && i > startIndex )
- {
- list.add( parseItem( true, version.substring( startIndex, i ) ) );
+ } else {
+ if (isDigit && i > startIndex) {
+ list.add(parseItem(true, version.substring(startIndex, i)));
startIndex = i;
- list.add( list = new ListItem() );
- stack.push( list );
+ list.add(list = new ListItem());
+ stack.push(list);
}
isDigit = false;
}
}
- if ( version.length() > startIndex )
- {
- list.add( parseItem( isDigit, version.substring( startIndex ) ) );
+ if (version.length() > startIndex) {
+ list.add(parseItem(isDigit, version.substring(startIndex)));
}
- while ( !stack.isEmpty() )
- {
+ while (!stack.isEmpty()) {
list = (ListItem) stack.pop();
list.normalize();
}
}
- private static Item parseItem( boolean isDigit, String buf )
- {
- if ( isDigit )
- {
- buf = stripLeadingZeroes( buf );
- if ( buf.length() <= MAX_INTITEM_LENGTH )
- {
+ private static Item parseItem(boolean isDigit, String buf) {
+ if (isDigit) {
+ buf = stripLeadingZeroes(buf);
+ if (buf.length() <= MAX_INTITEM_LENGTH) {
// lower than 2^31
- return new IntItem( buf );
- }
- else if ( buf.length() <= MAX_LONGITEM_LENGTH )
- {
+ return new IntItem(buf);
+ } else if (buf.length() <= MAX_LONGITEM_LENGTH) {
// lower than 2^63
- return new LongItem( buf );
+ return new LongItem(buf);
}
- return new BigIntegerItem( buf );
+ return new BigIntegerItem(buf);
}
- return new StringItem( buf, false );
+ return new StringItem(buf, false);
}
- private static String stripLeadingZeroes( String buf )
- {
- if ( buf == null || buf.isEmpty() )
- {
+ private static String stripLeadingZeroes(String buf) {
+ if (buf == null || buf.isEmpty()) {
return "0";
}
- for ( int i = 0; i < buf.length(); ++i )
- {
- char c = buf.charAt( i );
- if ( c != '0' )
- {
- return buf.substring( i );
+ for (int i = 0; i < buf.length(); ++i) {
+ char c = buf.charAt(i);
+ if (c != '0') {
+ return buf.substring(i);
}
}
return buf;
}
@Override
- public int compareTo( ComparableVersion o )
- {
- return items.compareTo( o.items );
+ public int compareTo(ComparableVersion o) {
+ return items.compareTo(o.items);
}
@Override
- public String toString()
- {
+ public String toString() {
return value;
}
- public String getCanonical()
- {
- if ( canonical == null )
- {
+ public String getCanonical() {
+ if (canonical == null) {
canonical = items.toString();
}
return canonical;
}
@Override
- public boolean equals( Object o )
- {
- return ( o instanceof ComparableVersion ) && items.equals( ( (ComparableVersion) o ).items );
+ public boolean equals(Object o) {
+ return (o instanceof ComparableVersion) && items.equals(((ComparableVersion) o).items);
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
return items.hashCode();
}
@@ -799,29 +673,26 @@ public class ComparableVersion
* @param args the version strings to parse and compare. You can pass arbitrary number of version strings and always
* two adjacent will be compared
*/
- public static void main( String... args )
- {
- System.out.println( "Display parameters as parsed by Maven (in canonical form and as a list of tokens) and"
- + " comparison result:" );
- if ( args.length == 0 )
- {
+ public static void main(String... args) {
+ System.out.println("Display parameters as parsed by Maven (in canonical form and as a list of tokens) and"
+ + " comparison result:");
+ if (args.length == 0) {
return;
}
ComparableVersion prev = null;
int i = 1;
- for ( String version : args )
- {
- ComparableVersion c = new ComparableVersion( version );
-
- if ( prev != null )
- {
- int compare = prev.compareTo( c );
- System.out.println( " " + prev.toString() + ' '
- + ( ( compare == 0 ) ? "==" : ( ( compare < 0 ) ? "<" : ">" ) ) + ' ' + version );
+ for (String version : args) {
+ ComparableVersion c = new ComparableVersion(version);
+
+ if (prev != null) {
+ int compare = prev.compareTo(c);
+ System.out.println(" " + prev.toString() + ' ' + ((compare == 0) ? "==" : ((compare < 0) ? "<" : ">"))
+ + ' ' + version);
}
- System.out.println( ( i++ ) + ". " + version + " -> " + c.getCanonical() + "; tokens: " + c.items.toListString() );
+ System.out.println(
+ (i++) + ". " + version + " -> " + c.getCanonical() + "; tokens: " + c.items.toListString());
prev = c;
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
index 75b19fa9f..d4d6aebc3 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,19 +16,18 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
-
-import java.util.StringTokenizer;
+package org.apache.maven.artifact.versioning;
import static org.apache.commons.lang3.math.NumberUtils.isDigits;
+import java.util.StringTokenizer;
+
/**
* Default implementation of artifact versioning.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class DefaultArtifactVersion
- implements ArtifactVersion
-{
+public class DefaultArtifactVersion implements ArtifactVersion {
private Integer majorVersion;
private Integer minorVersion;
@@ -43,162 +40,124 @@ public class DefaultArtifactVersion
private ComparableVersion comparable;
- public DefaultArtifactVersion( String version )
- {
- parseVersion( version );
+ public DefaultArtifactVersion(String version) {
+ parseVersion(version);
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
return 11 + comparable.hashCode();
}
@Override
- public boolean equals( Object other )
- {
- if ( this == other )
- {
+ public boolean equals(Object other) {
+ if (this == other) {
return true;
}
- if ( !( other instanceof ArtifactVersion ) )
- {
+ if (!(other instanceof ArtifactVersion)) {
return false;
}
- return compareTo( (ArtifactVersion) other ) == 0;
+ return compareTo((ArtifactVersion) other) == 0;
}
- public int compareTo( ArtifactVersion otherVersion )
- {
- if ( otherVersion instanceof DefaultArtifactVersion )
- {
- return this.comparable.compareTo( ( (DefaultArtifactVersion) otherVersion ).comparable );
- }
- else
- {
- return compareTo( new DefaultArtifactVersion( otherVersion.toString() ) );
+ public int compareTo(ArtifactVersion otherVersion) {
+ if (otherVersion instanceof DefaultArtifactVersion) {
+ return this.comparable.compareTo(((DefaultArtifactVersion) otherVersion).comparable);
+ } else {
+ return compareTo(new DefaultArtifactVersion(otherVersion.toString()));
}
}
- public int getMajorVersion()
- {
+ public int getMajorVersion() {
return majorVersion != null ? majorVersion : 0;
}
- public int getMinorVersion()
- {
+ public int getMinorVersion() {
return minorVersion != null ? minorVersion : 0;
}
- public int getIncrementalVersion()
- {
+ public int getIncrementalVersion() {
return incrementalVersion != null ? incrementalVersion : 0;
}
- public int getBuildNumber()
- {
+ public int getBuildNumber() {
return buildNumber != null ? buildNumber : 0;
}
- public String getQualifier()
- {
+ public String getQualifier() {
return qualifier;
}
- public final void parseVersion( String version )
- {
- comparable = new ComparableVersion( version );
+ public final void parseVersion(String version) {
+ comparable = new ComparableVersion(version);
- int index = version.indexOf( '-' );
+ int index = version.indexOf('-');
String part1;
String part2 = null;
- if ( index < 0 )
- {
+ if (index < 0) {
part1 = version;
- }
- else
- {
- part1 = version.substring( 0, index );
- part2 = version.substring( index + 1 );
+ } else {
+ part1 = version.substring(0, index);
+ part2 = version.substring(index + 1);
}
- if ( part2 != null )
- {
- if ( part2.length() == 1 || !part2.startsWith( "0" ) )
- {
- buildNumber = tryParseInt( part2 );
- if ( buildNumber == null )
- {
+ if (part2 != null) {
+ if (part2.length() == 1 || !part2.startsWith("0")) {
+ buildNumber = tryParseInt(part2);
+ if (buildNumber == null) {
qualifier = part2;
}
- }
- else
- {
+ } else {
qualifier = part2;
}
}
- if ( ( !part1.contains( "." ) ) && !part1.startsWith( "0" ) )
- {
- majorVersion = tryParseInt( part1 );
- if ( majorVersion == null )
- {
+ if ((!part1.contains(".")) && !part1.startsWith("0")) {
+ majorVersion = tryParseInt(part1);
+ if (majorVersion == null) {
// qualifier is the whole version, including "-"
qualifier = version;
buildNumber = null;
}
- }
- else
- {
+ } else {
boolean fallback = false;
- StringTokenizer tok = new StringTokenizer( part1, "." );
- if ( tok.hasMoreTokens() )
- {
- majorVersion = getNextIntegerToken( tok );
- if ( majorVersion == null )
- {
+ StringTokenizer tok = new StringTokenizer(part1, ".");
+ if (tok.hasMoreTokens()) {
+ majorVersion = getNextIntegerToken(tok);
+ if (majorVersion == null) {
fallback = true;
}
- }
- else
- {
+ } else {
fallback = true;
}
- if ( tok.hasMoreTokens() )
- {
- minorVersion = getNextIntegerToken( tok );
- if ( minorVersion == null )
- {
+ if (tok.hasMoreTokens()) {
+ minorVersion = getNextIntegerToken(tok);
+ if (minorVersion == null) {
fallback = true;
}
}
- if ( tok.hasMoreTokens() )
- {
- incrementalVersion = getNextIntegerToken( tok );
- if ( incrementalVersion == null )
- {
+ if (tok.hasMoreTokens()) {
+ incrementalVersion = getNextIntegerToken(tok);
+ if (incrementalVersion == null) {
fallback = true;
}
}
- if ( tok.hasMoreTokens() )
- {
+ if (tok.hasMoreTokens()) {
qualifier = tok.nextToken();
- fallback = isDigits( qualifier );
+ fallback = isDigits(qualifier);
}
// string tokenizer won't detect these and ignores them
- if ( part1.contains( ".." ) || part1.startsWith( "." ) || part1.endsWith( "." ) )
- {
+ if (part1.contains("..") || part1.startsWith(".") || part1.endsWith(".")) {
fallback = true;
}
- if ( fallback )
- {
+ if (fallback) {
// qualifier is the whole version, including "-"
qualifier = version;
majorVersion = null;
@@ -209,43 +168,34 @@ public class DefaultArtifactVersion
}
}
- private static Integer getNextIntegerToken( StringTokenizer tok )
- {
+ private static Integer getNextIntegerToken(StringTokenizer tok) {
String s = tok.nextToken();
- if ( ( s.length() > 1 ) && s.startsWith( "0" ) )
- {
+ if ((s.length() > 1) && s.startsWith("0")) {
return null;
}
- return tryParseInt( s );
+ return tryParseInt(s);
}
- private static Integer tryParseInt( String s )
- {
+ private static Integer tryParseInt(String s) {
// for performance, check digits instead of relying later on catching NumberFormatException
- if ( !isDigits( s ) )
- {
+ if (!isDigits(s)) {
return null;
}
- try
- {
- long longValue = Long.parseLong( s );
- if ( longValue > Integer.MAX_VALUE )
- {
+ try {
+ long longValue = Long.parseLong(s);
+ if (longValue > Integer.MAX_VALUE) {
return null;
}
return (int) longValue;
- }
- catch ( NumberFormatException e )
- {
- // should never happen since checked isDigits(s) before
+ } catch (NumberFormatException e) {
+ // should never happen since checked isDigits(s) before
return null;
}
}
@Override
- public String toString()
- {
+ public String toString() {
return comparable.toString();
}
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java
index adc48b93d..02a4a42e5 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,17 +16,15 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
/**
* Occurs when a version is invalid.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class InvalidVersionSpecificationException
- extends Exception
-{
- public InvalidVersionSpecificationException( String message )
- {
- super( message );
+public class InvalidVersionSpecificationException extends Exception {
+ public InvalidVersionSpecificationException(String message) {
+ super(message);
}
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
index bd8f3830b..52afaad0c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,9 +16,9 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -30,20 +28,12 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class OverConstrainedVersionException
- extends ArtifactResolutionException
-{
- public OverConstrainedVersionException( String msg,
- Artifact artifact )
- {
- super( msg, artifact );
+public class OverConstrainedVersionException extends ArtifactResolutionException {
+ public OverConstrainedVersionException(String msg, Artifact artifact) {
+ super(msg, artifact);
}
- public OverConstrainedVersionException( String msg,
- Artifact artifact,
- List<ArtifactRepository> remoteRepositories )
- {
- super( msg, artifact, remoteRepositories );
+ public OverConstrainedVersionException(String msg, Artifact artifact, List<ArtifactRepository> remoteRepositories) {
+ super(msg, artifact, remoteRepositories);
}
-
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
index c728e9f03..f0a4d3489 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,14 +16,14 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
/**
* Describes a restriction in versioning.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class Restriction
-{
+public class Restriction {
private final ArtifactVersion lowerBound;
private final boolean lowerBoundInclusive;
@@ -34,62 +32,53 @@ public class Restriction
private final boolean upperBoundInclusive;
- public static final Restriction EVERYTHING = new Restriction( null, false, null, false );
+ public static final Restriction EVERYTHING = new Restriction(null, false, null, false);
- public Restriction( ArtifactVersion lowerBound, boolean lowerBoundInclusive, ArtifactVersion upperBound,
- boolean upperBoundInclusive )
- {
+ public Restriction(
+ ArtifactVersion lowerBound,
+ boolean lowerBoundInclusive,
+ ArtifactVersion upperBound,
+ boolean upperBoundInclusive) {
this.lowerBound = lowerBound;
this.lowerBoundInclusive = lowerBoundInclusive;
this.upperBound = upperBound;
this.upperBoundInclusive = upperBoundInclusive;
}
- public ArtifactVersion getLowerBound()
- {
+ public ArtifactVersion getLowerBound() {
return lowerBound;
}
- public boolean isLowerBoundInclusive()
- {
+ public boolean isLowerBoundInclusive() {
return lowerBoundInclusive;
}
- public ArtifactVersion getUpperBound()
- {
+ public ArtifactVersion getUpperBound() {
return upperBound;
}
- public boolean isUpperBoundInclusive()
- {
+ public boolean isUpperBoundInclusive() {
return upperBoundInclusive;
}
- public boolean containsVersion( ArtifactVersion version )
- {
- if ( lowerBound != null )
- {
- int comparison = lowerBound.compareTo( version );
+ public boolean containsVersion(ArtifactVersion version) {
+ if (lowerBound != null) {
+ int comparison = lowerBound.compareTo(version);
- if ( ( comparison == 0 ) && !lowerBoundInclusive )
- {
+ if ((comparison == 0) && !lowerBoundInclusive) {
return false;
}
- if ( comparison > 0 )
- {
+ if (comparison > 0) {
return false;
}
}
- if ( upperBound != null )
- {
- int comparison = upperBound.compareTo( version );
+ if (upperBound != null) {
+ int comparison = upperBound.compareTo(version);
- if ( ( comparison == 0 ) && !upperBoundInclusive )
- {
+ if ((comparison == 0) && !upperBoundInclusive) {
return false;
}
- if ( comparison < 0 )
- {
+ if (comparison < 0) {
return false;
}
}
@@ -98,27 +87,20 @@ public class Restriction
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
int result = 13;
- if ( lowerBound == null )
- {
+ if (lowerBound == null) {
result += 1;
- }
- else
- {
+ } else {
result += lowerBound.hashCode();
}
result *= lowerBoundInclusive ? 1 : 2;
- if ( upperBound == null )
- {
+ if (upperBound == null) {
result -= 3;
- }
- else
- {
+ } else {
result -= upperBound.hashCode();
}
@@ -128,67 +110,51 @@ public class Restriction
}
@Override
- public boolean equals( Object other )
- {
- if ( this == other )
- {
+ public boolean equals(Object other) {
+ if (this == other) {
return true;
}
- if ( !( other instanceof Restriction ) )
- {
+ if (!(other instanceof Restriction)) {
return false;
}
Restriction restriction = (Restriction) other;
- if ( lowerBound != null )
- {
- if ( !lowerBound.equals( restriction.lowerBound ) )
- {
+ if (lowerBound != null) {
+ if (!lowerBound.equals(restriction.lowerBound)) {
return false;
}
- }
- else if ( restriction.lowerBound != null )
- {
+ } else if (restriction.lowerBound != null) {
return false;
}
- if ( lowerBoundInclusive != restriction.lowerBoundInclusive )
- {
+ if (lowerBoundInclusive != restriction.lowerBoundInclusive) {
return false;
}
- if ( upperBound != null )
- {
- if ( !upperBound.equals( restriction.upperBound ) )
- {
+ if (upperBound != null) {
+ if (!upperBound.equals(restriction.upperBound)) {
return false;
}
- }
- else if ( restriction.upperBound != null )
- {
+ } else if (restriction.upperBound != null) {
return false;
}
return upperBoundInclusive == restriction.upperBoundInclusive;
-
}
- public String toString()
- {
+ public String toString() {
StringBuilder buf = new StringBuilder();
- buf.append( isLowerBoundInclusive() ? '[' : '(' );
- if ( getLowerBound() != null )
- {
- buf.append( getLowerBound().toString() );
+ buf.append(isLowerBoundInclusive() ? '[' : '(');
+ if (getLowerBound() != null) {
+ buf.append(getLowerBound().toString());
}
- buf.append( ',' );
- if ( getUpperBound() != null )
- {
- buf.append( getUpperBound().toString() );
+ buf.append(',');
+ if (getUpperBound() != null) {
+ buf.append(getUpperBound().toString());
}
- buf.append( isUpperBoundInclusive() ? ']' : ')' );
+ buf.append(isUpperBoundInclusive() ? ']' : ')');
return buf.toString();
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
index 27cca5604..9afa5f6fc 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,15 +16,15 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.WeakHashMap;
import java.util.Objects;
-
+import java.util.WeakHashMap;
import org.apache.maven.artifact.Artifact;
/**
@@ -34,55 +32,47 @@ import org.apache.maven.artifact.Artifact;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class VersionRange
-{
+public class VersionRange {
private static final Map<String, VersionRange> CACHE_SPEC =
- Collections.<String, VersionRange>synchronizedMap( new WeakHashMap<String, VersionRange>() );
+ Collections.<String, VersionRange>synchronizedMap(new WeakHashMap<String, VersionRange>());
private static final Map<String, VersionRange> CACHE_VERSION =
- Collections.<String, VersionRange>synchronizedMap( new WeakHashMap<String, VersionRange>() );
+ Collections.<String, VersionRange>synchronizedMap(new WeakHashMap<String, VersionRange>());
private final ArtifactVersion recommendedVersion;
private final List<Restriction> restrictions;
- private VersionRange( ArtifactVersion recommendedVersion,
- List<Restriction> restrictions )
- {
+ private VersionRange(ArtifactVersion recommendedVersion, List<Restriction> restrictions) {
this.recommendedVersion = recommendedVersion;
this.restrictions = restrictions;
}
- public ArtifactVersion getRecommendedVersion()
- {
+ public ArtifactVersion getRecommendedVersion() {
return recommendedVersion;
}
- public List<Restriction> getRestrictions()
- {
+ public List<Restriction> getRestrictions() {
return restrictions;
}
/**
- * @deprecated VersionRange is immutable, cloning is not useful and even more an issue against the cache
+ * @deprecated VersionRange is immutable, cloning is not useful and even more an issue against the cache
* @return a clone
*/
@Deprecated
- public VersionRange cloneOf()
- {
+ public VersionRange cloneOf() {
List<Restriction> copiedRestrictions = null;
- if ( restrictions != null )
- {
+ if (restrictions != null) {
copiedRestrictions = new ArrayList<>();
- if ( !restrictions.isEmpty() )
- {
- copiedRestrictions.addAll( restrictions );
+ if (!restrictions.isEmpty()) {
+ copiedRestrictions.addAll(restrictions);
}
}
- return new VersionRange( recommendedVersion, copiedRestrictions );
+ return new VersionRange(recommendedVersion, copiedRestrictions);
}
/**
@@ -104,17 +94,13 @@ public class VersionRange
* @throws InvalidVersionSpecificationException
*
*/
- public static VersionRange createFromVersionSpec( String spec )
- throws InvalidVersionSpecificationException
- {
- if ( spec == null )
- {
+ public static VersionRange createFromVersionSpec(String spec) throws InvalidVersionSpecificationException {
+ if (spec == null) {
return null;
}
- VersionRange cached = CACHE_SPEC.get( spec );
- if ( cached != null )
- {
+ VersionRange cached = CACHE_SPEC.get(spec);
+ if (cached != null) {
return cached;
}
@@ -124,129 +110,106 @@ public class VersionRange
ArtifactVersion upperBound = null;
ArtifactVersion lowerBound = null;
- while ( process.startsWith( "[" ) || process.startsWith( "(" ) )
- {
- int index1 = process.indexOf( ')' );
- int index2 = process.indexOf( ']' );
+ while (process.startsWith("[") || process.startsWith("(")) {
+ int index1 = process.indexOf(')');
+ int index2 = process.indexOf(']');
int index = index2;
- if ( index2 < 0 || index1 < index2 )
- {
- if ( index1 >= 0 )
- {
+ if (index2 < 0 || index1 < index2) {
+ if (index1 >= 0) {
index = index1;
}
}
- if ( index < 0 )
- {
- throw new InvalidVersionSpecificationException( "Unbounded range: " + spec );
+ if (index < 0) {
+ throw new InvalidVersionSpecificationException("Unbounded range: " + spec);
}
- Restriction restriction = parseRestriction( process.substring( 0, index + 1 ) );
- if ( lowerBound == null )
- {
+ Restriction restriction = parseRestriction(process.substring(0, index + 1));
+ if (lowerBound == null) {
lowerBound = restriction.getLowerBound();
}
- if ( upperBound != null )
- {
- if ( restriction.getLowerBound() == null || restriction.getLowerBound().compareTo( upperBound ) < 0 )
- {
- throw new InvalidVersionSpecificationException( "Ranges overlap: " + spec );
+ if (upperBound != null) {
+ if (restriction.getLowerBound() == null
+ || restriction.getLowerBound().compareTo(upperBound) < 0) {
+ throw new InvalidVersionSpecificationException("Ranges overlap: " + spec);
}
}
- restrictions.add( restriction );
+ restrictions.add(restriction);
upperBound = restriction.getUpperBound();
- process = process.substring( index + 1 ).trim();
+ process = process.substring(index + 1).trim();
- if ( process.length() > 0 && process.startsWith( "," ) )
- {
- process = process.substring( 1 ).trim();
+ if (process.length() > 0 && process.startsWith(",")) {
+ process = process.substring(1).trim();
}
}
- if ( process.length() > 0 )
- {
- if ( restrictions.size() > 0 )
- {
+ if (process.length() > 0) {
+ if (restrictions.size() > 0) {
throw new InvalidVersionSpecificationException(
- "Only fully-qualified sets allowed in multiple set scenario: " + spec );
- }
- else
- {
- version = new DefaultArtifactVersion( process );
- restrictions.add( Restriction.EVERYTHING );
+ "Only fully-qualified sets allowed in multiple set scenario: " + spec);
+ } else {
+ version = new DefaultArtifactVersion(process);
+ restrictions.add(Restriction.EVERYTHING);
}
}
- cached = new VersionRange( version, restrictions );
- CACHE_SPEC.put( spec, cached );
+ cached = new VersionRange(version, restrictions);
+ CACHE_SPEC.put(spec, cached);
return cached;
}
- private static Restriction parseRestriction( String spec )
- throws InvalidVersionSpecificationException
- {
- boolean lowerBoundInclusive = spec.startsWith( "[" );
- boolean upperBoundInclusive = spec.endsWith( "]" );
+ private static Restriction parseRestriction(String spec) throws InvalidVersionSpecificationException {
+ boolean lowerBoundInclusive = spec.startsWith("[");
+ boolean upperBoundInclusive = spec.endsWith("]");
- String process = spec.substring( 1, spec.length() - 1 ).trim();
+ String process = spec.substring(1, spec.length() - 1).trim();
Restriction restriction;
- int index = process.indexOf( ',' );
+ int index = process.indexOf(',');
- if ( index < 0 )
- {
- if ( !lowerBoundInclusive || !upperBoundInclusive )
- {
- throw new InvalidVersionSpecificationException( "Single version must be surrounded by []: " + spec );
+ if (index < 0) {
+ if (!lowerBoundInclusive || !upperBoundInclusive) {
+ throw new InvalidVersionSpecificationException("Single version must be surrounded by []: " + spec);
}
- ArtifactVersion version = new DefaultArtifactVersion( process );
+ ArtifactVersion version = new DefaultArtifactVersion(process);
- restriction = new Restriction( version, lowerBoundInclusive, version, upperBoundInclusive );
- }
- else
- {
- String lowerBound = process.substring( 0, index ).trim();
- String upperBound = process.substring( index + 1 ).trim();
+ restriction = new Restriction(version, lowerBoundInclusive, version, upperBoundInclusive);
+ } else {
+ String lowerBound = process.substring(0, index).trim();
+ String upperBound = process.substring(index + 1).trim();
ArtifactVersion lowerVersion = null;
- if ( lowerBound.length() > 0 )
- {
- lowerVersion = new DefaultArtifactVersion( lowerBound );
+ if (lowerBound.length() > 0) {
+ lowerVersion = new DefaultArtifactVersion(lowerBound);
}
ArtifactVersion upperVersion = null;
- if ( upperBound.length() > 0 )
- {
- upperVersion = new DefaultArtifactVersion( upperBound );
+ if (upperBound.length() > 0) {
+ upperVersion = new DefaultArtifactVersion(upperBound);
}
- if ( upperVersion != null && lowerVersion != null )
- {
- int result = upperVersion.compareTo( lowerVersion );
- if ( result < 0 || ( result == 0 && ( !lowerBoundInclusive || !upperBoundInclusive ) ) )
- {
- throw new InvalidVersionSpecificationException( "Range defies version ordering: " + spec );
+ if (upperVersion != null && lowerVersion != null) {
+ int result = upperVersion.compareTo(lowerVersion);
+ if (result < 0 || (result == 0 && (!lowerBoundInclusive || !upperBoundInclusive))) {
+ throw new InvalidVersionSpecificationException("Range defies version ordering: " + spec);
}
}
- restriction = new Restriction( lowerVersion, lowerBoundInclusive, upperVersion, upperBoundInclusive );
+ restriction = new Restriction(lowerVersion, lowerBoundInclusive, upperVersion, upperBoundInclusive);
}
return restriction;
}
- public static VersionRange createFromVersion( String version )
- {
- VersionRange cached = CACHE_VERSION.get( version );
- if ( cached == null )
- {
+ public static VersionRange createFromVersion(String version) {
+ VersionRange cached = CACHE_VERSION.get(version);
+ if (cached == null) {
List<Restriction> restrictions = Collections.emptyList();
- cached = new VersionRange( new DefaultArtifactVersion( version ), restrictions );
- CACHE_VERSION.put( version, cached );
+ cached = new VersionRange(new DefaultArtifactVersion(version), restrictions);
+ CACHE_VERSION.put(version, cached);
}
return cached;
}
@@ -279,203 +242,148 @@ public class VersionRange
* @throws NullPointerException if the specified <code>VersionRange</code> is
* <code>null</code>.
*/
- public VersionRange restrict( VersionRange restriction )
- {
+ public VersionRange restrict(VersionRange restriction) {
List<Restriction> r1 = this.restrictions;
List<Restriction> r2 = restriction.restrictions;
List<Restriction> restrictions;
- if ( r1.isEmpty() || r2.isEmpty() )
- {
+ if (r1.isEmpty() || r2.isEmpty()) {
restrictions = Collections.emptyList();
- }
- else
- {
- restrictions = Collections.unmodifiableList( intersection( r1, r2 ) );
+ } else {
+ restrictions = Collections.unmodifiableList(intersection(r1, r2));
}
ArtifactVersion version = null;
- if ( restrictions.size() > 0 )
- {
- for ( Restriction r : restrictions )
- {
- if ( recommendedVersion != null && r.containsVersion( recommendedVersion ) )
- {
+ if (restrictions.size() > 0) {
+ for (Restriction r : restrictions) {
+ if (recommendedVersion != null && r.containsVersion(recommendedVersion)) {
// if we find the original, use that
version = recommendedVersion;
break;
- }
- else if ( version == null && restriction.getRecommendedVersion() != null
- && r.containsVersion( restriction.getRecommendedVersion() ) )
- {
+ } else if (version == null
+ && restriction.getRecommendedVersion() != null
+ && r.containsVersion(restriction.getRecommendedVersion())) {
// use this if we can, but prefer the original if possible
version = restriction.getRecommendedVersion();
}
}
}
// Either the original or the specified version ranges have no restrictions
- else if ( recommendedVersion != null )
- {
+ else if (recommendedVersion != null) {
// Use the original recommended version since it exists
version = recommendedVersion;
- }
- else if ( restriction.recommendedVersion != null )
- {
+ } else if (restriction.recommendedVersion != null) {
// Use the recommended version from the specified VersionRange since there is no
// original recommended version
version = restriction.recommendedVersion;
}
-/* TODO should throw this immediately, but need artifact
- else
- {
- throw new OverConstrainedVersionException( "Restricting incompatible version ranges" );
- }
-*/
+ /* TODO should throw this immediately, but need artifact
+ else
+ {
+ throw new OverConstrainedVersionException( "Restricting incompatible version ranges" );
+ }
+ */
- return new VersionRange( version, restrictions );
+ return new VersionRange(version, restrictions);
}
- private List<Restriction> intersection( List<Restriction> r1, List<Restriction> r2 )
- {
- List<Restriction> restrictions = new ArrayList<>( r1.size() + r2.size() );
+ private List<Restriction> intersection(List<Restriction> r1, List<Restriction> r2) {
+ List<Restriction> restrictions = new ArrayList<>(r1.size() + r2.size());
Iterator<Restriction> i1 = r1.iterator();
Iterator<Restriction> i2 = r2.iterator();
Restriction res1 = i1.next();
Restriction res2 = i2.next();
boolean done = false;
- while ( !done )
- {
- if ( res1.getLowerBound() == null || res2.getUpperBound() == null
- || res1.getLowerBound().compareTo( res2.getUpperBound() ) <= 0 )
- {
- if ( res1.getUpperBound() == null || res2.getLowerBound() == null
- || res1.getUpperBound().compareTo( res2.getLowerBound() ) >= 0 )
- {
+ while (!done) {
+ if (res1.getLowerBound() == null
+ || res2.getUpperBound() == null
+ || res1.getLowerBound().compareTo(res2.getUpperBound()) <= 0) {
+ if (res1.getUpperBound() == null
+ || res2.getLowerBound() == null
+ || res1.getUpperBound().compareTo(res2.getLowerBound()) >= 0) {
ArtifactVersion lower;
ArtifactVersion upper;
boolean lowerInclusive;
boolean upperInclusive;
// overlaps
- if ( res1.getLowerBound() == null )
- {
+ if (res1.getLowerBound() == null) {
lower = res2.getLowerBound();
lowerInclusive = res2.isLowerBoundInclusive();
- }
- else if ( res2.getLowerBound() == null )
- {
+ } else if (res2.getLowerBound() == null) {
lower = res1.getLowerBound();
lowerInclusive = res1.isLowerBoundInclusive();
- }
- else
- {
- int comparison = res1.getLowerBound().compareTo( res2.getLowerBound() );
- if ( comparison < 0 )
- {
+ } else {
+ int comparison = res1.getLowerBound().compareTo(res2.getLowerBound());
+ if (comparison < 0) {
lower = res2.getLowerBound();
lowerInclusive = res2.isLowerBoundInclusive();
- }
- else if ( comparison == 0 )
- {
+ } else if (comparison == 0) {
lower = res1.getLowerBound();
lowerInclusive = res1.isLowerBoundInclusive() && res2.isLowerBoundInclusive();
- }
- else
- {
+ } else {
lower = res1.getLowerBound();
lowerInclusive = res1.isLowerBoundInclusive();
}
}
- if ( res1.getUpperBound() == null )
- {
+ if (res1.getUpperBound() == null) {
upper = res2.getUpperBound();
upperInclusive = res2.isUpperBoundInclusive();
- }
- else if ( res2.getUpperBound() == null )
- {
+ } else if (res2.getUpperBound() == null) {
upper = res1.getUpperBound();
upperInclusive = res1.isUpperBoundInclusive();
- }
- else
- {
- int comparison = res1.getUpperBound().compareTo( res2.getUpperBound() );
- if ( comparison < 0 )
- {
+ } else {
+ int comparison = res1.getUpperBound().compareTo(res2.getUpperBound());
+ if (comparison < 0) {
upper = res1.getUpperBound();
upperInclusive = res1.isUpperBoundInclusive();
- }
- else if ( comparison == 0 )
- {
+ } else if (comparison == 0) {
upper = res1.getUpperBound();
upperInclusive = res1.isUpperBoundInclusive() && res2.isUpperBoundInclusive();
- }
- else
- {
+ } else {
upper = res2.getUpperBound();
upperInclusive = res2.isUpperBoundInclusive();
}
}
// don't add if they are equal and one is not inclusive
- if ( lower == null || upper == null || lower.compareTo( upper ) != 0 )
- {
- restrictions.add( new Restriction( lower, lowerInclusive, upper, upperInclusive ) );
- }
- else if ( lowerInclusive && upperInclusive )
- {
- restrictions.add( new Restriction( lower, lowerInclusive, upper, upperInclusive ) );
+ if (lower == null || upper == null || lower.compareTo(upper) != 0) {
+ restrictions.add(new Restriction(lower, lowerInclusive, upper, upperInclusive));
+ } else if (lowerInclusive && upperInclusive) {
+ restrictions.add(new Restriction(lower, lowerInclusive, upper, upperInclusive));
}
//noinspection ObjectEquality
- if ( upper == res2.getUpperBound() )
- {
+ if (upper == res2.getUpperBound()) {
// advance res2
- if ( i2.hasNext() )
- {
+ if (i2.hasNext()) {
res2 = i2.next();
- }
- else
- {
+ } else {
done = true;
}
- }
- else
- {
+ } else {
// advance res1
- if ( i1.hasNext() )
- {
+ if (i1.hasNext()) {
res1 = i1.next();
- }
- else
- {
+ } else {
done = true;
}
}
- }
- else
- {
+ } else {
// move on to next in r1
- if ( i1.hasNext() )
- {
+ if (i1.hasNext()) {
res1 = i1.next();
- }
- else
- {
+ } else {
done = true;
}
}
- }
- else
- {
+ } else {
// move on to next in r2
- if ( i2.hasNext() )
- {
+ if (i2.hasNext()) {
res2 = i2.next();
- }
- else
- {
+ } else {
done = true;
}
}
@@ -484,19 +392,13 @@ public class VersionRange
return restrictions;
}
- public ArtifactVersion getSelectedVersion( Artifact artifact )
- throws OverConstrainedVersionException
- {
+ public ArtifactVersion getSelectedVersion(Artifact artifact) throws OverConstrainedVersionException {
ArtifactVersion version;
- if ( recommendedVersion != null )
- {
+ if (recommendedVersion != null) {
version = recommendedVersion;
- }
- else
- {
- if ( restrictions.size() == 0 )
- {
- throw new OverConstrainedVersionException( "The artifact has no valid ranges", artifact );
+ } else {
+ if (restrictions.size() == 0) {
+ throw new OverConstrainedVersionException("The artifact has no valid ranges", artifact);
}
version = null;
@@ -504,60 +406,44 @@ public class VersionRange
return version;
}
- public boolean isSelectedVersionKnown( Artifact artifact )
- throws OverConstrainedVersionException
- {
+ public boolean isSelectedVersionKnown(Artifact artifact) throws OverConstrainedVersionException {
boolean value = false;
- if ( recommendedVersion != null )
- {
+ if (recommendedVersion != null) {
value = true;
- }
- else
- {
- if ( restrictions.size() == 0 )
- {
- throw new OverConstrainedVersionException( "The artifact has no valid ranges", artifact );
+ } else {
+ if (restrictions.size() == 0) {
+ throw new OverConstrainedVersionException("The artifact has no valid ranges", artifact);
}
}
return value;
}
- public String toString()
- {
- if ( recommendedVersion != null )
- {
+ public String toString() {
+ if (recommendedVersion != null) {
return recommendedVersion.toString();
- }
- else
- {
+ } else {
StringBuilder buf = new StringBuilder();
- for ( Iterator<Restriction> i = restrictions.iterator(); i.hasNext(); )
- {
+ for (Iterator<Restriction> i = restrictions.iterator(); i.hasNext(); ) {
Restriction r = i.next();
- buf.append( r.toString() );
+ buf.append(r.toString());
- if ( i.hasNext() )
- {
- buf.append( ',' );
+ if (i.hasNext()) {
+ buf.append(',');
}
}
return buf.toString();
}
}
- public ArtifactVersion matchVersion( List<ArtifactVersion> versions )
- {
+ public ArtifactVersion matchVersion(List<ArtifactVersion> versions) {
// TODO could be more efficient by sorting the list and then moving along the restrictions in order?
ArtifactVersion matched = null;
- for ( ArtifactVersion version : versions )
- {
- if ( containsVersion( version ) )
- {
+ for (ArtifactVersion version : versions) {
+ if (containsVersion(version)) {
// valid - check if it is greater than the currently matched version
- if ( matched == null || version.compareTo( matched ) > 0 )
- {
+ if (matched == null || version.compareTo(matched) > 0) {
matched = version;
}
}
@@ -565,44 +451,36 @@ public class VersionRange
return matched;
}
- public boolean containsVersion( ArtifactVersion version )
- {
- for ( Restriction restriction : restrictions )
- {
- if ( restriction.containsVersion( version ) )
- {
+ public boolean containsVersion(ArtifactVersion version) {
+ for (Restriction restriction : restrictions) {
+ if (restriction.containsVersion(version)) {
return true;
}
}
return false;
}
- public boolean hasRestrictions()
- {
+ public boolean hasRestrictions() {
return !restrictions.isEmpty() && recommendedVersion == null;
}
- public boolean equals( Object obj )
- {
- if ( this == obj )
- {
+ public boolean equals(Object obj) {
+ if (this == obj) {
return true;
}
- if ( !( obj instanceof VersionRange ) )
- {
+ if (!(obj instanceof VersionRange)) {
return false;
}
VersionRange other = (VersionRange) obj;
- return Objects.equals( recommendedVersion, other.recommendedVersion )
- && Objects.equals( restrictions, other.restrictions );
+ return Objects.equals(recommendedVersion, other.recommendedVersion)
+ && Objects.equals(restrictions, other.restrictions);
}
- public int hashCode()
- {
+ public int hashCode() {
int hash = 7;
- hash = 31 * hash + ( recommendedVersion == null ? 0 : recommendedVersion.hashCode() );
- hash = 31 * hash + ( restrictions == null ? 0 : restrictions.hashCode() );
+ hash = 31 * hash + (recommendedVersion == null ? 0 : recommendedVersion.hashCode());
+ hash = 31 * hash + (restrictions == null ? 0 : restrictions.hashCode());
return hash;
}
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
index 960d7beb7..8dccb6e2f 100644
--- a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
+++ b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
@@ -1,5 +1,3 @@
-package org.apache.maven.repository;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,12 +16,12 @@ package org.apache.maven.repository;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.repository;
/**
* Proxy
*/
-public class Proxy
-{
+public class Proxy {
public static final String PROXY_SOCKS5 = "SOCKS_5";
public static final String PROXY_SOCKS4 = "SOCKS4";
@@ -75,8 +73,7 @@ public class Proxy
*
* @return proxy server host name
*/
- public String getHost()
- {
+ public String getHost() {
return host;
}
@@ -85,8 +82,7 @@ public class Proxy
*
* @param host proxy server host name
*/
- public void setHost( String host )
- {
+ public void setHost(String host) {
this.host = host;
}
@@ -95,8 +91,7 @@ public class Proxy
*
* @return user's password at proxy host
*/
- public String getPassword()
- {
+ public String getPassword() {
return password;
}
@@ -105,8 +100,7 @@ public class Proxy
*
* @param password password to use to login to a proxy server
*/
- public void setPassword( String password )
- {
+ public void setPassword(String password) {
this.password = password;
}
@@ -115,8 +109,7 @@ public class Proxy
*
* @return proxy server port
*/
- public int getPort()
- {
+ public int getPort() {
return port;
}
@@ -125,8 +118,7 @@ public class Proxy
*
* @param port proxy server port
*/
- public void setPort( int port )
- {
+ public void setPort(int port) {
this.port = port;
}
@@ -135,8 +127,7 @@ public class Proxy
*
* @return username for the proxy server
*/
- public String getUserName()
- {
+ public String getUserName() {
return userName;
}
@@ -145,8 +136,7 @@ public class Proxy
*
* @param userName username for the proxy server
*/
- public void setUserName( String userName )
- {
+ public void setUserName(String userName) {
this.userName = userName;
}
@@ -155,46 +145,38 @@ public class Proxy
*
* @return the protocol of the proxy server
*/
- public String getProtocol()
- {
+ public String getProtocol() {
return protocol;
}
/**
* @param protocol the protocol of the proxy server like <i>SOCKSv4</i>
*/
- public void setProtocol( String protocol )
- {
+ public void setProtocol(String protocol) {
this.protocol = protocol;
}
- public String getNonProxyHosts()
- {
+ public String getNonProxyHosts() {
return nonProxyHosts;
}
- public void setNonProxyHosts( String nonProxyHosts )
- {
+ public void setNonProxyHosts(String nonProxyHosts) {
this.nonProxyHosts = nonProxyHosts;
}
- public String getNtlmHost()
- {
+ public String getNtlmHost() {
return ntlmHost;
}
- public void setNtlmHost( String ntlmHost )
- {
+ public void setNtlmHost(String ntlmHost) {
this.ntlmHost = ntlmHost;
}
- public void setNtlmDomain( String ntlmDomain )
- {
+ public void setNtlmDomain(String ntlmDomain) {
this.ntlmDomain = ntlmDomain;
}
- public String getNtlmDomain()
- {
+ public String getNtlmDomain() {
return ntlmDomain;
}
}
diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java b/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
index c97b4e77a..820edced8 100644
--- a/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
+++ b/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
@@ -1,5 +1,3 @@
-package org.apache.maven.repository.legacy.metadata;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.repository.legacy.metadata;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.repository.legacy.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.repository.legacy.metadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException;
@@ -29,8 +28,7 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreExce
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface ArtifactMetadata
-{
+public interface ArtifactMetadata {
/** Whether this metadata should be stored alongside the artifact. */
boolean storedInArtifactVersionDirectory();
@@ -51,7 +49,7 @@ public interface ArtifactMetadata
* @param repository the remote repository it came from
* @return the filename
*/
- String getLocalFilename( ArtifactRepository repository );
+ String getLocalFilename(ArtifactRepository repository);
/**
* Get the filename of this metadata on the remote repository.
@@ -66,7 +64,7 @@ public interface ArtifactMetadata
*
* @param metadata the new metadata
*/
- void merge( ArtifactMetadata metadata );
+ void merge(ArtifactMetadata metadata);
/**
* Store the metadata in the local repository.
@@ -76,9 +74,8 @@ public interface ArtifactMetadata
* @param remoteRepository the remote repository it came from
* @throws RepositoryMetadataStoreException in case of issue
*/
- void storeInLocalRepository( ArtifactRepository localRepository,
- ArtifactRepository remoteRepository )
- throws RepositoryMetadataStoreException;
+ void storeInLocalRepository(ArtifactRepository localRepository, ArtifactRepository remoteRepository)
+ throws RepositoryMetadataStoreException;
String extendedToString();
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
index 333f6368b..c8fa6ff19 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,64 +16,55 @@ package org.apache.maven.artifact;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
-import org.apache.maven.artifact.versioning.VersionRange;
-
import junit.framework.TestCase;
+import org.apache.maven.artifact.versioning.VersionRange;
/**
* Tests {@link ArtifactUtils}.
*
* @author Benjamin Bentmann
*/
-public class ArtifactUtilsTest
- extends TestCase
-{
+public class ArtifactUtilsTest extends TestCase {
- private Artifact newArtifact( String aid )
- {
- return new DefaultArtifact( "group", aid, VersionRange.createFromVersion( "1.0" ), "test", "jar", "tests", null );
+ private Artifact newArtifact(String aid) {
+ return new DefaultArtifact("group", aid, VersionRange.createFromVersion("1.0"), "test", "jar", "tests", null);
}
- public void testIsSnapshot()
- {
- assertEquals( false, ArtifactUtils.isSnapshot( null ) );
- assertEquals( false, ArtifactUtils.isSnapshot( "" ) );
- assertEquals( false, ArtifactUtils.isSnapshot( "1.2.3" ) );
- assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-SNAPSHOT" ) );
- assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-snapshot" ) );
- assertEquals( true, ArtifactUtils.isSnapshot( "1.2.3-20090413.094722-2" ) );
- assertEquals( false, ArtifactUtils.isSnapshot( "1.2.3-20090413X094722-2"));
+ public void testIsSnapshot() {
+ assertEquals(false, ArtifactUtils.isSnapshot(null));
+ assertEquals(false, ArtifactUtils.isSnapshot(""));
+ assertEquals(false, ArtifactUtils.isSnapshot("1.2.3"));
+ assertEquals(true, ArtifactUtils.isSnapshot("1.2.3-SNAPSHOT"));
+ assertEquals(true, ArtifactUtils.isSnapshot("1.2.3-snapshot"));
+ assertEquals(true, ArtifactUtils.isSnapshot("1.2.3-20090413.094722-2"));
+ assertEquals(false, ArtifactUtils.isSnapshot("1.2.3-20090413X094722-2"));
}
- public void testToSnapshotVersion()
- {
- assertEquals( "1.2.3", ArtifactUtils.toSnapshotVersion( "1.2.3" ) );
- assertEquals( "1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion( "1.2.3-SNAPSHOT" ) );
- assertEquals( "1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion( "1.2.3-20090413.094722-2" ) );
- assertEquals( "1.2.3-20090413X094722-2", ArtifactUtils.toSnapshotVersion( "1.2.3-20090413X094722-2" ) );
+ public void testToSnapshotVersion() {
+ assertEquals("1.2.3", ArtifactUtils.toSnapshotVersion("1.2.3"));
+ assertEquals("1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion("1.2.3-SNAPSHOT"));
+ assertEquals("1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion("1.2.3-20090413.094722-2"));
+ assertEquals("1.2.3-20090413X094722-2", ArtifactUtils.toSnapshotVersion("1.2.3-20090413X094722-2"));
}
/**
* Tests that the ordering of the map resembles the ordering of the input collection of artifacts.
*/
- public void testArtifactMapByVersionlessIdOrdering()
- throws Exception
- {
+ public void testArtifactMapByVersionlessIdOrdering() throws Exception {
List<Artifact> list = new ArrayList<>();
- list.add( newArtifact( "b" ) );
- list.add( newArtifact( "a" ) );
- list.add( newArtifact( "c" ) );
- list.add( newArtifact( "e" ) );
- list.add( newArtifact( "d" ) );
+ list.add(newArtifact("b"));
+ list.add(newArtifact("a"));
+ list.add(newArtifact("c"));
+ list.add(newArtifact("e"));
+ list.add(newArtifact("d"));
- Map<String, Artifact> map = ArtifactUtils.artifactMapByVersionlessId( list );
- assertNotNull( map );
- assertEquals( list, new ArrayList<>( map.values() ) );
+ Map<String, Artifact> map = ArtifactUtils.artifactMapByVersionlessId(list);
+ assertNotNull(map);
+ assertEquals(list, new ArrayList<>(map.values()));
}
-
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
index fbd011916..7170075e1 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact;
* "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
+ * 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
@@ -18,22 +16,24 @@ package org.apache.maven.artifact;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact;
import junit.framework.TestCase;
-
import org.apache.maven.artifact.handler.ArtifactHandlerMock;
import org.apache.maven.artifact.versioning.VersionRange;
-public class DefaultArtifactTest
- extends TestCase
-{
+public class DefaultArtifactTest extends TestCase {
private DefaultArtifact artifact;
private DefaultArtifact snapshotArtifact;
- private String groupId = "groupid", artifactId = "artifactId", version = "1.0", scope = "artifactScope", type = "type",
- classifier = "classifier";
+ private String groupId = "groupid",
+ artifactId = "artifactId",
+ version = "1.0",
+ scope = "artifactScope",
+ type = "type",
+ classifier = "classifier";
private String snapshotSpecVersion = "1.0-SNAPSHOT";
private String snapshotResolvedVersion = "1.0-20070606.010101-1";
@@ -43,98 +43,85 @@ public class DefaultArtifactTest
private ArtifactHandlerMock artifactHandler;
- protected void setUp()
- throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
artifactHandler = new ArtifactHandlerMock();
- versionRange = VersionRange.createFromVersion( version );
- artifact = new DefaultArtifact( groupId, artifactId, versionRange, scope, type, classifier, artifactHandler );
+ versionRange = VersionRange.createFromVersion(version);
+ artifact = new DefaultArtifact(groupId, artifactId, versionRange, scope, type, classifier, artifactHandler);
- snapshotVersionRange = VersionRange.createFromVersion( snapshotResolvedVersion );
- snapshotArtifact = new DefaultArtifact( groupId, artifactId, snapshotVersionRange, scope, type, classifier, artifactHandler );
+ snapshotVersionRange = VersionRange.createFromVersion(snapshotResolvedVersion);
+ snapshotArtifact = new DefaultArtifact(
+ groupId, artifactId, snapshotVersionRange, scope, type, classifier, artifactHandler);
}
- public void testGetVersionReturnsResolvedVersionOnSnapshot()
- {
- assertEquals( snapshotResolvedVersion, snapshotArtifact.getVersion() );
+ public void testGetVersionReturnsResolvedVersionOnSnapshot() {
+ assertEquals(snapshotResolvedVersion, snapshotArtifact.getVersion());
// this is FOUL!
-// snapshotArtifact.isSnapshot();
+ // snapshotArtifact.isSnapshot();
- assertEquals( snapshotSpecVersion, snapshotArtifact.getBaseVersion() );
+ assertEquals(snapshotSpecVersion, snapshotArtifact.getBaseVersion());
}
- public void testGetDependencyConflictId()
- {
- assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId() );
+ public void testGetDependencyConflictId() {
+ assertEquals(groupId + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId());
}
- public void testGetDependencyConflictIdNullGroupId()
- {
- artifact.setGroupId( null );
- assertEquals( null + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId() );
+ public void testGetDependencyConflictIdNullGroupId() {
+ artifact.setGroupId(null);
+ assertEquals(null + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId());
}
- public void testGetDependencyConflictIdNullClassifier()
- {
- artifact = new DefaultArtifact( groupId, artifactId, versionRange, scope, type, null, artifactHandler );
- assertEquals( groupId + ":" + artifactId + ":" + type, artifact.getDependencyConflictId() );
+ public void testGetDependencyConflictIdNullClassifier() {
+ artifact = new DefaultArtifact(groupId, artifactId, versionRange, scope, type, null, artifactHandler);
+ assertEquals(groupId + ":" + artifactId + ":" + type, artifact.getDependencyConflictId());
}
- public void testGetDependencyConflictIdNullScope()
- {
- artifact.setScope( null );
- assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId() );
+ public void testGetDependencyConflictIdNullScope() {
+ artifact.setScope(null);
+ assertEquals(groupId + ":" + artifactId + ":" + type + ":" + classifier, artifact.getDependencyConflictId());
}
- public void testToString()
- {
- assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope,
- artifact.toString() );
+ public void testToString() {
+ assertEquals(
+ groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope,
+ artifact.toString());
}
- public void testToStringNullGroupId()
- {
- artifact.setGroupId( null );
- assertEquals( artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope, artifact.toString() );
+ public void testToStringNullGroupId() {
+ artifact.setGroupId(null);
+ assertEquals(artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope, artifact.toString());
}
- public void testToStringNullClassifier()
- {
- artifact = new DefaultArtifact( groupId, artifactId, versionRange, scope, type, null, artifactHandler );
- assertEquals( groupId + ":" + artifactId + ":" + type + ":" + version + ":" + scope, artifact.toString() );
+ public void testToStringNullClassifier() {
+ artifact = new DefaultArtifact(groupId, artifactId, versionRange, scope, type, null, artifactHandler);
+ assertEquals(groupId + ":" + artifactId + ":" + type + ":" + version + ":" + scope, artifact.toString());
}
- public void testToStringNullScope()
- {
- artifact.setScope( null );
- assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version, artifact.toString() );
+ public void testToStringNullScope() {
+ artifact.setScope(null);
+ assertEquals(groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version, artifact.toString());
}
- public void testComparisonByVersion()
- {
- Artifact artifact1 = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "5.0" ), scope,
- type, classifier, artifactHandler );
- Artifact artifact2 = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "12.0" ), scope,
- type, classifier, artifactHandler );
+ public void testComparisonByVersion() {
+ Artifact artifact1 = new DefaultArtifact(
+ groupId, artifactId, VersionRange.createFromVersion("5.0"), scope, type, classifier, artifactHandler);
+ Artifact artifact2 = new DefaultArtifact(
+ groupId, artifactId, VersionRange.createFromVersion("12.0"), scope, type, classifier, artifactHandler);
- assertTrue( artifact1.compareTo( artifact2 ) < 0 );
- assertTrue( artifact2.compareTo( artifact1 ) > 0 );
+ assertTrue(artifact1.compareTo(artifact2) < 0);
+ assertTrue(artifact2.compareTo(artifact1) > 0);
- Artifact artifact = new DefaultArtifact( groupId, artifactId, VersionRange.createFromVersion( "5.0" ), scope,
- type, classifier, artifactHandler );
- assertTrue( artifact.compareTo( artifact1 ) == 0 );
- assertTrue( artifact1.compareTo( artifact ) == 0 );
+ Artifact artifact = new DefaultArtifact(
+ groupId, artifactId, VersionRange.createFromVersion("5.0"), scope, type, classifier, artifactHandler);
+ assertTrue(artifact.compareTo(artifact1) == 0);
+ assertTrue(artifact1.compareTo(artifact) == 0);
}
- public void testNonResolvedVersionRangeConsistentlyYieldsNullVersions()
- throws Exception
- {
- VersionRange vr = VersionRange.createFromVersionSpec( "[1.0,2.0)" );
- artifact = new DefaultArtifact( groupId, artifactId, vr, scope, type, null, artifactHandler );
- assertEquals( null, artifact.getVersion() );
- assertEquals( null, artifact.getBaseVersion() );
+ public void testNonResolvedVersionRangeConsistentlyYieldsNullVersions() throws Exception {
+ VersionRange vr = VersionRange.createFromVersionSpec("[1.0,2.0)");
+ artifact = new DefaultArtifact(groupId, artifactId, vr, scope, type, null, artifactHandler);
+ assertEquals(null, artifact.getVersion());
+ assertEquals(null, artifact.getBaseVersion());
}
-
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java b/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
index a9f335e69..deb3e77c5 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.handler;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.handler;
* "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
+ * 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
@@ -18,83 +16,66 @@ package org.apache.maven.artifact.handler;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.handler;
-public class ArtifactHandlerMock
- implements ArtifactHandler
-{
+public class ArtifactHandlerMock implements ArtifactHandler {
private String extension, directory, classifier, packaging, language;
-
private boolean includesDependencies, addedToClasspath;
- public void setExtension( String extension )
- {
+ public void setExtension(String extension) {
this.extension = extension;
}
- public String getExtension()
- {
+ public String getExtension() {
return extension;
}
- public void setDirectory( String directory )
- {
+ public void setDirectory(String directory) {
this.directory = directory;
}
- public String getDirectory()
- {
+ public String getDirectory() {
return directory;
}
- public void setClassifier( String classifier )
- {
+ public void setClassifier(String classifier) {
this.classifier = classifier;
}
- public String getClassifier()
- {
+ public String getClassifier() {
return classifier;
}
- public void setPackaging( String packaging )
- {
+ public void setPackaging(String packaging) {
this.packaging = packaging;
}
- public String getPackaging()
- {
+ public String getPackaging() {
return packaging;
}
- public void setIncludesDependencies( boolean includesDependencies )
- {
+ public void setIncludesDependencies(boolean includesDependencies) {
this.includesDependencies = includesDependencies;
}
- public boolean isIncludesDependencies()
- {
+ public boolean isIncludesDependencies() {
return includesDependencies;
}
- public void setLanguage( String language )
- {
+ public void setLanguage(String language) {
this.language = language;
}
- public String getLanguage()
- {
+ public String getLanguage() {
return language;
}
- public void setAddedToClasspath( boolean addedToClasspath )
- {
+ public void setAddedToClasspath(boolean addedToClasspath) {
this.addedToClasspath = addedToClasspath;
}
- public boolean isAddedToClasspath()
- {
+ public boolean isAddedToClasspath() {
return addedToClasspath;
}
-
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
index 33b744b96..5dba840be 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -30,64 +29,46 @@ import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.regex.Pattern;
-
import org.junit.Test;
-public class ComparableVersionIT
-{
+public class ComparableVersionIT {
@Test
- public void test()
- throws Exception
- {
- Files.walkFileTree( Paths.get( "target" ), new SimpleFileVisitor<Path>()
- {
- Pattern mavenArtifactJar = Pattern.compile( "maven-artifact-[\\d.]+(-SNAPSHOT)?\\.jar" );
+ public void test() throws Exception {
+ Files.walkFileTree(Paths.get("target"), new SimpleFileVisitor<Path>() {
+ Pattern mavenArtifactJar = Pattern.compile("maven-artifact-[\\d.]+(-SNAPSHOT)?\\.jar");
@Override
- public FileVisitResult visitFile( Path file, BasicFileAttributes attrs )
- throws IOException
- {
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
String filename = file.getFileName().toString();
- if ( mavenArtifactJar.matcher( filename ).matches() )
- {
- Process p = Runtime.getRuntime().exec( new String[] {
- Paths.get( System.getProperty( "java.home" ), "bin/java" ).toString(),
+ if (mavenArtifactJar.matcher(filename).matches()) {
+ Process p = Runtime.getRuntime().exec(new String[] {
+ Paths.get(System.getProperty("java.home"), "bin/java").toString(),
"-jar",
- file.toAbsolutePath().toString(),
- "5.32",
- "5.27" } );
+ file.toAbsolutePath().toString(),
+ "5.32",
+ "5.27"
+ });
- try
- {
- assertEquals( "Unexpected exit code", 0, p.waitFor() );
- }
- catch ( InterruptedException e )
- {
- fail( e.getMessage() );
+ try {
+ assertEquals("Unexpected exit code", 0, p.waitFor());
+ } catch (InterruptedException e) {
+ fail(e.getMessage());
}
return FileVisitResult.TERMINATE;
- }
- else
- {
+ } else {
return FileVisitResult.CONTINUE;
}
}
@Override
- public FileVisitResult preVisitDirectory( Path dir, BasicFileAttributes attrs )
- throws IOException
- {
- if ( Paths.get( "target" ).equals( dir ) )
- {
+ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+ if (Paths.get("target").equals(dir)) {
return FileVisitResult.CONTINUE;
- }
- else
- {
+ } else {
return FileVisitResult.SKIP_SUBTREE;
}
}
- } );
+ });
}
-
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index 97fb46d55..93e70aa2b 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,9 +16,9 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
import java.util.Locale;
-
import junit.framework.TestCase;
/**
@@ -28,171 +26,179 @@ import junit.framework.TestCase;
*
* @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
*/
-@SuppressWarnings( "unchecked" )
-public class ComparableVersionTest
- extends TestCase
-{
- private Comparable newComparable( String version )
- {
- ComparableVersion ret = new ComparableVersion( version );
+@SuppressWarnings("unchecked")
+public class ComparableVersionTest extends TestCase {
+ private Comparable newComparable(String version) {
+ ComparableVersion ret = new ComparableVersion(version);
String canonical = ret.getCanonical();
- String parsedCanonical = new ComparableVersion( canonical ).getCanonical();
+ String parsedCanonical = new ComparableVersion(canonical).getCanonical();
- System.out.println( "canonical( " + version + " ) = " + canonical );
- assertEquals( "canonical( " + version + " ) = " + canonical + " -> canonical: " + parsedCanonical, canonical,
- parsedCanonical );
+ System.out.println("canonical( " + version + " ) = " + canonical);
+ assertEquals(
+ "canonical( " + version + " ) = " + canonical + " -> canonical: " + parsedCanonical,
+ canonical,
+ parsedCanonical);
return ret;
}
- private static final String[] VERSIONS_QUALIFIER =
- { "1-alpha2snapshot", "1-alpha2", "1-alpha-123", "1-beta-2", "1-beta123", "1-m2", "1-m11", "1-rc", "1-cr2",
- "1-rc123", "1-SNAPSHOT", "1", "1-sp", "1-sp2", "1-sp123", "1-abc", "1-def", "1-pom-1", "1-1-snapshot",
- "1-1", "1-2", "1-123" };
-
- private static final String[] VERSIONS_NUMBER =
- { "2.0", "2-1", "2.0.a", "2.0.0.a", "2.0.2", "2.0.123", "2.1.0", "2.1-a", "2.1b", "2.1-c", "2.1-1", "2.1.0.1",
- "2.2", "2.123", "11.a2", "11.a11", "11.b2", "11.b11", "11.m2", "11.m11", "11", "11.a", "11b", "11c", "11m" };
-
- private void checkVersionsOrder( String[] versions )
- {
+ private static final String[] VERSIONS_QUALIFIER = {
+ "1-alpha2snapshot",
+ "1-alpha2",
+ "1-alpha-123",
+ "1-beta-2",
+ "1-beta123",
+ "1-m2",
+ "1-m11",
+ "1-rc",
+ "1-cr2",
+ "1-rc123",
+ "1-SNAPSHOT",
+ "1",
+ "1-sp",
+ "1-sp2",
+ "1-sp123",
+ "1-abc",
+ "1-def",
+ "1-pom-1",
+ "1-1-snapshot",
+ "1-1",
+ "1-2",
+ "1-123"
+ };
+
+ private static final String[] VERSIONS_NUMBER = {
+ "2.0", "2-1", "2.0.a", "2.0.0.a", "2.0.2", "2.0.123", "2.1.0", "2.1-a", "2.1b", "2.1-c", "2.1-1", "2.1.0.1",
+ "2.2", "2.123", "11.a2", "11.a11", "11.b2", "11.b11", "11.m2", "11.m11", "11", "11.a", "11b", "11c", "11m"
+ };
+
+ private void checkVersionsOrder(String[] versions) {
Comparable[] c = new Comparable[versions.length];
- for ( int i = 0; i < versions.length; i++ )
- {
- c[i] = newComparable( versions[i] );
+ for (int i = 0; i < versions.length; i++) {
+ c[i] = newComparable(versions[i]);
}
- for ( int i = 1; i < versions.length; i++ )
- {
+ for (int i = 1; i < versions.length; i++) {
Comparable low = c[i - 1];
- for ( int j = i; j < versions.length; j++ )
- {
+ for (int j = i; j < versions.length; j++) {
Comparable high = c[j];
- assertTrue( "expected " + low + " < " + high, low.compareTo( high ) < 0 );
- assertTrue( "expected " + high + " > " + low, high.compareTo( low ) > 0 );
+ assertTrue("expected " + low + " < " + high, low.compareTo(high) < 0);
+ assertTrue("expected " + high + " > " + low, high.compareTo(low) > 0);
}
}
}
- private void checkVersionsEqual( String v1, String v2 )
- {
- Comparable c1 = newComparable( v1 );
- Comparable c2 = newComparable( v2 );
- assertTrue( "expected " + v1 + " == " + v2, c1.compareTo( c2 ) == 0 );
- assertTrue( "expected " + v2 + " == " + v1, c2.compareTo( c1 ) == 0 );
- assertTrue( "expected same hashcode for " + v1 + " and " + v2, c1.hashCode() == c2.hashCode() );
- assertTrue( "expected " + v1 + ".equals( " + v2 + " )", c1.equals( c2 ) );
- assertTrue( "expected " + v2 + ".equals( " + v1 + " )", c2.equals( c1 ) );
+ private void checkVersionsEqual(String v1, String v2) {
+ Comparable c1 = newComparable(v1);
+ Comparable c2 = newComparable(v2);
+ assertTrue("expected " + v1 + " == " + v2, c1.compareTo(c2) == 0);
+ assertTrue("expected " + v2 + " == " + v1, c2.compareTo(c1) == 0);
+ assertTrue("expected same hashcode for " + v1 + " and " + v2, c1.hashCode() == c2.hashCode());
+ assertTrue("expected " + v1 + ".equals( " + v2 + " )", c1.equals(c2));
+ assertTrue("expected " + v2 + ".equals( " + v1 + " )", c2.equals(c1));
}
- private void checkVersionsArrayEqual( String[] array )
- {
+ private void checkVersionsArrayEqual(String[] array) {
// compare against each other (including itself)
- for ( int i = 0; i < array.length; ++i )
- for ( int j = i; j < array.length; ++j )
- checkVersionsEqual( array[i], array[j] );
+ for (int i = 0; i < array.length; ++i)
+ for (int j = i; j < array.length; ++j) checkVersionsEqual(array[i], array[j]);
}
- private void checkVersionsOrder( String v1, String v2 )
- {
- Comparable c1 = newComparable( v1 );
- Comparable c2 = newComparable( v2 );
- assertTrue( "expected " + v1 + " < " + v2, c1.compareTo( c2 ) < 0 );
- assertTrue( "expected " + v2 + " > " + v1, c2.compareTo( c1 ) > 0 );
+ private void checkVersionsOrder(String v1, String v2) {
+ Comparable c1 = newComparable(v1);
+ Comparable c2 = newComparable(v2);
+ assertTrue("expected " + v1 + " < " + v2, c1.compareTo(c2) < 0);
+ assertTrue("expected " + v2 + " > " + v1, c2.compareTo(c1) > 0);
}
- public void testVersionsQualifier()
- {
- checkVersionsOrder( VERSIONS_QUALIFIER );
+ public void testVersionsQualifier() {
+ checkVersionsOrder(VERSIONS_QUALIFIER);
}
- public void testVersionsNumber()
- {
- checkVersionsOrder( VERSIONS_NUMBER );
+ public void testVersionsNumber() {
+ checkVersionsOrder(VERSIONS_NUMBER);
}
- public void testVersionsEqual()
- {
- newComparable( "1.0-alpha" );
- checkVersionsEqual( "1", "1" );
- checkVersionsEqual( "1", "1.0" );
- checkVersionsEqual( "1", "1.0.0" );
- checkVersionsEqual( "1.0", "1.0.0" );
- checkVersionsEqual( "1", "1-0" );
- checkVersionsEqual( "1", "1.0-0" );
- checkVersionsEqual( "1.0", "1.0-0" );
+ public void testVersionsEqual() {
+ newComparable("1.0-alpha");
+ checkVersionsEqual("1", "1");
+ checkVersionsEqual("1", "1.0");
+ checkVersionsEqual("1", "1.0.0");
+ checkVersionsEqual("1.0", "1.0.0");
+ checkVersionsEqual("1", "1-0");
+ checkVersionsEqual("1", "1.0-0");
+ checkVersionsEqual("1.0", "1.0-0");
// no separator between number and character
- checkVersionsEqual( "1a", "1-a" );
- checkVersionsEqual( "1a", "1.0-a" );
- checkVersionsEqual( "1a", "1.0.0-a" );
- checkVersionsEqual( "1.0a", "1-a" );
- checkVersionsEqual( "1.0.0a", "1-a" );
- checkVersionsEqual( "1x", "1-x" );
- checkVersionsEqual( "1x", "1.0-x" );
- checkVersionsEqual( "1x", "1.0.0-x" );
- checkVersionsEqual( "1.0x", "1-x" );
- checkVersionsEqual( "1.0.0x", "1-x" );
+ checkVersionsEqual("1a", "1-a");
+ checkVersionsEqual("1a", "1.0-a");
+ checkVersionsEqual("1a", "1.0.0-a");
+ checkVersionsEqual("1.0a", "1-a");
+ checkVersionsEqual("1.0.0a", "1-a");
+ checkVersionsEqual("1x", "1-x");
+ checkVersionsEqual("1x", "1.0-x");
+ checkVersionsEqual("1x", "1.0.0-x");
+ checkVersionsEqual("1.0x", "1-x");
+ checkVersionsEqual("1.0.0x", "1-x");
// aliases
- checkVersionsEqual( "1ga", "1" );
- checkVersionsEqual( "1release", "1" );
- checkVersionsEqual( "1final", "1" );
- checkVersionsEqual( "1cr", "1rc" );
+ checkVersionsEqual("1ga", "1");
+ checkVersionsEqual("1release", "1");
+ checkVersionsEqual("1final", "1");
+ checkVersionsEqual("1cr", "1rc");
// special "aliases" a, b and m for alpha, beta and milestone
- checkVersionsEqual( "1a1", "1-alpha-1" );
- checkVersionsEqual( "1b2", "1-beta-2" );
- checkVersionsEqual( "1m3", "1-milestone-3" );
+ checkVersionsEqual("1a1", "1-alpha-1");
+ checkVersionsEqual("1b2", "1-beta-2");
+ checkVersionsEqual("1m3", "1-milestone-3");
// case insensitive
- checkVersionsEqual( "1X", "1x" );
- checkVersionsEqual( "1A", "1a" );
- checkVersionsEqual( "1B", "1b" );
- checkVersionsEqual( "1M", "1m" );
- checkVersionsEqual( "1Ga", "1" );
- checkVersionsEqual( "1GA", "1" );
- checkVersionsEqual( "1RELEASE", "1" );
- checkVersionsEqual( "1release", "1" );
- checkVersionsEqual( "1RELeaSE", "1" );
- checkVersionsEqual( "1Final", "1" );
- checkVersionsEqual( "1FinaL", "1" );
- checkVersionsEqual( "1FINAL", "1" );
- checkVersionsEqual( "1Cr", "1Rc" );
- checkVersionsEqual( "1cR", "1rC" );
- checkVersionsEqual( "1m3", "1Milestone3" );
- checkVersionsEqual( "1m3", "1MileStone3" );
- checkVersionsEqual( "1m3", "1MILESTONE3" );
+ checkVersionsEqual("1X", "1x");
+ checkVersionsEqual("1A", "1a");
+ checkVersionsEqual("1B", "1b");
+ checkVersionsEqual("1M", "1m");
+ checkVersionsEqual("1Ga", "1");
+ checkVersionsEqual("1GA", "1");
+ checkVersionsEqual("1RELEASE", "1");
+ checkVersionsEqual("1release", "1");
+ checkVersionsEqual("1RELeaSE", "1");
+ checkVersionsEqual("1Final", "1");
+ checkVersionsEqual("1FinaL", "1");
+ checkVersionsEqual("1FINAL", "1");
+ checkVersionsEqual("1Cr", "1Rc");
+ checkVersionsEqual("1cR", "1rC");
+ checkVersionsEqual("1m3", "1Milestone3");
+ checkVersionsEqual("1m3", "1MileStone3");
+ checkVersionsEqual("1m3", "1MILESTONE3");
}
- public void testVersionComparing()
- {
- checkVersionsOrder( "1", "2" );
- checkVersionsOrder( "1.5", "2" );
- checkVersionsOrder( "1", "2.5" );
- checkVersionsOrder( "1.0", "1.1" );
- checkVersionsOrder( "1.1", "1.2" );
- checkVersionsOrder( "1.0.0", "1.1" );
- checkVersionsOrder( "1.0.1", "1.1" );
- checkVersionsOrder( "1.1", "1.2.0" );
-
- checkVersionsOrder( "1.0-alpha-1", "1.0" );
- checkVersionsOrder( "1.0-alpha-1", "1.0-alpha-2" );
- checkVersionsOrder( "1.0-alpha-1", "1.0-beta-1" );
-
- checkVersionsOrder( "1.0-beta-1", "1.0-SNAPSHOT" );
- checkVersionsOrder( "1.0-SNAPSHOT", "1.0" );
- checkVersionsOrder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-1" );
-
- checkVersionsOrder( "1.0", "1.0-1" );
- checkVersionsOrder( "1.0-1", "1.0-2" );
- checkVersionsOrder( "1.0.0", "1.0-1" );
-
- checkVersionsOrder( "2.0-1", "2.0.1" );
- checkVersionsOrder( "2.0.1-klm", "2.0.1-lmn" );
- checkVersionsOrder( "2.0.1", "2.0.1-xyz" );
-
- checkVersionsOrder( "2.0.1", "2.0.1-123" );
- checkVersionsOrder( "2.0.1-xyz", "2.0.1-123" );
+ public void testVersionComparing() {
+ checkVersionsOrder("1", "2");
+ checkVersionsOrder("1.5", "2");
+ checkVersionsOrder("1", "2.5");
+ checkVersionsOrder("1.0", "1.1");
+ checkVersionsOrder("1.1", "1.2");
+ checkVersionsOrder("1.0.0", "1.1");
+ checkVersionsOrder("1.0.1", "1.1");
+ checkVersionsOrder("1.1", "1.2.0");
+
+ checkVersionsOrder("1.0-alpha-1", "1.0");
+ checkVersionsOrder("1.0-alpha-1", "1.0-alpha-2");
+ checkVersionsOrder("1.0-alpha-1", "1.0-beta-1");
+
+ checkVersionsOrder("1.0-beta-1", "1.0-SNAPSHOT");
+ checkVersionsOrder("1.0-SNAPSHOT", "1.0");
+ checkVersionsOrder("1.0-alpha-1-SNAPSHOT", "1.0-alpha-1");
+
+ checkVersionsOrder("1.0", "1.0-1");
+ checkVersionsOrder("1.0-1", "1.0-2");
+ checkVersionsOrder("1.0.0", "1.0-1");
+
+ checkVersionsOrder("2.0-1", "2.0.1");
+ checkVersionsOrder("2.0.1-klm", "2.0.1-lmn");
+ checkVersionsOrder("2.0.1", "2.0.1-xyz");
+
+ checkVersionsOrder("2.0.1", "2.0.1-123");
+ checkVersionsOrder("2.0.1-xyz", "2.0.1-123");
}
/**
@@ -202,41 +208,38 @@ public class ComparableVersionTest
* see Netbeans issues <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=240845">240845</a> and
* <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=226100">226100</a>
*/
- public void testMng5568()
- {
+ public void testMng5568() {
String a = "6.1.0";
String b = "6.1.0rc3";
String c = "6.1H.5-beta"; // this is the unusual version string, with 'H' in the middle
- checkVersionsOrder( b, a ); // classical
- checkVersionsOrder( b, c ); // now b < c, but before MNG-5568, we had b > c
- checkVersionsOrder( a, c );
+ checkVersionsOrder(b, a); // classical
+ checkVersionsOrder(b, c); // now b < c, but before MNG-5568, we had b > c
+ checkVersionsOrder(a, c);
}
/**
* Test <a href="https://jira.apache.org/jira/browse/MNG-6572">MNG-6572</a> optimization.
*/
- public void testMng6572()
- {
+ public void testMng6572() {
String a = "20190126.230843"; // resembles a SNAPSHOT
String b = "1234567890.12345"; // 10 digit number
String c = "123456789012345.1H.5-beta"; // 15 digit number
String d = "12345678901234567890.1H.5-beta"; // 20 digit number
- checkVersionsOrder( a, b );
- checkVersionsOrder( b, c );
- checkVersionsOrder( a, c );
- checkVersionsOrder( c, d );
- checkVersionsOrder( b, d );
- checkVersionsOrder( a, d );
+ checkVersionsOrder(a, b);
+ checkVersionsOrder(b, c);
+ checkVersionsOrder(a, c);
+ checkVersionsOrder(c, d);
+ checkVersionsOrder(b, d);
+ checkVersionsOrder(a, d);
}
/**
* Test all versions are equal when starting with many leading zeroes regardless of string length
* (related to MNG-6572 optimization)
*/
- public void testVersionEqualWithLeadingZeroes()
- {
+ public void testVersionEqualWithLeadingZeroes() {
// versions with string lengths from 1 to 19
String[] arr = new String[] {
"0000000000000000001",
@@ -260,15 +263,14 @@ public class ComparableVersionTest
"1"
};
- checkVersionsArrayEqual( arr );
+ checkVersionsArrayEqual(arr);
}
/**
* Test all "0" versions are equal when starting with many leading zeroes regardless of string length
* (related to MNG-6572 optimization)
*/
- public void testVersionZeroEqualWithLeadingZeroes()
- {
+ public void testVersionZeroEqualWithLeadingZeroes() {
// versions with string lengths from 1 to 19
String[] arr = new String[] {
"0000000000000000000",
@@ -292,49 +294,42 @@ public class ComparableVersionTest
"0"
};
- checkVersionsArrayEqual( arr );
+ checkVersionsArrayEqual(arr);
}
/**
* Test <a href="https://issues.apache.org/jira/browse/MNG-6964">MNG-6964</a> edge cases
* for qualifiers that start with "-0.", which was showing A == C and B == C but A < B.
*/
- public void testMng6964()
- {
+ public void testMng6964() {
String a = "1-0.alpha";
String b = "1-0.beta";
String c = "1";
- checkVersionsOrder( a, c ); // Now a < c, but before MNG-6964 they were equal
- checkVersionsOrder( b, c ); // Now b < c, but before MNG-6964 they were equal
- checkVersionsOrder( a, b ); // Should still be true
+ checkVersionsOrder(a, c); // Now a < c, but before MNG-6964 they were equal
+ checkVersionsOrder(b, c); // Now b < c, but before MNG-6964 they were equal
+ checkVersionsOrder(a, b); // Should still be true
}
- public void testLocaleIndependent()
- {
+ public void testLocaleIndependent() {
Locale orig = Locale.getDefault();
- Locale[] locales = { Locale.ENGLISH, new Locale( "tr" ), Locale.getDefault() };
- try
- {
- for ( Locale locale : locales )
- {
- Locale.setDefault( locale );
- checkVersionsEqual( "1-abcdefghijklmnopqrstuvwxyz", "1-ABCDEFGHIJKLMNOPQRSTUVWXYZ" );
+ Locale[] locales = {Locale.ENGLISH, new Locale("tr"), Locale.getDefault()};
+ try {
+ for (Locale locale : locales) {
+ Locale.setDefault(locale);
+ checkVersionsEqual("1-abcdefghijklmnopqrstuvwxyz", "1-ABCDEFGHIJKLMNOPQRSTUVWXYZ");
}
- }
- finally
- {
- Locale.setDefault( orig );
+ } finally {
+ Locale.setDefault(orig);
}
}
- public void testReuse()
- {
- ComparableVersion c1 = new ComparableVersion( "1" );
- c1.parseVersion( "2" );
+ public void testReuse() {
+ ComparableVersion c1 = new ComparableVersion("1");
+ c1.parseVersion("2");
- Comparable c2 = newComparable( "2" );
+ Comparable c2 = newComparable("2");
- assertEquals( "reused instance should be equivalent to new instance", c1, c2 );
+ assertEquals("reused instance should be equivalent to new instance", c1, c2);
}
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
index fc5a2742e..a1b741241 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
import junit.framework.TestCase;
@@ -26,198 +25,184 @@ import junit.framework.TestCase;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class DefaultArtifactVersionTest
- extends TestCase
-{
- private ArtifactVersion newArtifactVersion( String version )
- {
- return new DefaultArtifactVersion( version );
+public class DefaultArtifactVersionTest extends TestCase {
+ private ArtifactVersion newArtifactVersion(String version) {
+ return new DefaultArtifactVersion(version);
}
- private void checkVersionParsing( String version, int major, int minor, int incremental, int buildnumber,
- String qualifier )
- {
- ArtifactVersion artifactVersion = newArtifactVersion( version );
- String parsed =
- "'" + version + "' parsed as ('" + artifactVersion.getMajorVersion() + "', '"
+ private void checkVersionParsing(
+ String version, int major, int minor, int incremental, int buildnumber, String qualifier) {
+ ArtifactVersion artifactVersion = newArtifactVersion(version);
+ String parsed = "'" + version + "' parsed as ('" + artifactVersion.getMajorVersion() + "', '"
+ artifactVersion.getMinorVersion() + "', '" + artifactVersion.getIncrementalVersion() + "', '"
+ artifactVersion.getBuildNumber() + "', '" + artifactVersion.getQualifier() + "'), ";
- assertEquals( parsed + "check major version", major, artifactVersion.getMajorVersion() );
- assertEquals( parsed + "check minor version", minor, artifactVersion.getMinorVersion() );
- assertEquals( parsed + "check incremental version", incremental, artifactVersion.getIncrementalVersion() );
- assertEquals( parsed + "check build number", buildnumber, artifactVersion.getBuildNumber() );
- assertEquals( parsed + "check qualifier", qualifier, artifactVersion.getQualifier() );
- assertEquals( "check " + version + " string value", version, artifactVersion.toString() );
+ assertEquals(parsed + "check major version", major, artifactVersion.getMajorVersion());
+ assertEquals(parsed + "check minor version", minor, artifactVersion.getMinorVersion());
+ assertEquals(parsed + "check incremental version", incremental, artifactVersion.getIncrementalVersion());
+ assertEquals(parsed + "check build number", buildnumber, artifactVersion.getBuildNumber());
+ assertEquals(parsed + "check qualifier", qualifier, artifactVersion.getQualifier());
+ assertEquals("check " + version + " string value", version, artifactVersion.toString());
}
- public void testVersionParsing()
- {
- checkVersionParsing( "1", 1, 0, 0, 0, null );
- checkVersionParsing( "1.2", 1, 2, 0, 0, null );
- checkVersionParsing( "1.2.3", 1, 2, 3, 0, null );
- checkVersionParsing( "1.2.3-1", 1, 2, 3, 1, null );
- checkVersionParsing( "1.2.3-alpha-1", 1, 2, 3, 0, "alpha-1" );
- checkVersionParsing( "1.2-alpha-1", 1, 2, 0, 0, "alpha-1" );
- checkVersionParsing( "1.2-alpha-1-20050205.060708-1", 1, 2, 0, 0, "alpha-1-20050205.060708-1" );
- checkVersionParsing( "RELEASE", 0, 0, 0, 0, "RELEASE" );
- checkVersionParsing( "2.0-1", 2, 0, 0, 1, null );
+ public void testVersionParsing() {
+ checkVersionParsing("1", 1, 0, 0, 0, null);
+ checkVersionParsing("1.2", 1, 2, 0, 0, null);
+ checkVersionParsing("1.2.3", 1, 2, 3, 0, null);
+ checkVersionParsing("1.2.3-1", 1, 2, 3, 1, null);
+ checkVersionParsing("1.2.3-alpha-1", 1, 2, 3, 0, "alpha-1");
+ checkVersionParsing("1.2-alpha-1", 1, 2, 0, 0, "alpha-1");
+ checkVersionParsing("1.2-alpha-1-20050205.060708-1", 1, 2, 0, 0, "alpha-1-20050205.060708-1");
+ checkVersionParsing("RELEASE", 0, 0, 0, 0, "RELEASE");
+ checkVersionParsing("2.0-1", 2, 0, 0, 1, null);
// 0 at the beginning of a number has a special handling
- checkVersionParsing( "02", 0, 0, 0, 0, "02" );
- checkVersionParsing( "0.09", 0, 0, 0, 0, "0.09" );
- checkVersionParsing( "0.2.09", 0, 0, 0, 0, "0.2.09" );
- checkVersionParsing( "2.0-01", 2, 0, 0, 0, "01" );
+ checkVersionParsing("02", 0, 0, 0, 0, "02");
+ checkVersionParsing("0.09", 0, 0, 0, 0, "0.09");
+ checkVersionParsing("0.2.09", 0, 0, 0, 0, "0.2.09");
+ checkVersionParsing("2.0-01", 2, 0, 0, 0, "01");
// version schemes not really supported: fully transformed as qualifier
- checkVersionParsing( "1.0.1b", 0, 0, 0, 0, "1.0.1b" );
- checkVersionParsing( "1.0M2", 0, 0, 0, 0, "1.0M2" );
- checkVersionParsing( "1.0RC2", 0, 0, 0, 0, "1.0RC2" );
- checkVersionParsing( "1.1.2.beta1", 1, 1, 2, 0, "beta1" );
- checkVersionParsing( "1.7.3.beta1", 1, 7, 3, 0, "beta1" );
- checkVersionParsing( "1.7.3.0", 0, 0, 0, 0, "1.7.3.0" );
- checkVersionParsing( "1.7.3.0-1", 0, 0, 0, 0, "1.7.3.0-1" );
- checkVersionParsing( "PATCH-1193602", 0, 0, 0, 0, "PATCH-1193602" );
- checkVersionParsing( "5.0.0alpha-2006020117", 0, 0, 0, 0, "5.0.0alpha-2006020117" );
- checkVersionParsing( "1.0.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.0.-SNAPSHOT" );
- checkVersionParsing( "1..0-SNAPSHOT", 0, 0, 0, 0, "1..0-SNAPSHOT" );
- checkVersionParsing( "1.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.-SNAPSHOT" );
- checkVersionParsing( ".1.0-SNAPSHOT", 0, 0, 0, 0, ".1.0-SNAPSHOT" );
-
- checkVersionParsing( "1.2.3.200705301630", 0, 0, 0, 0, "1.2.3.200705301630" );
- checkVersionParsing( "1.2.3-200705301630", 1, 2, 3, 0, "200705301630" );
+ checkVersionParsing("1.0.1b", 0, 0, 0, 0, "1.0.1b");
+ checkVersionParsing("1.0M2", 0, 0, 0, 0, "1.0M2");
+ checkVersionParsing("1.0RC2", 0, 0, 0, 0, "1.0RC2");
+ checkVersionParsing("1.1.2.beta1", 1, 1, 2, 0, "beta1");
+ checkVersionParsing("1.7.3.beta1", 1, 7, 3, 0, "beta1");
+ checkVersionParsing("1.7.3.0", 0, 0, 0, 0, "1.7.3.0");
+ checkVersionParsing("1.7.3.0-1", 0, 0, 0, 0, "1.7.3.0-1");
+ checkVersionParsing("PATCH-1193602", 0, 0, 0, 0, "PATCH-1193602");
+ checkVersionParsing("5.0.0alpha-2006020117", 0, 0, 0, 0, "5.0.0alpha-2006020117");
+ checkVersionParsing("1.0.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.0.-SNAPSHOT");
+ checkVersionParsing("1..0-SNAPSHOT", 0, 0, 0, 0, "1..0-SNAPSHOT");
+ checkVersionParsing("1.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.-SNAPSHOT");
+ checkVersionParsing(".1.0-SNAPSHOT", 0, 0, 0, 0, ".1.0-SNAPSHOT");
+
+ checkVersionParsing("1.2.3.200705301630", 0, 0, 0, 0, "1.2.3.200705301630");
+ checkVersionParsing("1.2.3-200705301630", 1, 2, 3, 0, "200705301630");
}
- public void testVersionComparing()
- {
- assertVersionEqual( "1", "1" );
- assertVersionOlder( "1", "2" );
- assertVersionOlder( "1.5", "2" );
- assertVersionOlder( "1", "2.5" );
- assertVersionEqual( "1", "1.0" );
- assertVersionEqual( "1", "1.0.0" );
- assertVersionOlder( "1.0", "1.1" );
- assertVersionOlder( "1.1", "1.2" );
- assertVersionOlder( "1.0.0", "1.1" );
- assertVersionOlder( "1.1", "1.2.0" );
-
- assertVersionOlder( "1.1.2.alpha1", "1.1.2" );
- assertVersionOlder( "1.1.2.alpha1", "1.1.2.beta1" );
- assertVersionOlder( "1.1.2.beta1", "1.2" );
-
- assertVersionOlder( "1.0-alpha-1", "1.0" );
- assertVersionOlder( "1.0-alpha-1", "1.0-alpha-2" );
- assertVersionOlder( "1.0-alpha-2", "1.0-alpha-15" );
- assertVersionOlder( "1.0-alpha-1", "1.0-beta-1" );
-
- assertVersionOlder( "1.0-beta-1", "1.0-SNAPSHOT" );
- assertVersionOlder( "1.0-SNAPSHOT", "1.0" );
- assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-1" );
-
- assertVersionOlder( "1.0", "1.0-1" );
- assertVersionOlder( "1.0-1", "1.0-2" );
- assertVersionEqual( "2.0-0", "2.0" );
- assertVersionOlder( "2.0", "2.0-1" );
- assertVersionOlder( "2.0.0", "2.0-1" );
- assertVersionOlder( "2.0-1", "2.0.1" );
-
- assertVersionOlder( "2.0.1-klm", "2.0.1-lmn" );
- assertVersionOlder( "2.0.1", "2.0.1-xyz" );
- assertVersionOlder( "2.0.1-xyz-1", "2.0.1-1-xyz" );
-
- assertVersionOlder( "2.0.1", "2.0.1-123" );
- assertVersionOlder( "2.0.1-xyz", "2.0.1-123" );
-
- assertVersionOlder( "1.2.3-10000000000", "1.2.3-10000000001" );
- assertVersionOlder( "1.2.3-1", "1.2.3-10000000001" );
- assertVersionOlder( "2.3.0-v200706262000", "2.3.0-v200706262130" ); // org.eclipse:emf:2.3.0-v200706262000
+ public void testVersionComparing() {
+ assertVersionEqual("1", "1");
+ assertVersionOlder("1", "2");
+ assertVersionOlder("1.5", "2");
+ assertVersionOlder("1", "2.5");
+ assertVersionEqual("1", "1.0");
+ assertVersionEqual("1", "1.0.0");
+ assertVersionOlder("1.0", "1.1");
+ assertVersionOlder("1.1", "1.2");
+ assertVersionOlder("1.0.0", "1.1");
+ assertVersionOlder("1.1", "1.2.0");
+
+ assertVersionOlder("1.1.2.alpha1", "1.1.2");
+ assertVersionOlder("1.1.2.alpha1", "1.1.2.beta1");
+ assertVersionOlder("1.1.2.beta1", "1.2");
+
+ assertVersionOlder("1.0-alpha-1", "1.0");
+ assertVersionOlder("1.0-alpha-1", "1.0-alpha-2");
+ assertVersionOlder("1.0-alpha-2", "1.0-alpha-15");
+ assertVersionOlder("1.0-alpha-1", "1.0-beta-1");
+
+ assertVersionOlder("1.0-beta-1", "1.0-SNAPSHOT");
+ assertVersionOlder("1.0-SNAPSHOT", "1.0");
+ assertVersionOlder("1.0-alpha-1-SNAPSHOT", "1.0-alpha-1");
+
+ assertVersionOlder("1.0", "1.0-1");
+ assertVersionOlder("1.0-1", "1.0-2");
+ assertVersionEqual("2.0-0", "2.0");
+ assertVersionOlder("2.0", "2.0-1");
+ assertVersionOlder("2.0.0", "2.0-1");
+ assertVersionOlder("2.0-1", "2.0.1");
+
+ assertVersionOlder("2.0.1-klm", "2.0.1-lmn");
+ assertVersionOlder("2.0.1", "2.0.1-xyz");
+ assertVersionOlder("2.0.1-xyz-1", "2.0.1-1-xyz");
+
+ assertVersionOlder("2.0.1", "2.0.1-123");
+ assertVersionOlder("2.0.1-xyz", "2.0.1-123");
+
+ assertVersionOlder("1.2.3-10000000000", "1.2.3-10000000001");
+ assertVersionOlder("1.2.3-1", "1.2.3-10000000001");
+ assertVersionOlder("2.3.0-v200706262000", "2.3.0-v200706262130"); // org.eclipse:emf:2.3.0-v200706262000
// org.eclipse.wst.common_core.feature_2.0.0.v200706041905-7C78EK9E_EkMNfNOd2d8qq
- assertVersionOlder( "2.0.0.v200706041905-7C78EK9E_EkMNfNOd2d8qq", "2.0.0.v200706041906-7C78EK9E_EkMNfNOd2d8qq" );
+ assertVersionOlder("2.0.0.v200706041905-7C78EK9E_EkMNfNOd2d8qq", "2.0.0.v200706041906-7C78EK9E_EkMNfNOd2d8qq");
}
- public void testVersionSnapshotComparing()
- {
- assertVersionEqual( "1-SNAPSHOT", "1-SNAPSHOT" );
- assertVersionOlder( "1-SNAPSHOT", "2-SNAPSHOT" );
- assertVersionOlder( "1.5-SNAPSHOT", "2-SNAPSHOT" );
- assertVersionOlder( "1-SNAPSHOT", "2.5-SNAPSHOT" );
- assertVersionEqual( "1-SNAPSHOT", "1.0-SNAPSHOT" );
- assertVersionEqual( "1-SNAPSHOT", "1.0.0-SNAPSHOT" );
- assertVersionOlder( "1.0-SNAPSHOT", "1.1-SNAPSHOT" );
- assertVersionOlder( "1.1-SNAPSHOT", "1.2-SNAPSHOT" );
- assertVersionOlder( "1.0.0-SNAPSHOT", "1.1-SNAPSHOT" );
- assertVersionOlder( "1.1-SNAPSHOT", "1.2.0-SNAPSHOT" );
+ public void testVersionSnapshotComparing() {
+ assertVersionEqual("1-SNAPSHOT", "1-SNAPSHOT");
+ assertVersionOlder("1-SNAPSHOT", "2-SNAPSHOT");
+ assertVersionOlder("1.5-SNAPSHOT", "2-SNAPSHOT");
+ assertVersionOlder("1-SNAPSHOT", "2.5-SNAPSHOT");
+ assertVersionEqual("1-SNAPSHOT", "1.0-SNAPSHOT");
+ assertVersionEqual("1-SNAPSHOT", "1.0.0-SNAPSHOT");
+ assertVersionOlder("1.0-SNAPSHOT", "1.1-SNAPSHOT");
+ assertVersionOlder("1.1-SNAPSHOT", "1.2-SNAPSHOT");
+ assertVersionOlder("1.0.0-SNAPSHOT", "1.1-SNAPSHOT");
+ assertVersionOlder("1.1-SNAPSHOT", "1.2.0-SNAPSHOT");
// assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-SNAPSHOT" );
- assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-2-SNAPSHOT" );
- assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-beta-1-SNAPSHOT" );
+ assertVersionOlder("1.0-alpha-1-SNAPSHOT", "1.0-alpha-2-SNAPSHOT");
+ assertVersionOlder("1.0-alpha-1-SNAPSHOT", "1.0-beta-1-SNAPSHOT");
- assertVersionOlder( "1.0-beta-1-SNAPSHOT", "1.0-SNAPSHOT-SNAPSHOT" );
- assertVersionOlder( "1.0-SNAPSHOT-SNAPSHOT", "1.0-SNAPSHOT" );
- assertVersionOlder( "1.0-alpha-1-SNAPSHOT-SNAPSHOT", "1.0-alpha-1-SNAPSHOT" );
+ assertVersionOlder("1.0-beta-1-SNAPSHOT", "1.0-SNAPSHOT-SNAPSHOT");
+ assertVersionOlder("1.0-SNAPSHOT-SNAPSHOT", "1.0-SNAPSHOT");
+ assertVersionOlder("1.0-alpha-1-SNAPSHOT-SNAPSHOT", "1.0-alpha-1-SNAPSHOT");
- assertVersionOlder( "1.0-SNAPSHOT", "1.0-1-SNAPSHOT" );
- assertVersionOlder( "1.0-1-SNAPSHOT", "1.0-2-SNAPSHOT" );
+ assertVersionOlder("1.0-SNAPSHOT", "1.0-1-SNAPSHOT");
+ assertVersionOlder("1.0-1-SNAPSHOT", "1.0-2-SNAPSHOT");
// assertVersionEqual( "2.0-0-SNAPSHOT", "2.0-SNAPSHOT" );
- assertVersionOlder( "2.0-SNAPSHOT", "2.0-1-SNAPSHOT" );
- assertVersionOlder( "2.0.0-SNAPSHOT", "2.0-1-SNAPSHOT" );
- assertVersionOlder( "2.0-1-SNAPSHOT", "2.0.1-SNAPSHOT" );
+ assertVersionOlder("2.0-SNAPSHOT", "2.0-1-SNAPSHOT");
+ assertVersionOlder("2.0.0-SNAPSHOT", "2.0-1-SNAPSHOT");
+ assertVersionOlder("2.0-1-SNAPSHOT", "2.0.1-SNAPSHOT");
- assertVersionOlder( "2.0.1-klm-SNAPSHOT", "2.0.1-lmn-SNAPSHOT" );
+ assertVersionOlder("2.0.1-klm-SNAPSHOT", "2.0.1-lmn-SNAPSHOT");
// assertVersionOlder( "2.0.1-xyz-SNAPSHOT", "2.0.1-SNAPSHOT" );
- assertVersionOlder( "2.0.1-SNAPSHOT", "2.0.1-123-SNAPSHOT" );
- assertVersionOlder( "2.0.1-xyz-SNAPSHOT", "2.0.1-123-SNAPSHOT" );
+ assertVersionOlder("2.0.1-SNAPSHOT", "2.0.1-123-SNAPSHOT");
+ assertVersionOlder("2.0.1-xyz-SNAPSHOT", "2.0.1-123-SNAPSHOT");
}
- public void testSnapshotVsReleases()
- {
- assertVersionOlder( "1.0-RC1", "1.0-SNAPSHOT" );
- assertVersionOlder( "1.0-rc1", "1.0-SNAPSHOT" );
- assertVersionOlder( "1.0-rc-1", "1.0-SNAPSHOT" );
+ public void testSnapshotVsReleases() {
+ assertVersionOlder("1.0-RC1", "1.0-SNAPSHOT");
+ assertVersionOlder("1.0-rc1", "1.0-SNAPSHOT");
+ assertVersionOlder("1.0-rc-1", "1.0-SNAPSHOT");
}
- public void testHashCode()
- {
- ArtifactVersion v1 = newArtifactVersion( "1" );
- ArtifactVersion v2 = newArtifactVersion( "1.0" );
- assertEquals( true, v1.equals( v2 ) );
- assertEquals( v1.hashCode(), v2.hashCode() );
+ public void testHashCode() {
+ ArtifactVersion v1 = newArtifactVersion("1");
+ ArtifactVersion v2 = newArtifactVersion("1.0");
+ assertEquals(true, v1.equals(v2));
+ assertEquals(v1.hashCode(), v2.hashCode());
}
- public void testEqualsNullSafe()
- {
- assertFalse( newArtifactVersion( "1" ).equals( null ) );
+ public void testEqualsNullSafe() {
+ assertFalse(newArtifactVersion("1").equals(null));
}
- public void testEqualsTypeSafe()
- {
- assertFalse( newArtifactVersion( "1" ).equals( "non-an-artifact-version-instance" ) );
+ public void testEqualsTypeSafe() {
+ assertFalse(newArtifactVersion("1").equals("non-an-artifact-version-instance"));
}
- public void testNonNumericVersionRepresentationReturnsANumberFormatException()
- {
- try
- {
- new DefaultArtifactVersion( "..." );
- }
- catch ( Exception e )
- {
- assertTrue( "We expect a NumberFormatException to be thrown.", e instanceof NumberFormatException );
+ public void testNonNumericVersionRepresentationReturnsANumberFormatException() {
+ try {
+ new DefaultArtifactVersion("...");
+ } catch (Exception e) {
+ assertTrue("We expect a NumberFormatException to be thrown.", e instanceof NumberFormatException);
}
}
- private void assertVersionOlder( String left, String right )
- {
- assertTrue( left + " should be older than " + right,
- newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) < 0 );
- assertTrue( right + " should be newer than " + left,
- newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) > 0 );
+ private void assertVersionOlder(String left, String right) {
+ assertTrue(
+ left + " should be older than " + right,
+ newArtifactVersion(left).compareTo(newArtifactVersion(right)) < 0);
+ assertTrue(
+ right + " should be newer than " + left,
+ newArtifactVersion(right).compareTo(newArtifactVersion(left)) > 0);
}
- private void assertVersionEqual( String left, String right )
- {
- assertTrue( left + " should be equal to " + right,
- newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) == 0 );
- assertTrue( right + " should be equal to " + left,
- newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) == 0 );
+ private void assertVersionEqual(String left, String right) {
+ assertTrue(
+ left + " should be equal to " + right,
+ newArtifactVersion(left).compareTo(newArtifactVersion(right)) == 0);
+ assertTrue(
+ right + " should be equal to " + left,
+ newArtifactVersion(right).compareTo(newArtifactVersion(left)) == 0);
}
}
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index 9c98f2976..745c8302a 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.versioning;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.versioning;
* "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
+ * 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
@@ -18,11 +16,10 @@ package org.apache.maven.artifact.versioning;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.versioning;
import java.util.List;
-
import junit.framework.TestCase;
-
import org.apache.maven.artifact.Artifact;
/**
@@ -30,9 +27,7 @@ import org.apache.maven.artifact.Artifact;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class VersionRangeTest
- extends TestCase
-{
+public class VersionRangeTest extends TestCase {
private static final String CHECK_NUM_RESTRICTIONS = "check number of restrictions";
private static final String CHECK_UPPER_BOUND = "check upper bound";
@@ -49,708 +44,721 @@ public class VersionRangeTest
private static final String CHECK_SELECTED_VERSION = "check selected version";
- public void testRange()
- throws InvalidVersionSpecificationException, OverConstrainedVersionException
- {
+ public void testRange() throws InvalidVersionSpecificationException, OverConstrainedVersionException {
Artifact artifact = null;
- VersionRange range = VersionRange.createFromVersionSpec( "(,1.0]" );
+ VersionRange range = VersionRange.createFromVersionSpec("(,1.0]");
List<Restriction> restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- Restriction restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
-
- range = VersionRange.createFromVersionSpec( "1.0" );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0", range.getRecommendedVersion().toString() );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ Restriction restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertNull(CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion());
+ assertFalse(CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown(artifact));
+ assertNull(CHECK_SELECTED_VERSION, range.getSelectedVersion(artifact));
+
+ range = VersionRange.createFromVersionSpec("1.0");
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.0",
+ range.getRecommendedVersion().toString());
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertTrue( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertEquals( CHECK_SELECTED_VERSION, "1.0", range.getSelectedVersion( artifact ).toString() );
-
- range = VersionRange.createFromVersionSpec( "[1.0]" );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertTrue(CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown(artifact));
+ assertEquals(
+ CHECK_SELECTED_VERSION,
+ "1.0",
+ range.getSelectedVersion(artifact).toString());
+
+ range = VersionRange.createFromVersionSpec("[1.0]");
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
-
- range = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertNull(CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion());
+ assertFalse(CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown(artifact));
+ assertNull(CHECK_SELECTED_VERSION, range.getSelectedVersion(artifact));
+
+ range = VersionRange.createFromVersionSpec("[1.2,1.3]");
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
-
- range = VersionRange.createFromVersionSpec( "[1.0,2.0)" );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertNull(CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion());
+ assertFalse(CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown(artifact));
+ assertNull(CHECK_SELECTED_VERSION, range.getSelectedVersion(artifact));
+
+ range = VersionRange.createFromVersionSpec("[1.0,2.0)");
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "2.0", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
-
- range = VersionRange.createFromVersionSpec( "[1.5,)" );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "2.0", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertNull(CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion());
+ assertFalse(CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown(artifact));
+ assertNull(CHECK_SELECTED_VERSION, range.getSelectedVersion(artifact));
+
+ range = VersionRange.createFromVersionSpec("[1.5,)");
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
-
- range = VersionRange.createFromVersionSpec( "(,1.0],[1.2,)" );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertNull(CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion());
+ assertFalse(CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown(artifact));
+ assertNull(CHECK_SELECTED_VERSION, range.getSelectedVersion(artifact));
+
+ range = VersionRange.createFromVersionSpec("(,1.0],[1.2,)");
restrictions = range.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- assertFalse( CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown( artifact ) );
- assertNull( CHECK_SELECTED_VERSION, range.getSelectedVersion( artifact ) );
-
- range = VersionRange.createFromVersionSpec( "[1.0,)" );
- assertFalse( range.containsVersion( new DefaultArtifactVersion( "1.0-SNAPSHOT" ) ) );
-
- range = VersionRange.createFromVersionSpec( "[1.0,1.1-SNAPSHOT]" );
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.1-SNAPSHOT" ) ) );
-
- range = VersionRange.createFromVersionSpec( "[5.0.9.0,5.0.10.0)" );
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "5.0.9.0" ) ) );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertNull(CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ assertNull(CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion());
+ assertFalse(CHECK_SELECTED_VERSION_KNOWN, range.isSelectedVersionKnown(artifact));
+ assertNull(CHECK_SELECTED_VERSION, range.getSelectedVersion(artifact));
+
+ range = VersionRange.createFromVersionSpec("[1.0,)");
+ assertFalse(range.containsVersion(new DefaultArtifactVersion("1.0-SNAPSHOT")));
+
+ range = VersionRange.createFromVersionSpec("[1.0,1.1-SNAPSHOT]");
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.1-SNAPSHOT")));
+
+ range = VersionRange.createFromVersionSpec("[5.0.9.0,5.0.10.0)");
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("5.0.9.0")));
}
- public void testSameUpperAndLowerBoundRoundtrip() throws InvalidVersionSpecificationException
- {
- VersionRange range = VersionRange.createFromVersionSpec( "[1.0]" );
- VersionRange range2 = VersionRange.createFromVersionSpec( range.toString() );
- assertEquals( range, range2 );
+ public void testSameUpperAndLowerBoundRoundtrip() throws InvalidVersionSpecificationException {
+ VersionRange range = VersionRange.createFromVersionSpec("[1.0]");
+ VersionRange range2 = VersionRange.createFromVersionSpec(range.toString());
+ assertEquals(range, range2);
}
- public void testInvalidRanges()
- {
- checkInvalidRange( "(1.0)" );
- checkInvalidRange( "[1.0)" );
- checkInvalidRange( "(1.0]" );
- checkInvalidRange( "(1.0,1.0]" );
- checkInvalidRange( "[1.0,1.0)" );
- checkInvalidRange( "(1.0,1.0)" );
- checkInvalidRange( "[1.1,1.0]" );
- checkInvalidRange( "[1.0,1.2),1.3" );
+ public void testInvalidRanges() {
+ checkInvalidRange("(1.0)");
+ checkInvalidRange("[1.0)");
+ checkInvalidRange("(1.0]");
+ checkInvalidRange("(1.0,1.0]");
+ checkInvalidRange("[1.0,1.0)");
+ checkInvalidRange("(1.0,1.0)");
+ checkInvalidRange("[1.1,1.0]");
+ checkInvalidRange("[1.0,1.2),1.3");
// overlap
- checkInvalidRange( "[1.0,1.2),(1.1,1.3]" );
+ checkInvalidRange("[1.0,1.2),(1.1,1.3]");
// overlap
- checkInvalidRange( "[1.1,1.3),(1.0,1.2]" );
+ checkInvalidRange("[1.1,1.3),(1.0,1.2]");
// ordering
- checkInvalidRange( "(1.1,1.2],[1.0,1.1)" );
+ checkInvalidRange("(1.1,1.2],[1.0,1.1)");
}
- public void testIntersections()
- throws InvalidVersionSpecificationException
- {
- VersionRange range1 = VersionRange.createFromVersionSpec( "1.0" );
- VersionRange range2 = VersionRange.createFromVersionSpec( "1.1" );
- VersionRange mergedRange = range1.restrict( range2 );
- // TODO current policy is to retain the original version - is this correct, do we need strategies or is that handled elsewhere?
-// assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0", mergedRange.getRecommendedVersion().toString() );
+ public void testIntersections() throws InvalidVersionSpecificationException {
+ VersionRange range1 = VersionRange.createFromVersionSpec("1.0");
+ VersionRange range2 = VersionRange.createFromVersionSpec("1.1");
+ VersionRange mergedRange = range1.restrict(range2);
+ // TODO current policy is to retain the original version - is this correct, do we need strategies or is that
+ // handled elsewhere?
+ // assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.0",
+ mergedRange.getRecommendedVersion().toString());
List<Restriction> restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- Restriction restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- mergedRange = range2.restrict( range1 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ Restriction restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ mergedRange = range2.restrict(range1);
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.1",
+ mergedRange.getRecommendedVersion().toString());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
// TODO test reversed restrictions on all below
- range1 = VersionRange.createFromVersionSpec( "[1.0,)" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.1,)" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.1]" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(1.1,)" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.2,)" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.2]" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.1]" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.1)" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.0]" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.0], [1.1,)" );
- range2 = VersionRange.createFromVersionSpec( "1.2" );
- mergedRange = range1.restrict( range2 );
- assertEquals( CHECK_VERSION_RECOMMENDATION, "1.2", mergedRange.getRecommendedVersion().toString() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.0], [1.1,)" );
- range2 = VersionRange.createFromVersionSpec( "1.0.5" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.1), (1.1,)" );
- range2 = VersionRange.createFromVersionSpec( "1.1" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.1,1.3]" );
- range2 = VersionRange.createFromVersionSpec( "(1.1,)" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.3)" );
- range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.1,1.3]" );
- range2 = VersionRange.createFromVersionSpec( "[1.2,)" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.3]" );
- range2 = VersionRange.createFromVersionSpec( "[1.2,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(1.2,1.3]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(1.2,1.3)" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.2,1.3)" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.1]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.1)" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "[1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.4", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2),(1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2),(1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.1),(1.4,)" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
-
- range1 = VersionRange.createFromVersionSpec( "(,1.1],[1.4,)" );
- range2 = VersionRange.createFromVersionSpec( "(1.1,1.4)" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
-
- range1 = VersionRange.createFromVersionSpec( "[,1.1],[1.4,]" );
- range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.6,]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.5]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.5,]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 2 );
- assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.5", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
-
- range1 = VersionRange.createFromVersionSpec( "[1.0,1.2],[1.3,1.7]" );
- range2 = VersionRange.createFromVersionSpec( "[1.1,1.4],[1.5,1.6]" );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
- restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
- restriction = restrictions.get( 0 );
- assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 1 );
- assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = restrictions.get( 2 );
- assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
- assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
- assertEquals( CHECK_UPPER_BOUND, "1.6", restriction.getUpperBound().toString() );
- assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
+ range1 = VersionRange.createFromVersionSpec("[1.0,)");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.1",
+ mergedRange.getRecommendedVersion().toString());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.1,)");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.1",
+ mergedRange.getRecommendedVersion().toString());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.1]");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.1",
+ mergedRange.getRecommendedVersion().toString());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(1.1,)");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.2,)");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.2]");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.1",
+ mergedRange.getRecommendedVersion().toString());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.1]");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.1",
+ mergedRange.getRecommendedVersion().toString());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.1)");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.0]");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.0], [1.1,)");
+ range2 = VersionRange.createFromVersionSpec("1.2");
+ mergedRange = range1.restrict(range2);
+ assertEquals(
+ CHECK_VERSION_RECOMMENDATION,
+ "1.2",
+ mergedRange.getRecommendedVersion().toString());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.0], [1.1,)");
+ range2 = VersionRange.createFromVersionSpec("1.0.5");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.1), (1.1,)");
+ range2 = VersionRange.createFromVersionSpec("1.1");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertNull(CHECK_LOWER_BOUND, restriction.getLowerBound());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertNull(CHECK_UPPER_BOUND, restriction.getUpperBound());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.1,1.3]");
+ range2 = VersionRange.createFromVersionSpec("(1.1,)");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.3)");
+ range2 = VersionRange.createFromVersionSpec("[1.2,1.3]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.1,1.3]");
+ range2 = VersionRange.createFromVersionSpec("[1.2,)");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.3]");
+ range2 = VersionRange.createFromVersionSpec("[1.2,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(1.2,1.3]");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(1.2,1.3)");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.2,1.3)");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.1]");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.1)");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 0, restrictions.size());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2],[1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("[1.1]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2],[1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("[1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.4", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2],[1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2),(1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2],[1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("(1.1,1.4)");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2),(1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("(1.1,1.4)");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString());
+ assertFalse(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertFalse(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.1),(1.4,)");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 0, restrictions.size());
+
+ range1 = VersionRange.createFromVersionSpec("(,1.1],[1.4,)");
+ range2 = VersionRange.createFromVersionSpec("(1.1,1.4)");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 0, restrictions.size());
+
+ range1 = VersionRange.createFromVersionSpec("[,1.1],[1.4,]");
+ range2 = VersionRange.createFromVersionSpec("[1.2,1.3]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 0, restrictions.size());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2],[1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4],[1.6,]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 2, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2],[1.3,1.5]");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4],[1.5,]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 3, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(2);
+ assertEquals(CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.5", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+
+ range1 = VersionRange.createFromVersionSpec("[1.0,1.2],[1.3,1.7]");
+ range2 = VersionRange.createFromVersionSpec("[1.1,1.4],[1.5,1.6]");
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
+ restrictions = mergedRange.getRestrictions();
+ assertEquals(CHECK_NUM_RESTRICTIONS, 3, restrictions.size());
+ restriction = restrictions.get(0);
+ assertEquals(CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(1);
+ assertEquals(CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
+ restriction = restrictions.get(2);
+ assertEquals(CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString());
+ assertTrue(CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive());
+ assertEquals(CHECK_UPPER_BOUND, "1.6", restriction.getUpperBound().toString());
+ assertTrue(CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive());
// test restricting empty sets
- range1 = VersionRange.createFromVersionSpec( "[,1.1],[1.4,]" );
- range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
- range1 = range1.restrict( range2 );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ range1 = VersionRange.createFromVersionSpec("[,1.1],[1.4,]");
+ range2 = VersionRange.createFromVersionSpec("[1.2,1.3]");
+ range1 = range1.restrict(range2);
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 0, restrictions.size());
- range1 = VersionRange.createFromVersionSpec( "[,1.1],[1.4,]" );
- range2 = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
- range2 = range1.restrict( range2 );
- mergedRange = range1.restrict( range2 );
- assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
+ range1 = VersionRange.createFromVersionSpec("[,1.1],[1.4,]");
+ range2 = VersionRange.createFromVersionSpec("[1.2,1.3]");
+ range2 = range1.restrict(range2);
+ mergedRange = range1.restrict(range2);
+ assertNull(CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion());
restrictions = mergedRange.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 0, restrictions.size());
}
- public void testReleaseRangeBoundsContainsSnapshots()
- throws InvalidVersionSpecificationException
- {
- VersionRange range = VersionRange.createFromVersionSpec( "[1.0,1.2]" );
+ public void testReleaseRangeBoundsContainsSnapshots() throws InvalidVersionSpecificationException {
+ VersionRange range = VersionRange.createFromVersionSpec("[1.0,1.2]");
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.1-SNAPSHOT" ) ) );
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.2-SNAPSHOT" ) ) );
- assertFalse( range.containsVersion( new DefaultArtifactVersion( "1.0-SNAPSHOT" ) ) );
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.1-SNAPSHOT")));
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.2-SNAPSHOT")));
+ assertFalse(range.containsVersion(new DefaultArtifactVersion("1.0-SNAPSHOT")));
}
- public void testSnapshotRangeBoundsCanContainSnapshots()
- throws InvalidVersionSpecificationException
- {
- VersionRange range = VersionRange.createFromVersionSpec( "[1.0,1.2-SNAPSHOT]" );
+ public void testSnapshotRangeBoundsCanContainSnapshots() throws InvalidVersionSpecificationException {
+ VersionRange range = VersionRange.createFromVersionSpec("[1.0,1.2-SNAPSHOT]");
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.1-SNAPSHOT" ) ) );
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.2-SNAPSHOT" ) ) );
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.1-SNAPSHOT")));
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.2-SNAPSHOT")));
- range = VersionRange.createFromVersionSpec( "[1.0-SNAPSHOT,1.2]" );
+ range = VersionRange.createFromVersionSpec("[1.0-SNAPSHOT,1.2]");
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.0-SNAPSHOT" ) ) );
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.1-SNAPSHOT" ) ) );
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.0-SNAPSHOT")));
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.1-SNAPSHOT")));
}
- public void testSnapshotSoftVersionCanContainSnapshot()
- throws InvalidVersionSpecificationException
- {
- VersionRange range = VersionRange.createFromVersionSpec( "1.0-SNAPSHOT" );
+ public void testSnapshotSoftVersionCanContainSnapshot() throws InvalidVersionSpecificationException {
+ VersionRange range = VersionRange.createFromVersionSpec("1.0-SNAPSHOT");
- assertTrue( range.containsVersion( new DefaultArtifactVersion( "1.0-SNAPSHOT" ) ) );
+ assertTrue(range.containsVersion(new DefaultArtifactVersion("1.0-SNAPSHOT")));
}
- private void checkInvalidRange( String version )
- {
- try
- {
- VersionRange.createFromVersionSpec( version );
- fail( "Version " + version + " should have failed to construct" );
- }
- catch ( InvalidVersionSpecificationException expected )
- {
+ private void checkInvalidRange(String version) {
+ try {
+ VersionRange.createFromVersionSpec(version);
+ fail("Version " + version + " should have failed to construct");
+ } catch (InvalidVersionSpecificationException expected) {
// expected
}
}
- public void testContains() throws InvalidVersionSpecificationException
- {
- ArtifactVersion actualVersion = new DefaultArtifactVersion( "2.0.5" );
- assertTrue( enforceVersion( "2.0.5", actualVersion ) );
- assertTrue( enforceVersion( "2.0.4", actualVersion ) );
- assertTrue( enforceVersion( "[2.0.5]", actualVersion ) );
- assertFalse( enforceVersion( "[2.0.6,)", actualVersion ) );
- assertFalse( enforceVersion( "[2.0.6]", actualVersion ) );
- assertTrue( enforceVersion( "[2.0,2.1]", actualVersion ) );
- assertFalse( enforceVersion( "[2.0,2.0.3]", actualVersion ) );
- assertTrue( enforceVersion( "[2.0,2.0.5]", actualVersion ) );
- assertFalse( enforceVersion( "[2.0,2.0.5)", actualVersion ) );
+ public void testContains() throws InvalidVersionSpecificationException {
+ ArtifactVersion actualVersion = new DefaultArtifactVersion("2.0.5");
+ assertTrue(enforceVersion("2.0.5", actualVersion));
+ assertTrue(enforceVersion("2.0.4", actualVersion));
+ assertTrue(enforceVersion("[2.0.5]", actualVersion));
+ assertFalse(enforceVersion("[2.0.6,)", actualVersion));
+ assertFalse(enforceVersion("[2.0.6]", actualVersion));
+ assertTrue(enforceVersion("[2.0,2.1]", actualVersion));
+ assertFalse(enforceVersion("[2.0,2.0.3]", actualVersion));
+ assertTrue(enforceVersion("[2.0,2.0.5]", actualVersion));
+ assertFalse(enforceVersion("[2.0,2.0.5)", actualVersion));
}
- public boolean enforceVersion( String requiredVersionRange, ArtifactVersion actualVersion )
- throws InvalidVersionSpecificationException
- {
+ public boolean enforceVersion(String requiredVersionRange, ArtifactVersion actualVersion)
+ throws InvalidVersionSpecificationException {
VersionRange vr = null;
- vr = VersionRange.createFromVersionSpec( requiredVersionRange );
+ vr = VersionRange.createFromVersionSpec(requiredVersionRange);
- return vr.containsVersion( actualVersion );
+ return vr.containsVersion(actualVersion);
}
- public void testOrder0()
- {
- // assertTrue( new DefaultArtifactVersion( "1.0-alpha10" ).compareTo( new DefaultArtifactVersion( "1.0-alpha1" ) ) > 0 );
+ public void testOrder0() {
+ // assertTrue( new DefaultArtifactVersion( "1.0-alpha10" ).compareTo( new DefaultArtifactVersion( "1.0-alpha1" )
+ // ) > 0 );
}
- public void testCache()
- throws InvalidVersionSpecificationException
- {
- VersionRange range = VersionRange.createFromVersionSpec( "[1.0,1.2]" );
- assertSame( range, VersionRange.createFromVersionSpec( "[1.0,1.2]" ) ); // same instance from spec cache
+ public void testCache() throws InvalidVersionSpecificationException {
+ VersionRange range = VersionRange.createFromVersionSpec("[1.0,1.2]");
+ assertSame(range, VersionRange.createFromVersionSpec("[1.0,1.2]")); // same instance from spec cache
- VersionRange spec = VersionRange.createFromVersionSpec( "1.0" );
- assertSame( spec, VersionRange.createFromVersionSpec( "1.0" ) ); // same instance from spec cache
+ VersionRange spec = VersionRange.createFromVersionSpec("1.0");
+ assertSame(spec, VersionRange.createFromVersionSpec("1.0")); // same instance from spec cache
List<Restriction> restrictions = spec.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 1, restrictions.size());
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- assertSame( version, VersionRange.createFromVersion( "1.0" ) ); // same instance from version cache
+ VersionRange version = VersionRange.createFromVersion("1.0");
+ assertSame(version, VersionRange.createFromVersion("1.0")); // same instance from version cache
restrictions = version.getRestrictions();
- assertEquals( CHECK_NUM_RESTRICTIONS, 0, restrictions.size() );
+ assertEquals(CHECK_NUM_RESTRICTIONS, 0, restrictions.size());
- assertFalse( "check !VersionRange.createFromVersionSpec(x).equals(VersionRange.createFromVersion(x))", spec.equals( version ) );
+ assertFalse(
+ "check !VersionRange.createFromVersionSpec(x).equals(VersionRange.createFromVersion(x))",
+ spec.equals(version));
}
}
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index c01cc7ca1..228378738 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
index 5ac68ef1c..6b8c3815c 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java
@@ -1,5 +1,3 @@
-package org.apache.maven.building;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.building;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.building;
/**
* Describes a problem that was encountered during settings building. A problem can either be an exception that was
@@ -27,9 +26,7 @@ package org.apache.maven.building;
* @author Benjamin Bentmann
* @author Robert Scholte
*/
-class DefaultProblem
- implements Problem
-{
+class DefaultProblem implements Problem {
private final String source;
@@ -55,85 +52,68 @@ class DefaultProblem
* @param columnNumber The one-based index of the column containing the problem or {@code -1} if unknown.
* @param exception The exception that caused this problem, may be {@code null}.
*/
- DefaultProblem( String message, Severity severity, String source, int lineNumber, int columnNumber,
- Exception exception )
- {
+ DefaultProblem(
+ String message, Severity severity, String source, int lineNumber, int columnNumber, Exception exception) {
this.message = message;
- this.severity = ( severity != null ) ? severity : Severity.ERROR;
- this.source = ( source != null ) ? source : "";
+ this.severity = (severity != null) ? severity : Severity.ERROR;
+ this.source = (source != null) ? source : "";
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
this.exception = exception;
}
- public String getSource()
- {
+ public String getSource() {
return source;
}
- public int getLineNumber()
- {
+ public int getLineNumber() {
return lineNumber;
}
- public int getColumnNumber()
- {
+ public int getColumnNumber() {
return columnNumber;
}
- public String getLocation()
- {
- StringBuilder buffer = new StringBuilder( 256 );
+ public String getLocation() {
+ StringBuilder buffer = new StringBuilder(256);
- if ( getSource().length() > 0 )
- {
- if ( buffer.length() > 0 )
- {
- buffer.append( ", " );
+ if (getSource().length() > 0) {
+ if (buffer.length() > 0) {
+ buffer.append(", ");
}
- buffer.append( getSource() );
+ buffer.append(getSource());
}
- if ( getLineNumber() > 0 )
- {
- if ( buffer.length() > 0 )
- {
- buffer.append( ", " );
+ if (getLineNumber() > 0) {
+ if (buffer.length() > 0) {
+ buffer.append(", ");
}
- buffer.append( "line " ).append( getLineNumber() );
+ buffer.append("line ").append(getLineNumber());
}
- if ( getColumnNumber() > 0 )
- {
- if ( buffer.length() > 0 )
- {
- buffer.append( ", " );
+ if (getColumnNumber() > 0) {
+ if (buffer.length() > 0) {
+ buffer.append(", ");
}
- buffer.append( "column " ).append( getColumnNumber() );
+ buffer.append("column ").append(getColumnNumber());
}
return buffer.toString();
}
- public Exception getException()
- {
+ public Exception getException() {
return exception;
}
- public String getMessage()
- {
+ public String getMessage() {
String msg;
- if ( message != null && message.length() > 0 )
- {
+ if (message != null && message.length() > 0) {
msg = message;
- }
- else
- {
+ } else {
msg = exception.getMessage();
- if ( msg == null )
- {
+ if (msg == null) {
msg = "";
}
}
@@ -141,21 +121,18 @@ class DefaultProblem
return msg;
}
- public Severity getSeverity()
- {
+ public Severity getSeverity() {
return severity;
}
@Override
- public String toString()
- {
- StringBuilder buffer = new StringBuilder( 128 );
+ public String toString() {
+ StringBuilder buffer = new StringBuilder(128);
- buffer.append( '[' ).append( getSeverity() ).append( "] " );
- buffer.append( getMessage() );
- buffer.append( " @ " ).append( getLocation() );
+ buffer.append('[').append(getSeverity()).append("] ");
+ buffer.append(getMessage());
+ buffer.append(" @ ").append(getLocation());
return buffer.toString();
}
-
}
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java
index 8502942e2..7afc521cf 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java
@@ -1,5 +1,3 @@
-package org.apache.maven.building;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.building;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.building;
import java.util.ArrayList;
import java.util.List;
@@ -28,37 +27,30 @@ import java.util.List;
* @author Benjamin Bentmann
* @author Robert Scholte
*/
-class DefaultProblemCollector
- implements ProblemCollector
-{
+class DefaultProblemCollector implements ProblemCollector {
private List<Problem> problems;
private String source;
- DefaultProblemCollector( List<Problem> problems )
- {
- this.problems = ( problems != null ) ? problems : new ArrayList<Problem>();
+ DefaultProblemCollector(List<Problem> problems) {
+ this.problems = (problems != null) ? problems : new ArrayList<Problem>();
}
@Override
- public List<Problem> getProblems()
- {
+ public List<Problem> getProblems() {
return problems;
}
@Override
- public void setSource( String source )
- {
+ public void setSource(String source) {
this.source = source;
}
@Override
- public void add( Problem.Severity severity, String message, int line, int column, Exception cause )
- {
- Problem problem = new DefaultProblem( message, severity, source, line, column, cause );
+ public void add(Problem.Severity severity, String message, int line, int column, Exception cause) {
+ Problem problem = new DefaultProblem(message, severity, source, line, column, cause);
- problems.add( problem );
+ problems.add(problem);
}
-
}
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java b/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
index 66e644104..746402160 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
@@ -1,5 +1,3 @@
-package org.apache.maven.building;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.building;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.building;
import java.io.File;
import java.io.FileInputStream;
@@ -30,9 +29,7 @@ import java.util.Objects;
*
* @author Benjamin Bentmann
*/
-public class FileSource
- implements Source
-{
+public class FileSource implements Source {
private final File file;
/**
@@ -40,21 +37,17 @@ public class FileSource
*
* @param file The file, must not be {@code null}.
*/
- public FileSource( File file )
- {
- this.file = Objects.requireNonNull( file, "file cannot be null" ).getAbsoluteFile();
+ public FileSource(File file) {
+ this.file = Objects.requireNonNull(file, "file cannot be null").getAbsoluteFile();
}
@Override
- public InputStream getInputStream()
- throws IOException
- {
- return new FileInputStream( file );
+ public InputStream getInputStream() throws IOException {
+ return new FileInputStream(file);
}
@Override
- public String getLocation()
- {
+ public String getLocation() {
return file.getPath();
}
@@ -63,14 +56,12 @@ public class FileSource
*
* @return The underlying file, never {@code null}.
*/
- public File getFile()
- {
+ public File getFile() {
return file;
}
@Override
- public String toString()
- {
+ public String toString() {
return getLocation();
}
}
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java b/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java
index 9ab9b3a85..a69efacf5 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java
@@ -1,5 +1,3 @@
-package org.apache.maven.building;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
... 161095 lines suppressed ...
[maven] 01/02: [MNG-7613] Upgrade Apache Maven parent POM to version 38
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-7613
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a55f278a975eebb66ca90ce08fddd475b89bcfa5
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Dec 2 00:06:11 2022 +0100
[MNG-7613] Upgrade Apache Maven parent POM to version 38
---
pom.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 198a65efe..3c49ee834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,8 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>37</version>
- <relativePath />
+ <version>38</version>
+ <relativePath/>
</parent>
<artifactId>maven</artifactId>
@@ -539,6 +539,14 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- remove with next parent MPOM-371 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks_nocodestyle.xml</configLocation>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>