You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/07/15 21:24:29 UTC
svn commit: r794373 [1/9] - in /maven/components/branches/MNG-4221:
maven-compat/ maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/src/main/java/org/apache/maven/artifact/...
Author: jvanzyl
Date: Wed Jul 15 19:24:20 2009
New Revision: 794373
URL: http://svn.apache.org/viewvc?rev=794373&view=rev
Log:
o branch this for MNG-4221
Added:
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/LegacyArtifactHandlerAdapter.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryAdapter.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicyAdapter.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyArtifactRepositoryAdapter.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyArtifactRepositoryPolicyAdapter.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayoutAdapter.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyArtifactRepositoryLayoutAdapter.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/DefaultMavenArtifact.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/artifact/MavenArtifact.java (with props)
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/ArtifactUtils.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DependencyResolutionRequiredException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidArtifactRTException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/InvalidRepositoryException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UnknownRepositoryLayoutException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeployer.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/ArtifactDeploymentException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/deployer/DefaultArtifactDeployer.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/ArtifactHandler.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/DefaultArtifactHandler.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/ArtifactHandlerManager.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/handler/manager/DefaultArtifactHandlerManager.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstallationException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/ArtifactInstaller.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/installer/DefaultArtifactInstaller.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepository.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryPolicy.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepository.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/MavenArtifactRepository.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/ArtifactRepositoryLayout.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/DefaultRepositoryLayout.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/FlatRepositoryLayout.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/layout/LegacyRepositoryLayout.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/AbstractRepositoryMetadata.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/ArtifactRepositoryMetadata.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/DefaultRepositoryMetadataManager.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/GroupRepositoryMetadata.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadata.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataDeploymentException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataInstallationException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataManager.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataReadException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataResolutionException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/RepositoryMetadataStoreException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/metadata/SnapshotArtifactRepositoryMetadata.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/AbstractArtifactResolutionException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/CyclicDependencyException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DebugResolutionListener.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultResolutionErrorHandler.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/MultipleArtifactsNotFoundException.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionErrorHandler.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListener.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionListenerForDepMgmt.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/ResolutionNode.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ (props changed)
- copied from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ (props changed)
- copied from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactScopeEnum.java (contents, props changed)
- copied, changed from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
Removed:
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
Modified:
maven/components/branches/MNG-4221/maven-compat/compatibility.cfl
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/MirrorBuilder.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/AndArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExcludesArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ExclusionSetFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/IncludesArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/InversionArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/OrArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/ScopeArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/filter/TypeArtifactFilter.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ArtifactVersion.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ComparableVersion.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/DefaultArtifactVersion.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/InvalidVersionSpecificationException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/ManagedVersionMap.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/OverConstrainedVersionException.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/Restriction.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/legacy/versioning/VersionRange.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
maven/components/branches/MNG-4221/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
maven/components/branches/MNG-4221/maven-core/lifecycle-executor.txt
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/lifecycle/NoPluginFoundForPrefixException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
maven/components/branches/MNG-4221/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
maven/components/branches/MNG-4221/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestArtifactResolver.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java
maven/components/branches/MNG-4221/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-4221/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/branches/MNG-4221/maven-embedder/src/test/extensions/META-INF/plexus/components.xml
maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/CustomArtifactFactory.java
maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/MyArtifactHandler.java
maven/components/branches/MNG-4221/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
maven/components/branches/MNG-4221/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
Modified: maven/components/branches/MNG-4221/maven-compat/compatibility.cfl
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/compatibility.cfl?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/compatibility.cfl (original)
+++ maven/components/branches/MNG-4221/maven-compat/compatibility.cfl Wed Jul 15 19:24:20 2009
@@ -23,16 +23,16 @@
with standard ways of doing resolution and conflict reduction that we can't support them.
h3. Supported Compatibility
-* org.apache.maven.artifact.deployer.ArtifactDeployer
-* org.apache.maven.artifact.factory.ArtifactFactory
-* org.apache.maven.artifact.handler.ArtifactHandler
-* org.apache.maven.artifact.installer.ArtifactInstaller
+* org.apache.maven.repository.legacy.deployer.ArtifactDeployer
+* org.apache.maven.repository.legacy.factory.ArtifactFactory
+* org.apache.maven.repository.legacy.handler.ArtifactHandler
+* org.apache.maven.repository.legacy.installer.ArtifactInstaller
* org.apache.maven.artifact.manager.WagonManager (1)
-* org.apache.maven.artifact.repository.ArtifactRepository
-* org.apache.maven.artifact.repository.ArtifactRepositoryPolicy
-* org.apache.maven.artifact.repository.ArtifactRepositoryFactory
-* org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout
-* org.apache.maven.artifact.resolver.ArtifactResolver
+* org.apache.maven.repository.legacy.repository.ArtifactRepository
+* org.apache.maven.repository.legacy.repository.ArtifactRepositoryPolicy
+* org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory
+* org.apache.maven.repository.legacy.repository.layout.ArtifactRepositoryLayout
+* org.apache.maven.repository.legacy.resolver.ArtifactResolver
* org.apache.maven.artifact.resolver.filter.ArtifactFilter
* org.apache.maven.artifact.resolver.filter.Artifact
@@ -43,8 +43,8 @@
* org.apache.maven.artifact.metadata.ArtifactMetadataSource
* org.apache.maven.artifact.metadata.ResolutionGroup
* org.apache.maven.artifact.repository.metadata.*
-* org.apache.maven.artifact.resolver.ResolutionNode
-* org.apache.maven.artifact.resolver.ResolutionListener
+* org.apache.maven.repository.legacy.resolver.ResolutionNode
+* org.apache.maven.repository.legacy.resolver.ResolutionListener
* org.apache.maven.artifact.resolver.metadata.*
* org.apache.maven.artifact.resolver.transform.*
* org.apache.maven.artifact.resolver.versioning.*
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java Wed Jul 15 19:24:20 2009
@@ -24,13 +24,13 @@
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;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
public interface Artifact
extends Comparable
@@ -39,26 +39,24 @@
String SNAPSHOT_VERSION = "SNAPSHOT";
+ String RELEASE_VERSION = "RELEASE";
+
Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
- // TODO: into artifactScope handler
-
- String SCOPE_COMPILE = ArtifactScopeEnum.compile.toString();
+ String SCOPE_COMPILE = "compile";
- String SCOPE_TEST = ArtifactScopeEnum.test.toString();
+ String SCOPE_TEST = "test";
- String SCOPE_RUNTIME = ArtifactScopeEnum.runtime.toString();
+ String SCOPE_RUNTIME = "runtime";
- String SCOPE_RUNTIME_PLUS_SYSTEM = ArtifactScopeEnum.runtime_plus_system.toString();
+ String SCOPE_RUNTIME_PLUS_SYSTEM = "runtime_plus_system";
- String SCOPE_PROVIDED = ArtifactScopeEnum.provided.toString();
+ String SCOPE_PROVIDED = "provided";
- String SCOPE_SYSTEM = ArtifactScopeEnum.system.toString();
+ String SCOPE_SYSTEM = "system";
String SCOPE_IMPORT = "import"; // Used to import dependencyManagement dependencies
- String RELEASE_VERSION = "RELEASE";
-
String getGroupId();
String getArtifactId();
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.12
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/Artifact.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/Artifact.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java:751453-767358,767708-768832
Copied: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (from r790177, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?p2=maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java&r1=790177&r2=794373&rev=794373&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Wed Jul 15 19:24:20 2009
@@ -27,14 +27,15 @@
import java.util.Map;
import java.util.regex.Matcher;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.InvalidArtifactRTException;
+import org.apache.maven.repository.legacy.handler.ArtifactHandler;
+import org.apache.maven.repository.legacy.repository.ArtifactRepository;
+import org.apache.maven.repository.legacy.resolver.filter.ArtifactFilter;
+import org.apache.maven.repository.legacy.versioning.ArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.versioning.OverConstrainedVersionException;
+import org.apache.maven.repository.legacy.versioning.VersionRange;
import org.codehaus.plexus.util.StringUtils;
/**
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.22
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 15 19:24:20 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/DefaultArtifact.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/DefaultArtifact.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java:751453-767358,767708-768832
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java Wed Jul 15 19:24:20 2009
@@ -1,55 +1,13 @@
package org.apache.maven.artifact.deployer;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
import java.io.File;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+@Deprecated
public interface ArtifactDeployer
{
- String ROLE = ArtifactDeployer.class.getName();
-
- /**
- * Deploy an artifact from a particular directory. The artifact handler is used to determine the
- * filename of the source file.
- *
- * @param basedir the directory where the artifact is stored
- * @param finalName the name of the artifact sans extension
- * @param artifact the artifact definition
- * @param deploymentRepository the repository to deploy to
- * @param localRepository the local repository to install into
- * @throws ArtifactDeploymentException if an error occurred deploying the artifact
- * @deprecated to be removed before 2.0 after the instlal/deploy plugins use the alternate
- * method
- */
- @Deprecated
- void deploy( String basedir, String finalName, Artifact artifact, ArtifactRepository deploymentRepository, ArtifactRepository localRepository )
- throws ArtifactDeploymentException;
-
- /**
- * Deploy an artifact from a particular file.
- *
- * @param source the file to deploy
- * @param artifact the artifact definition
- * @param deploymentRepository the repository to deploy to
- * @param localRepository the local repository to install into
- * @throws ArtifactDeploymentException if an error occurred deploying the artifact
- */
void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository, ArtifactRepository localRepository )
throws ArtifactDeploymentException;
}
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java Wed Jul 15 19:24:20 2009
@@ -1,31 +1,14 @@
package org.apache.maven.artifact.deployer;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author Jason van Zyl
- * @version $Id$
- */
+@Deprecated
public class ArtifactDeploymentException
- extends Exception
+ extends org.apache.maven.repository.legacy.deployer.ArtifactDeploymentException
{
+ public ArtifactDeploymentException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
public ArtifactDeploymentException( String message )
{
super( message );
@@ -34,11 +17,5 @@
public ArtifactDeploymentException( Throwable cause )
{
super( cause );
- }
-
- public ArtifactDeploymentException( String message,
- Throwable cause )
- {
- super( message, cause );
- }
+ }
}
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java Wed Jul 15 19:24:20 2009
@@ -1,96 +1,32 @@
package org.apache.maven.artifact.deployer;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
import java.io.File;
-import java.io.IOException;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataDeploymentException;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
-import org.apache.maven.repository.legacy.WagonManager;
-import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformationManager;
-import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.artifact.repository.ArtifactRepositoryAdapter;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.FileUtils;
-@Component (role=ArtifactDeployer.class)
+@Deprecated
+@Component(role=ArtifactDeployer.class)
public class DefaultArtifactDeployer
- extends AbstractLogEnabled
implements ArtifactDeployer
{
@Requirement
- private WagonManager wagonManager;
-
- @Requirement
- private ArtifactTransformationManager transformationManager;
-
- @Requirement
- private RepositoryMetadataManager repositoryMetadataManager;
-
- /**
- * @deprecated we want to use the artifact method only, and ensure artifact.file is set
- * correctly.
- */
- @Deprecated
- public void deploy( String basedir, String finalName, Artifact artifact, ArtifactRepository deploymentRepository, ArtifactRepository localRepository )
- throws ArtifactDeploymentException
- {
- String extension = artifact.getArtifactHandler().getExtension();
- File source = new File( basedir, finalName + "." + extension );
- deploy( source, artifact, deploymentRepository, localRepository );
- }
+ private RepositorySystem repositorySystem;
public void deploy( File source, Artifact artifact, ArtifactRepository deploymentRepository, ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
try
{
- transformationManager.transformForDeployment( artifact, deploymentRepository, localRepository );
-
- // Copy the original file to the new one if it was transformed
- File artifactFile = new File( localRepository.getBasedir(), localRepository.pathOf( artifact ) );
- if ( !artifactFile.equals( source ) )
- {
- FileUtils.copyFile( source, artifactFile );
- }
-
- wagonManager.putArtifact( source, artifact, deploymentRepository, null );
-
- // must be after the artifact is installed
- for ( ArtifactMetadata metadata : artifact.getMetadataList() )
- {
- repositoryMetadataManager.deploy( metadata, localRepository, deploymentRepository );
- }
- }
- catch ( TransferFailedException e )
- {
- throw new ArtifactDeploymentException( "Error deploying artifact: " + e.getMessage(), e );
- }
- catch ( IOException e )
- {
- throw new ArtifactDeploymentException( "Error deploying artifact: " + e.getMessage(), e );
+ repositorySystem.deploy( source, artifact, new ArtifactRepositoryAdapter( deploymentRepository ), new ArtifactRepositoryAdapter( localRepository ) );
}
- catch ( RepositoryMetadataDeploymentException e )
+ catch ( org.apache.maven.repository.legacy.deployer.ArtifactDeploymentException e )
{
- throw new ArtifactDeploymentException( "Error installing artifact's metadata: " + e.getMessage(), e );
+ throw new ArtifactDeploymentException( e );
}
}
}
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java Wed Jul 15 19:24:20 2009
@@ -1,31 +1,31 @@
package org.apache.maven.artifact.factory;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Plugin;
+@Deprecated
public interface ArtifactFactory
{
@Deprecated
String ROLE = ArtifactFactory.class.getName();
+
+ Artifact createArtifact( String groupId, String artifactId, String version, String packaging );
Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type );
+ Artifact createProjectArtifact( String groupId, String artifactId, String version );
+
Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type, String classifier );
+
+ Artifact createPluginArtifact( Plugin plugin );
+
+ Artifact createDependencyArtifact( Dependency dependency );
+
+
+ /*
+
+ Will restore as necessary
Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope );
@@ -37,8 +37,6 @@
Artifact createBuildArtifact( String groupId, String artifactId, String version, String packaging );
- Artifact createProjectArtifact( String groupId, String artifactId, String version );
-
Artifact createParentArtifact( String groupId, String artifactId, String version );
Artifact createPluginArtifact( String groupId, String artifactId, VersionRange versionRange );
@@ -46,4 +44,6 @@
Artifact createProjectArtifact( String groupId, String artifactId, String version, String scope );
Artifact createExtensionArtifact( String groupId, String artifactId, VersionRange versionRange );
+
+ */
}
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java Wed Jul 15 19:24:20 2009
@@ -1,150 +1,47 @@
package org.apache.maven.artifact.factory;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+@Deprecated
@Component(role=ArtifactFactory.class)
public class DefaultArtifactFactory
implements ArtifactFactory
{
@Requirement
- private ArtifactHandlerManager artifactHandlerManager;
+ private RepositorySystem repositorySystem;
public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type )
{
- return createArtifact( groupId, artifactId, version, scope, type, null, null );
+ return repositorySystem.createArtifact( groupId, artifactId, version, scope, type );
}
public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type, String classifier )
{
- return createArtifact( groupId, artifactId, version, null, type, classifier, null );
+ return repositorySystem.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
}
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope )
+ public Artifact createArtifact( String groupId, String artifactId, String version, String packaging )
{
- return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, null );
+ return repositorySystem.createArtifact( groupId, artifactId, version, packaging );
}
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope, boolean optional )
+ public Artifact createDependencyArtifact( Dependency dependency )
{
- return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, null, optional );
+ return repositorySystem.createDependencyArtifact( dependency );
}
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope, String inheritedScope )
+ public Artifact createPluginArtifact( Plugin plugin )
{
- return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope );
- }
-
- public Artifact createDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope, String inheritedScope, boolean optional )
- {
- return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, optional );
- }
-
- public Artifact createBuildArtifact( String groupId, String artifactId, String version, String packaging )
- {
- return createArtifact( groupId, artifactId, version, null, packaging, null, null );
+ return repositorySystem.createPluginArtifact( plugin );
}
public Artifact createProjectArtifact( String groupId, String artifactId, String version )
{
- return createProjectArtifact( groupId, artifactId, version, null );
- }
-
- public Artifact createParentArtifact( String groupId, String artifactId, String version )
- {
- return createProjectArtifact( groupId, artifactId, version );
- }
-
- public Artifact createPluginArtifact( String groupId, String artifactId, VersionRange versionRange )
- {
- return createArtifact( groupId, artifactId, versionRange, "maven-plugin", null, Artifact.SCOPE_RUNTIME, null );
- }
-
- public Artifact createProjectArtifact( String groupId, String artifactId, String version, String scope )
- {
- return createArtifact( groupId, artifactId, version, scope, "pom" );
- }
-
- public Artifact createExtensionArtifact( String groupId, String artifactId, VersionRange versionRange )
- {
- return createArtifact( groupId, artifactId, versionRange, "jar", null, Artifact.SCOPE_RUNTIME, null );
- }
-
- private Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type, String classifier, String inheritedScope )
- {
- VersionRange versionRange = null;
- if ( version != null )
- {
- versionRange = VersionRange.createFromVersion( version );
- }
- return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope );
- }
-
- private Artifact createArtifact( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope, String inheritedScope )
- {
- return createArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, false );
- }
-
- private Artifact createArtifact( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope, String inheritedScope, boolean optional )
- {
- String desiredScope = Artifact.SCOPE_RUNTIME;
-
- if ( inheritedScope == null )
- {
- desiredScope = scope;
- }
- else if ( Artifact.SCOPE_TEST.equals( scope ) || Artifact.SCOPE_PROVIDED.equals( scope ) )
- {
- return null;
- }
- else if ( Artifact.SCOPE_COMPILE.equals( scope ) && Artifact.SCOPE_COMPILE.equals( inheritedScope ) )
- {
- // added to retain compile artifactScope. Remove if you want compile inherited as runtime
- desiredScope = Artifact.SCOPE_COMPILE;
- }
-
- if ( Artifact.SCOPE_TEST.equals( inheritedScope ) )
- {
- desiredScope = Artifact.SCOPE_TEST;
- }
-
- if ( Artifact.SCOPE_PROVIDED.equals( inheritedScope ) )
- {
- desiredScope = Artifact.SCOPE_PROVIDED;
- }
-
- if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
- {
- // system scopes come through unchanged...
- desiredScope = Artifact.SCOPE_SYSTEM;
- }
-
- ArtifactHandler handler = artifactHandlerManager.getArtifactHandler( type );
-
- return new DefaultArtifact( groupId, artifactId, versionRange, desiredScope, type, classifier, handler, optional );
+ return repositorySystem.createProjectArtifact( groupId, artifactId, version );
}
}
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java Wed Jul 15 19:24:20 2009
@@ -1,28 +1,6 @@
package org.apache.maven.artifact.handler;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id$
- */
+@Deprecated
public interface ArtifactHandler
{
String ROLE = ArtifactHandler.class.getName();
@@ -40,4 +18,5 @@
String getLanguage();
boolean isAddedToClasspath();
+
}
Modified: maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java?rev=794373&r1=794372&r2=794373&view=diff
==============================================================================
--- maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java (original)
+++ maven/components/branches/MNG-4221/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java Wed Jul 15 19:24:20 2009
@@ -2,30 +2,6 @@
import org.codehaus.plexus.component.annotations.Component;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @author Jason van Zyl
- * @version $Id$
- */
@Component(role=ArtifactHandler.class)
public class DefaultArtifactHandler
implements ArtifactHandler
@@ -111,4 +87,4 @@
{
return addedToClasspath;
}
-}
+}
\ No newline at end of file