Skip to content

Close session #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cstamas wants to merge 2 commits into from
Closed

Close session #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a1a1e
Close session
cstamas Oct 11, 2022
673ff02
Tidy
cstamas Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
13 changes: 10 additions & 3 deletions ...n-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,17 @@ public List<CoreExtensionEntry> loadCoreExtensions( MavenExecutionRequest reques
throws Exception
{
RepositorySystemSession repoSession = repositorySystemSessionFactory.newRepositorySession( request );
List<RemoteRepository> repositories = RepositoryUtils.toRepos( request.getPluginArtifactRepositories() );
Interpolator interpolator = createInterpolator( request );
try
{
List<RemoteRepository> 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<CoreExtensionEntry> resolveCoreExtensions( RepositorySystemSession repoSession,
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ under the License.
<securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>2.0</cipherVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.8.2</resolverVersion>
<resolverVersion>1.8.3-SNAPSHOT</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion>
Expand Down