o update for changes in Aether APIs
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/de40fe19 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/de40fe19 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/de40fe19 Branch: refs/heads/eclipse-aether Commit: de40fe19a8aabd6b9c9e7a1c24b1dc244279faaa Parents: 137cbd8 Author: Jason van Zyl <ja...@tesla.io> Authored: Sat Feb 16 22:48:55 2013 -0500 Committer: Jason van Zyl <ja...@tesla.io> Committed: Sat Feb 16 22:48:55 2013 -0500 ---------------------------------------------------------------------- .../AbstractArtifactComponentTestCase.java | 2 +- .../repository/LegacyRepositorySystemTest.java | 2 +- .../main/java/org/apache/maven/DefaultMaven.java | 6 +++--- .../maven/AbstractCoreMavenComponentTestCase.java | 2 +- .../apache/maven/project/PomConstructionTest.java | 2 +- .../settings/PomConstructionWithSettingsTest.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/de40fe19/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 09cebe8..3f96793 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 @@ -361,7 +361,7 @@ public abstract class AbstractArtifactComponentTestCase session.setDependencyGraphTransformer( transformer ); LocalRepository localRepo = new LocalRepository( localRepository().getBasedir() ); - session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( localRepo ) ); + session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( session, localRepo ) ); return session; } http://git-wip-us.apache.org/repos/asf/maven/blob/de40fe19/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 be1790f..4c73c0f 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 @@ -124,7 +124,7 @@ public class LegacyRepositorySystemTest DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(); LocalRepository localRepo = new LocalRepository( request.getLocalRepository().getBasedir() ); - session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( localRepo ) ); + session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( session, localRepo ) ); LegacySupport legacySupport = lookup( LegacySupport.class ); legacySupport.setSession( new MavenSession( getContainer(), session, new DefaultMavenExecutionRequest(), new DefaultMavenExecutionResult() ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/de40fe19/maven-core/src/main/java/org/apache/maven/DefaultMaven.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 0835153..070b7f7 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -389,18 +389,18 @@ public class DefaultMaven logger.warn( "Disabling enhanced local repository: using legacy is stronlgy discouraged to ensure build reproducibility." ); try { - session.setLocalRepositoryManager( simpleLocalRepositoryManagerFactory.newInstance( localRepo ) ); + session.setLocalRepositoryManager( simpleLocalRepositoryManagerFactory.newInstance( session, localRepo ) ); } catch ( NoLocalRepositoryManagerException e ) { logger.warn( "Failed to configure legacy local repository: back to default" ); - session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( localRepo ) ); + session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( session, localRepo ) ); } } else { - session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( localRepo ) ); + session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( session, localRepo ) ); } if ( request.getWorkspaceReader() != null ) http://git-wip-us.apache.org/repos/asf/maven/blob/de40fe19/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java index 1d69c4f..813a128 100644 --- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java @@ -166,7 +166,7 @@ public abstract class AbstractCoreMavenComponentTestCase File localRepoDir = new File( request.getLocalRepository().getBasedir() ); LocalRepository localRepo = new LocalRepository( localRepoDir ); DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( localRepo ) ); + session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( session, localRepo ) ); request.setRepositorySession( session ); } http://git-wip-us.apache.org/repos/asf/maven/blob/de40fe19/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 918ba6d..06ee6c9 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 @@ -1853,7 +1853,7 @@ public class PomConstructionTest DefaultRepositorySystemSession repoSession = MavenRepositorySystemUtils.newSession(); LocalRepository localRepo = new LocalRepository( config.getLocalRepository().getBasedir() ); - repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( localRepo ) ); + repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepo ) ); config.setRepositorySession( repoSession ); return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ).getProject() ); http://git-wip-us.apache.org/repos/asf/maven/blob/de40fe19/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 405551e..41b21ce 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 @@ -126,7 +126,7 @@ public class PomConstructionWithSettingsTest DefaultRepositorySystemSession repoSession = MavenRepositorySystemUtils.newSession(); LocalRepository localRepo = new LocalRepository( config.getLocalRepository().getBasedir() ); - repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( localRepo ) ); + repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepo ) ); config.setRepositorySession( repoSession ); return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ).getProject() );
