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/04/30 20:49:47 UTC
svn commit: r770390 [1/3] - in /maven/components/branches/MNG-2766:
apache-maven/src/test/java/org/apache/maven/settings/
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/...
Author: jvanzyl
Date: Thu Apr 30 18:49:42 2009
New Revision: 770390
URL: http://svn.apache.org/viewvc?rev=770390&view=rev
Log:
o cleaning up project builder, removed signatures that i've corrected in the RR plugin, moved properties injection up to the main Maven component
Modified:
maven/components/branches/MNG-2766/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/Maven.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/CLIRequestUtilsTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/TestEmbedderLogger.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderProjectNotInRepositoryTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/ValidateConfigurationTest.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
Modified: maven/components/branches/MNG-2766/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java (original)
+++ maven/components/branches/MNG-2766/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java Thu Apr 30 18:49:42 2009
@@ -24,10 +24,10 @@
import java.io.InputStreamReader;
import java.io.Reader;
-import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-
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.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,11 @@
* under the License.
*/
+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;
@@ -27,11 +32,6 @@
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-import java.util.regex.Pattern;
-
/**
* Description of an artifact.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java Thu Apr 30 18:49:42 2009
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.apache.maven.artifact.versioning.VersionRange;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -28,6 +26,8 @@
import java.util.Map;
import java.util.regex.Matcher;
+import org.apache.maven.artifact.versioning.VersionRange;
+
public final class ArtifactUtils
{
private ArtifactUtils()
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Thu Apr 30 18:49:42 2009
@@ -19,24 +19,24 @@
* under the License.
*/
+import java.io.File;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+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.artifact.versioning.DefaultArtifactVersion;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java Thu Apr 30 18:49:42 2009
@@ -1,9 +1,9 @@
package org.apache.maven.artifact;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-
import java.net.MalformedURLException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import java.io.File;
-
public interface ArtifactDeployer
{
String ROLE = ArtifactDeployer.class.getName();
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.artifact.handler.ArtifactHandler;
-
import java.util.Map;
+import org.apache.maven.artifact.handler.ArtifactHandler;
+
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java Thu Apr 30 18:49:42 2009
@@ -19,14 +19,14 @@
* under the License.
*/
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.util.Map;
-import java.util.Set;
-
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import java.io.File;
-
/**
* @author <a href="michal@codehaus.org">Michal Maczka</a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,9 @@
* 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;
@@ -30,9 +33,6 @@
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-
/**
* @author Jason van Zyl
*/
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java Thu Apr 30 18:49:42 2009
@@ -19,14 +19,6 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -39,6 +31,14 @@
import java.util.Date;
import java.util.Properties;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.logging.Logger;
+
@Component(role=UpdateCheckManager.class)
public class DefaultUpdateCheckManager
extends AbstractLogEnabled
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -29,9 +32,6 @@
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.repository.Repository;
-import java.io.File;
-import java.util.List;
-
/**
* Manages <a href="http://maven.apache.org/wagon">Wagon</a> related operations in Maven.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
-import java.util.List;
-
/**
* Provides some metadata operations, like querying the remote repository for a list of versions available for an
* artifact.
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-
import java.util.List;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
public class ResolutionGroup
{
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import java.io.File;
-
/** @author jdcasey */
public interface ArtifactRepositoryFactory
{
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java Thu Apr 30 18:49:42 2009
@@ -19,17 +19,17 @@
* under the License.
*/
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* @author jdcasey
*/
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,11 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -29,11 +34,6 @@
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-
/**
* Shared methods of the repository metadata handling.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import java.util.List;
-
public interface RepositoryMetadataManager
{
void resolve( RepositoryMetadata repositoryMetadata,
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
/**
* Base class for artifact resolution exceptions.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java Thu Apr 30 18:49:42 2009
@@ -19,15 +19,15 @@
* under the License.
*/
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.conflict.ConflictResolver;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
/**
* Artifact collector - takes a set of original artifacts and resolves all of the best versions to use
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ResourceDoesNotExistException;
-import java.util.List;
-
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java Thu Apr 30 18:49:42 2009
@@ -19,15 +19,15 @@
* under the License.
*/
+import java.io.IOException;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
import org.apache.maven.wagon.TransferFailedException;
-import java.io.IOException;
-import java.util.List;
-
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java Thu Apr 30 18:49:42 2009
@@ -46,7 +46,7 @@
private boolean resolveRoot = true;
- private boolean resolveDependencies = false;
+ private boolean resolveTransitively = false;
public ArtifactResolutionRequest()
{
@@ -178,16 +178,16 @@
return resolveRoot;
}
- public ArtifactResolutionRequest setResolveDependencies( boolean resolveDependencies )
+ public ArtifactResolutionRequest setResolveTransitively( boolean resolveDependencies )
{
- this.resolveDependencies = resolveDependencies;
+ this.resolveTransitively = resolveDependencies;
return this;
}
- public boolean isResolveDependencies()
+ public boolean isResolveTransitively()
{
- return resolveDependencies;
+ return resolveTransitively;
}
public TransferListener getTransferListener()
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java Thu Apr 30 18:49:42 2009
@@ -15,16 +15,16 @@
* the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
+
/**
* Specific problems during resolution that we want to account for:
* <p/>
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.logging.Logger;
-import java.util.Set;
-import java.util.HashSet;
-
/**
* Send resolution events to the debug log.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,15 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -36,15 +45,6 @@
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* Default implementation of the artifact collector.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Thu Apr 30 18:49:42 2009
@@ -421,7 +421,7 @@
}
}
- if ( request.isResolveDependencies() )
+ if ( request.isResolveTransitively() )
{
try
{
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,6 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-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 java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -32,6 +26,12 @@
import java.util.List;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+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;
+
public class ResolutionNode
{
private Artifact artifact;
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java Thu Apr 30 18:49:42 2009
@@ -1,10 +1,10 @@
package org.apache.maven.artifact.resolver;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import java.util.List;
-
/**
* A simple recording of the Artifacts that could not be resolved for a given resolution request, along with
* the remote repositories where attempts were made to resolve the artifacts.
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java Thu Apr 30 18:49:42 2009
@@ -23,9 +23,6 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.logging.Logger;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* Send resolution warning events to the warning log.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java Thu Apr 30 18:49:42 2009
@@ -3,7 +3,7 @@
import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
/**
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeSet;
+
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
@@ -28,10 +32,6 @@
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeSet;
-
/**
* Default conflict resolver.Implements closer newer first policy by default, but could be configured via plexus
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Apply multiple filters.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Filter to exclude from a list of artifact patterns.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Filter to include from a list of artifact patterns.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.artifact.repository.ArtifactRepository;
-
import java.util.List;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
/**
* Provides some metadata operations, like querying the remote repository for a list of versions available for an
* artifact.
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -31,9 +33,6 @@
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.component.annotations.Component;
-
-import java.util.List;
/**
* Describes a version transformation during artifact resolution.
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
@@ -26,8 +28,6 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import java.util.List;
-
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
* @version $Id: ArtifactTransformation.java,v 1.1 2005/03/03 15:37:25
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
@@ -26,9 +28,6 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import java.util.List;
-import java.util.Map;
-
/** Manages multiple ArtifactTransformation instances and applies them in succession. */
public interface ArtifactTransformationManager
{
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
@@ -28,10 +30,6 @@
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* @author Jason van Zyl
*/
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
@@ -27,8 +29,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.codehaus.plexus.component.annotations.Component;
-import java.util.List;
-
@Component(role=ArtifactTransformation.class, hint="latest")
public class LatestArtifactTransformation
extends AbstractVersionTransformation
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -29,8 +31,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.codehaus.plexus.component.annotations.Component;
-import java.util.List;
-
/**
* Change the version <code>RELEASE</code> to the appropriate release version from the remote repository.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,12 @@
* under the License.
*/
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -32,12 +38,6 @@
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java Thu Apr 30 18:49:42 2009
@@ -20,8 +20,8 @@
*/
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
public class ManagedVersionMap
extends HashMap
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import java.util.List;
-
/**
* Occurs when ranges exclude each other and no valid value remains.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,20 @@
* under the License.
*/
-import org.apache.maven.model.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginContainer;
+import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.Repository;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.util.*;
-
/** @deprecated */
@Deprecated
public final class ModelUtils
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,6 @@
* under the License.
*/
-import org.apache.maven.model.*;
-import org.apache.maven.project.ModelUtils;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -35,6 +29,25 @@
import java.util.StringTokenizer;
import java.util.TreeMap;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.DeploymentRepository;
+import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Extension;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.ReportSet;
+import org.apache.maven.model.Reporting;
+import org.apache.maven.model.Resource;
+import org.apache.maven.model.Scm;
+import org.apache.maven.model.Site;
+import org.apache.maven.project.ModelUtils;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+
@Component(role = ModelInheritanceAssembler.class)
public class DefaultModelInheritanceAssembler
implements ModelInheritanceAssembler
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.model.Model;
-
import java.io.File;
+import org.apache.maven.model.Model;
+
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,6 @@
* under the License.
*/
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.codehaus.plexus.PlexusTestCase;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -34,6 +27,13 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.codehaus.plexus.PlexusTestCase;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import junit.framework.TestCase;
+
import org.apache.maven.artifact.handler.ArtifactHandlerMock;
import org.apache.maven.artifact.versioning.VersionRange;
-import junit.framework.TestCase;
-
public class DefaultArtifactTest
extends TestCase
{
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -27,9 +30,6 @@
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import java.util.Collections;
-import java.util.List;
-
/** @author Jason van Zyl */
public class SimpleArtifactMetadataSource
implements ArtifactMetadataSource
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
-import java.io.File;
-
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,17 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -35,17 +46,6 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.PlexusTestCase;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* Test the default artifact collector.
*
Modified: maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.easymock.MockControl;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.easymock.MockControl;
+
public class MockManager
{