You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/06/07 12:26:01 UTC
[maven] branch MNG-6656 updated (82bc06d -> be5d23d)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 82bc06d Restore Jenkins file
new 8b3f47a Pass sessionData
new be5d23d Prevent NPE
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../aether/DefaultRepositorySystemSessionFactory.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
[maven] 01/02: Pass sessionData
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8b3f47a4f5ac0e857fd1be8a7c90a56879943508
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Jun 6 21:58:31 2020 +0200
Pass sessionData
---
.../internal/aether/DefaultRepositorySystemSessionFactory.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 928d200..acd1fce 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -40,6 +40,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.aether.ConfigurationProperties;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.SessionData;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
import org.eclipse.aether.repository.RepositoryPolicy;
@@ -247,8 +248,7 @@ public class DefaultRepositorySystemSessionFactory
if ( Features.buildConsumer().isActive() )
{
- session.setFileTransformerManager( a -> getTransformersForArtifact( a,
- (TransformerContext) session.getData().get( TransformerContext.KEY ) ) );
+ session.setFileTransformerManager( a -> getTransformersForArtifact( a, session.getData() ) );
}
return session;
@@ -281,8 +281,9 @@ public class DefaultRepositorySystemSessionFactory
}
private Collection<FileTransformer> getTransformersForArtifact( final org.eclipse.aether.artifact.Artifact artifact,
- TransformerContext context )
+ final SessionData sessionData )
{
+ TransformerContext context = (TransformerContext) sessionData.get( TransformerContext.KEY );
Collection<FileTransformer> transformers = new ArrayList<>();
if ( "pom".equals( artifact.getExtension() ) )
{
[maven] 02/02: Prevent NPE
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git
commit be5d23d8d6cd4d51a98a87ef473b70cdb9205de2
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jun 7 14:25:50 2020 +0200
Prevent NPE
---
.../maven/internal/aether/DefaultRepositorySystemSessionFactory.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index acd1fce..d90c1d8 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -285,7 +285,9 @@ public class DefaultRepositorySystemSessionFactory
{
TransformerContext context = (TransformerContext) sessionData.get( TransformerContext.KEY );
Collection<FileTransformer> transformers = new ArrayList<>();
- if ( "pom".equals( artifact.getExtension() ) )
+
+ // In case of install:install-file there's no transformer context, as the goal is unrelated to the lifecycle.
+ if ( "pom".equals( artifact.getExtension() ) && context != null )
{
transformers.add( new FileTransformer()
{