From 54a5dd8be51c3770719363971e15d557d8012ee6 Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Mon, 23 Jan 2017 10:11:25 -0500 Subject: [PATCH] NIFI-1450: - Ensuring that system properties are relayed so that the disable doclint profile is not activated. --- pom.xml | 2 +- .../apache/nifi/NarProvidedDependenciesMojo.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 5962163..6c0f01c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.nifi nifi-nar-maven-plugin - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT maven-plugin Apache NiFi Nar Maven Plugin http://nifi.apache.org diff --git a/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java b/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java index 63b2abd..15da9ad 100644 --- a/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java +++ b/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java @@ -16,10 +16,6 @@ */ package org.apache.nifi; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.HashMap; -import java.util.Map; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; @@ -27,13 +23,13 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.apache.maven.project.MavenProject; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.project.DefaultProjectBuildingRequest; +import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingRequest; @@ -44,6 +40,11 @@ import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; import org.eclipse.aether.RepositorySystemSession; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashMap; +import java.util.Map; + /** * Generates the listing of dependencies that is provided by the NAR dependency of the current NAR. This is important as artifacts that bundle dependencies will * not project those dependences using the traditional maven dependency plugin. This plugin will override that setting in order to print the dependencies being @@ -126,6 +127,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { // build the project for the nar artifact final ProjectBuildingRequest narRequest = new DefaultProjectBuildingRequest(); narRequest.setRepositorySession(repoSession); + narRequest.setSystemProperties(System.getProperties()); final ProjectBuildingResult narResult = projectBuilder.build(narArtifact, narRequest); // get the artifact handler for excluding dependencies