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 2015/11/09 19:41:55 UTC
[1/3] nifi git commit: NIFI-976 antrun that copies in the project
version to the archetype metadata
Repository: nifi
Updated Branches:
refs/heads/master 5f8fdae90 -> 051d242f0
NIFI-976 antrun that copies in the project version to the archetype metadata
Signed-off-by: Bryan Bende <bb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bc636f2e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bc636f2e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bc636f2e
Branch: refs/heads/master
Commit: bc636f2e081e64f1df988d1a5bbc546188018344
Parents: 64b1fc9
Author: Tony Kurc <tr...@gmail.com>
Authored: Fri Nov 6 20:57:51 2015 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Mon Nov 9 13:33:28 2015 -0500
----------------------------------------------------------------------
.../nifi-processor-bundle-archetype/pom.xml | 27 +++++++++++++++++++-
.../META-INF/maven/archetype-metadata.xml | 2 +-
2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/bc636f2e/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
index 05a9257..a3b3cf7 100644
--- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
+++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
@@ -32,11 +32,36 @@
<version>2.2</version>
</extension>
</extensions>
-
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <replace token="NIFIVERSION" value="${project.version}" dir="target/classes">
+ <include name="**/archetype-metadata.xml" />
+ </replace>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.2</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/nifi/blob/bc636f2e/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 3dc2ba8..9dc9a0c 100644
--- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,7 +17,7 @@
<requiredProperties>
<requiredProperty key="artifactBaseName" />
<requiredProperty key="nifiVersion" >
- <defaultValue>0.2.1-SNAPSHOT</defaultValue>
+ <defaultValue>NIFIVERSION</defaultValue>
</requiredProperty>
<requiredProperty key="package">
<defaultValue>${groupId}.processors.${artifactBaseName}</defaultValue>
[2/3] nifi git commit: NIFI-976 antrun that copies in the project
version to the archetype metadata for controller service archetype
Posted by bb...@apache.org.
NIFI-976 antrun that copies in the project version to the archetype metadata for controller service archetype
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/52101181
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/52101181
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/52101181
Branch: refs/heads/master
Commit: 52101181e8ab6083fc8201c4f97d0683229899dc
Parents: bc636f2
Author: Bryan Bende <bb...@apache.org>
Authored: Mon Nov 9 13:40:24 2015 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Mon Nov 9 13:40:24 2015 -0500
----------------------------------------------------------------------
.../nifi-service-bundle-archetype/pom.xml | 22 +++++++++++++++++++-
.../META-INF/maven/archetype-metadata.xml | 2 +-
2 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/52101181/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
index b7540cb..4b03ba8 100644
--- a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
+++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
@@ -32,7 +32,27 @@
<version>2.2</version>
</extension>
</extensions>
-
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <replace token="NIFIVERSION" value="${project.version}" dir="target/classes">
+ <include name="**/archetype-metadata.xml" />
+ </replace>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/nifi/blob/52101181/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 5ed0b1d..43f105e 100644
--- a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,7 +17,7 @@
<requiredProperties>
<requiredProperty key="artifactBaseName" />
<requiredProperty key="nifiVersion" >
- <defaultValue>0.3.0-SNAPSHOT</defaultValue>
+ <defaultValue>NIFIVERSION</defaultValue>
</requiredProperty>
<requiredProperty key="package">
<defaultValue>${groupId}.${artifactBaseName}</defaultValue>
[3/3] nifi git commit: Merge branch 'NIFI-976'
Posted by bb...@apache.org.
Merge branch 'NIFI-976'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/051d242f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/051d242f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/051d242f
Branch: refs/heads/master
Commit: 051d242f014739462bcd198e4699019a7b0c8352
Parents: 5f8fdae 5210118
Author: Bryan Bende <bb...@apache.org>
Authored: Mon Nov 9 13:41:00 2015 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Mon Nov 9 13:41:00 2015 -0500
----------------------------------------------------------------------
.../nifi-processor-bundle-archetype/pom.xml | 27 +++++++++++++++++++-
.../META-INF/maven/archetype-metadata.xml | 2 +-
.../nifi-service-bundle-archetype/pom.xml | 22 +++++++++++++++-
.../META-INF/maven/archetype-metadata.xml | 2 +-
4 files changed, 49 insertions(+), 4 deletions(-)
----------------------------------------------------------------------