This is an automated email from the ASF dual-hosted git repository. kdoran pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-maven.git
The following commit(s) were added to refs/heads/main by this push: new ccca6f2 NIFI-11324 Set system properties in the user properties of artifact requests (#33) ccca6f2 is described below commit ccca6f239ff0738cbf226f22d08d3bdd796c30eb Author: Bryan Bende <bbe...@apache.org> AuthorDate: Wed May 10 10:03:02 2023 -0400 NIFI-11324 Set system properties in the user properties of artifact requests (#33) --- .../extraction/ExtensionClassLoaderFactory.java | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java index c5e4888..ace4226 100644 --- a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java +++ b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java @@ -145,10 +145,7 @@ public class ExtensionClassLoaderFactory { } private Set<Artifact> getNarDependencies(final Artifact narArtifact) throws MojoExecutionException, ProjectBuildingException { - final ProjectBuildingRequest narRequest = new DefaultProjectBuildingRequest(); - narRequest.setRepositorySession(repoSession); - narRequest.setSystemProperties(System.getProperties()); - narRequest.setLocalRepository(localRepo); + final ProjectBuildingRequest narRequest = createProjectBuildingRequest(); final ProjectBuildingResult narResult = projectBuilder.build(narArtifact, narRequest); @@ -173,10 +170,7 @@ public class ExtensionClassLoaderFactory { } private String findProvidedDependencyVersion(final Set<Artifact> artifacts, final String groupId, final String artifactId) { - final ProjectBuildingRequest projectRequest = new DefaultProjectBuildingRequest(); - projectRequest.setRepositorySession(repoSession); - projectRequest.setSystemProperties(System.getProperties()); - projectRequest.setLocalRepository(localRepo); + final ProjectBuildingRequest projectRequest = createProjectBuildingRequest(); for (final Artifact artifact : artifacts) { try { @@ -304,10 +298,7 @@ public class ExtensionClassLoaderFactory { }; try { - final ProjectBuildingRequest projectRequest = new DefaultProjectBuildingRequest(); - projectRequest.setRepositorySession(repoSession); - projectRequest.setSystemProperties(System.getProperties()); - projectRequest.setLocalRepository(localRepo); + final ProjectBuildingRequest projectRequest = createProjectBuildingRequest(); projectRequest.setProject(mavenProject); final ArtifactFilter excludesFilter = new ExclusionSetFilter(EXCLUDED_ARTIFACT_IDS); @@ -319,6 +310,16 @@ public class ExtensionClassLoaderFactory { return artifacts; } + private ProjectBuildingRequest createProjectBuildingRequest() { + final ProjectBuildingRequest projectRequest = new DefaultProjectBuildingRequest(); + projectRequest.setRepositorySession(repoSession); + projectRequest.setSystemProperties(System.getProperties()); + projectRequest.setUserProperties(System.getProperties()); + projectRequest.setLocalRepository(localRepo); + projectRequest.setRemoteRepositories(remoteRepos); + return projectRequest; + } + private Set<URL> toURLs(final Artifact artifact) throws MojoExecutionException { final Set<URL> urls = new HashSet<>();