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 0fc818e7489b..062708706ed4 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -182,14 +182,21 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request ) try { DefaultRepositorySystemSession repoSession = - (DefaultRepositorySystemSession) newRepositorySession( request ); - MavenSession session = new MavenSession( container, repoSession, request, result ); + (DefaultRepositorySystemSession) newRepositorySession( request ); + try + { + MavenSession session = new MavenSession( container, repoSession, request, result ); - sessionScope.seed( MavenSession.class, session ); + sessionScope.seed( MavenSession.class, session ); - legacySupport.setSession( session ); + legacySupport.setSession( session ); - return doExecute( request, session, result, repoSession ); + return doExecute( request, session, result, repoSession ); + } + finally + { + repoSession.close(); + } } finally { diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java index 89c9bed4db10..1d1e4989c1d2 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java @@ -95,10 +95,17 @@ public List loadCoreExtensions( MavenExecutionRequest reques throws Exception { RepositorySystemSession repoSession = repositorySystemSessionFactory.newRepositorySession( request ); - List repositories = RepositoryUtils.toRepos( request.getPluginArtifactRepositories() ); - Interpolator interpolator = createInterpolator( request ); + try + { + List repositories = RepositoryUtils.toRepos( request.getPluginArtifactRepositories() ); + Interpolator interpolator = createInterpolator( request ); - return resolveCoreExtensions( repoSession, repositories, providedArtifacts, extensions, interpolator ); + return resolveCoreExtensions( repoSession, repositories, providedArtifacts, extensions, interpolator ); + } + finally + { + repoSession.close(); + } } private List resolveCoreExtensions( RepositorySystemSession repoSession, diff --git a/pom.xml b/pom.xml index ad3df8cbf75c..eb5d866ae1f7 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. 2.0 2.0 1.3 - 1.8.2 + 1.8.3-SNAPSHOT 1.7.36 2.2.1 1.7.4