You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2014/12/14 13:35:15 UTC
[1/2] incubator-nifi git commit: Correctly inject MavenProject /
MavenSession into nar-maven-plugin
Repository: incubator-nifi
Updated Branches:
refs/heads/develop bc9462514 -> 9ccbf8be7
Correctly inject MavenProject / MavenSession into nar-maven-plugin
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/21c24b6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/21c24b6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/21c24b6b
Branch: refs/heads/develop
Commit: 21c24b6b68ffa4991bd9a15205adb2eb1a71e862
Parents: bc94625
Author: Karl-Heinz Marbaise <in...@soebes.de>
Authored: Sat Dec 13 23:47:57 2014 +0100
Committer: joewitt <jo...@apache.org>
Committed: Sat Dec 13 20:46:44 2014 -0500
----------------------------------------------------------------------
misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21c24b6b/misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java
----------------------------------------------------------------------
diff --git a/misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java b/misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java
index 263fe88..5196f73 100644
--- a/misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java
+++ b/misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java
@@ -86,10 +86,10 @@ public class NarMojo extends AbstractMojo {
* POM
*
*/
- @Parameter(property = "project", readonly = true, required = true)
+ @Parameter(defaultValue = "${project}", readonly = true, required = true)
protected MavenProject project;
- @Parameter(property = "session", readonly = true, required = true)
+ @Parameter(defaultValue = "${session}", readonly = true, required = true)
protected MavenSession session;
/**
[2/2] incubator-nifi git commit: Added appropriate Maven
configuration to build the nar-maven-plugin with Maven 3.X instead of Maven
3.2.X
Posted by jo...@apache.org.
Added appropriate Maven configuration to build the nar-maven-plugin with Maven 3.X instead of Maven 3.2.X
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9ccbf8be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9ccbf8be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9ccbf8be
Branch: refs/heads/develop
Commit: 9ccbf8be7bb4385c39905911a659b59fb6b34994
Parents: 21c24b6
Author: Karl-Heinz Marbaise <in...@soebes.de>
Authored: Sat Dec 13 22:58:01 2014 +0100
Committer: joewitt <jo...@apache.org>
Committed: Sat Dec 13 20:50:53 2014 -0500
----------------------------------------------------------------------
misc/nar-maven-plugin/pom.xml | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9ccbf8be/misc/nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/misc/nar-maven-plugin/pom.xml b/misc/nar-maven-plugin/pom.xml
index 3888df3..5c7ca7f 100644
--- a/misc/nar-maven-plugin/pom.xml
+++ b/misc/nar-maven-plugin/pom.xml
@@ -42,7 +42,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.3</version>
- </plugin>
+ <executions>
+ <execution>
+ <id>default-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ <execution>
+ <id>help-descriptor</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -68,7 +84,8 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.3</version>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<distributionManagement>
<repository>