Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3795 Moved no-git profile to nifi-nar-bundles 

Removing buildnumber plugin and build-info-no-git profile from nifi-assembly
and adding build-info-no-git profile to nifi-nar-bundles pom

Signed-off-by: James Wing <jvwing@gmail.com>
This commit is contained in:
Bryan Bende 2017-05-04 10:02:00 -04:00 committed by James Wing
parent 7f2f38be52
commit d9410d6404
2 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nifi-assembly/pom.xml
View File

@ -49,28 +49,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<shortRevisionLength>7</shortRevisionLength>
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
<revisionOnScmFailure />
<buildNumberPropertyName>buildRevision</buildNumberPropertyName>
<scmBranchPropertyName>buildBranch</scmBranchPropertyName>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
@ -855,18 +833,5 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>build-info-no-git</id>
<activation>
<activeByDefault>false</activeByDefault>
<file>
<missing>../.git/HEAD</missing>
</file>
</activation>
<properties>
<buildRevision />
<buildBranch />
</properties>
</profile>
</profiles> </profiles>
</project> </project>

17
nifi-nar-bundles/pom.xml
View File

@ -113,6 +113,23 @@
</plugins> </plugins>
</build> </build>
<profiles>
<!-- Specifies an empty buildRevision and buildBranch when building outside of a git repo -->
<profile>
<id>build-info-no-git</id>
<activation>
<activeByDefault>false</activeByDefault>
<file>
<missing>../.git/HEAD</missing>
</file>
</activation>
<properties>
<buildRevision />
<buildBranch />
</properties>
</profile>
</profiles>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>