Repository: maven Updated Branches: refs/heads/master e67714aa2 -> 2909b5a32
enabled JSR330-only components in all unit tests Signed-off-by: Igor Fedorenko <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0ba8fa12 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0ba8fa12 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0ba8fa12 Branch: refs/heads/master Commit: 0ba8fa125855dc653105e1bb7e09bac390d2dd65 Parents: e67714a Author: Igor Fedorenko <[email protected]> Authored: Wed Aug 27 10:15:25 2014 -0400 Committer: Igor Fedorenko <[email protected]> Committed: Wed Aug 27 10:15:25 2014 -0400 ---------------------------------------------------------------------- .../maven/repository/internal/AbstractRepositoryTestCase.java | 2 ++ .../apache/maven/artifact/AbstractArtifactComponentTestCase.java | 2 ++ .../org/apache/maven/project/AbstractMavenProjectTestCase.java | 2 ++ .../org/apache/maven/repository/LegacyRepositorySystemTest.java | 2 ++ .../apache/maven/repository/legacy/LegacyRepositorySystemTest.java | 2 ++ .../org/apache/maven/project/AbstractMavenProjectTestCase.java | 2 ++ .../test/java/org/apache/maven/project/PomConstructionTest.java | 2 ++ .../org/apache/maven/settings/PomConstructionWithSettingsTest.java | 2 ++ 8 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java ---------------------------------------------------------------------- diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java index eea3830..b81450c 100644 --- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java +++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java @@ -24,6 +24,7 @@ import java.net.MalformedURLException; import org.apache.maven.repository.internal.util.ConsoleRepositoryListener; import org.apache.maven.repository.internal.util.ConsoleTransferListener; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; @@ -43,6 +44,7 @@ public abstract class AbstractRepositoryTestCase { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } @Override http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java index 3f96793..91265db 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java @@ -37,6 +37,7 @@ import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenSession; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystemSession; @@ -76,6 +77,7 @@ public abstract class AbstractArtifactComponentTestCase { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } @Override http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index f897dbf..71f79a4 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -29,6 +29,7 @@ import org.apache.maven.model.building.ModelProblem; import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.eclipse.aether.DefaultRepositorySystemSession; @@ -47,6 +48,7 @@ public abstract class AbstractMavenProjectTestCase { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } protected void setUp() http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java index 4c73c0f..9dc7cc0 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java @@ -33,6 +33,7 @@ import org.apache.maven.model.RepositoryPolicy; import org.apache.maven.plugin.LegacySupport; import org.apache.maven.repository.RepositorySystem; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; @@ -55,6 +56,7 @@ public class LegacyRepositorySystemTest { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } @Override http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java index 98340be..01ab3b9 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java @@ -23,6 +23,7 @@ import org.apache.maven.artifact.repository.Authentication; import org.apache.maven.repository.RepositorySystem; import org.apache.maven.settings.Server; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; /** @@ -40,6 +41,7 @@ public class LegacyRepositorySystemTest { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } @Override http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index a8b4829..4cc1e89 100644 --- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -29,6 +29,7 @@ import org.apache.maven.model.building.ModelProblem; import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.eclipse.aether.DefaultRepositorySystemSession; @@ -47,6 +48,7 @@ public abstract class AbstractMavenProjectTestCase { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } protected void setUp() http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 06ee6c9..392d9cd 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -34,6 +34,7 @@ import org.apache.maven.project.harness.PomTestWrapper; import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; @@ -59,6 +60,7 @@ public class PomConstructionTest { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } protected void setUp() http://git-wip-us.apache.org/repos/asf/maven/blob/0ba8fa12/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java index 41b21ce..5c16686 100644 --- a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java +++ b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java @@ -34,6 +34,7 @@ import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; @@ -60,6 +61,7 @@ public class PomConstructionWithSettingsTest { super.customizeContainerConfiguration( containerConfiguration ); containerConfiguration.setAutoWiring( true ); + containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); } protected void setUp()
