You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2017/01/23 15:26:17 UTC
nifi-maven git commit: NIFI-1450: - Ensuring that system properties
are relayed so that the disable doclint profile is not activated.
Repository: nifi-maven
Updated Branches:
refs/heads/master c5f32a706 -> 4e6d1a3ab
NIFI-1450: - Ensuring that system properties are relayed so that the disable doclint profile is not activated.
This closes #1.
Signed-off-by: Bryan Bende <bb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-maven/commit/4e6d1a3a
Tree: http://git-wip-us.apache.org/repos/asf/nifi-maven/tree/4e6d1a3a
Diff: http://git-wip-us.apache.org/repos/asf/nifi-maven/diff/4e6d1a3a
Branch: refs/heads/master
Commit: 4e6d1a3ab566d0177a6fb33aa0c8d824f14d360e
Parents: c5f32a7
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Jan 23 10:11:25 2017 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Mon Jan 23 10:19:00 2017 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../org/apache/nifi/NarProvidedDependenciesMojo.java | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-maven/blob/4e6d1a3a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5962163..6c0f01c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<description>Apache NiFi Nar Maven Plugin</description>
<url>http://nifi.apache.org</url>
http://git-wip-us.apache.org/repos/asf/nifi-maven/blob/4e6d1a3a/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java
----------------------------------------------------------------------
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.artifact.repository.ArtifactRepository;
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.DependencyTreeBuilderException;
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 class NarProvidedDependenciesMojo extends AbstractMojo {
// 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