Merge branch 'NIFI-976'

This commit is contained in:
Bryan Bende 2015-11-09 13:41:00 -05:00
commit 051d242f01
4 changed files with 49 additions and 4 deletions

View File

@ -32,9 +32,34 @@
<version>2.2</version> <version>2.2</version>
</extension> </extension>
</extensions> </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> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId> <artifactId>maven-archetype-plugin</artifactId>

View File

@ -17,7 +17,7 @@
<requiredProperties> <requiredProperties>
<requiredProperty key="artifactBaseName" /> <requiredProperty key="artifactBaseName" />
<requiredProperty key="nifiVersion" > <requiredProperty key="nifiVersion" >
<defaultValue>0.2.1-SNAPSHOT</defaultValue> <defaultValue>NIFIVERSION</defaultValue>
</requiredProperty> </requiredProperty>
<requiredProperty key="package"> <requiredProperty key="package">
<defaultValue>${groupId}.processors.${artifactBaseName}</defaultValue> <defaultValue>${groupId}.processors.${artifactBaseName}</defaultValue>

View File

@ -32,7 +32,27 @@
<version>2.2</version> <version>2.2</version>
</extension> </extension>
</extensions> </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> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>

View File

@ -17,7 +17,7 @@
<requiredProperties> <requiredProperties>
<requiredProperty key="artifactBaseName" /> <requiredProperty key="artifactBaseName" />
<requiredProperty key="nifiVersion" > <requiredProperty key="nifiVersion" >
<defaultValue>0.3.0-SNAPSHOT</defaultValue> <defaultValue>NIFIVERSION</defaultValue>
</requiredProperty> </requiredProperty>
<requiredProperty key="package"> <requiredProperty key="package">
<defaultValue>${groupId}.${artifactBaseName}</defaultValue> <defaultValue>${groupId}.${artifactBaseName}</defaultValue>