From 322907698980050dd92dd2d287e22c816b5ae31c Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Wed, 14 Oct 2009 16:39:08 +0000 Subject: [PATCH] [MNG-4204] Remove support for legacy style repositories git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@825183 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/plugin/PluginParameterExpressionEvaluatorTest.java | 2 +- .../apache/maven/project/DefaultMavenProjectBuilderTest.java | 2 +- .../org/apache/maven/repository}/LegacyRepositoryLayout.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename {maven-compat/src/main/java/org/apache/maven/artifact/repository/layout => maven-core/src/test/java/org/apache/maven/repository}/LegacyRepositoryLayout.java (96%) diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java index 65051bffad..2ac199a9d6 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java @@ -399,7 +399,7 @@ private MavenProject createDefaultProject() private ExpressionEvaluator createExpressionEvaluator( MavenProject project, PluginDescriptor pluginDescriptor, Properties executionProperties ) throws Exception { - ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" ); + ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "default" ); ArtifactRepository repo = artifactRepositoryFactory.createArtifactRepository( "local", "target/repo", repoLayout, null, null ); diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index 01a7741463..9b8d77642a 100644 --- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -110,7 +110,7 @@ public void testDuplicatePluginDefinitionsMerged() protected ArtifactRepository getLocalRepository() throws Exception { - ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" ); + ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "default" ); ArtifactRepository r = repositorySystem.createArtifactRepository( "local", "file://" + localRepoDir.getAbsolutePath(), repoLayout, null, null ); return r; } diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java similarity index 96% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java rename to maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java index ba59599b75..d7d196e5d9 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java +++ b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.repository.layout; +package org.apache.maven.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,7 @@ 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.repository.layout.ArtifactRepositoryLayout; import org.codehaus.plexus.component.annotations.Component; /**