nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jw...@apache.org
Subject nifi git commit: NIFI-3795 Moved no-git profile to nifi-nar-bundles
Date Thu, 04 May 2017 17:10:28 GMT
Repository: nifi
Updated Branches:
  refs/heads/master 7f2f38be5 -> d9410d640


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>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d9410d64
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d9410d64
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d9410d64

Branch: refs/heads/master
Commit: d9410d640475b73d215bd3da6c14cb599e778a64
Parents: 7f2f38b
Author: Bryan Bende <bbende@apache.org>
Authored: Thu May 4 10:02:00 2017 -0400
Committer: James Wing <jvwing@gmail.com>
Committed: Thu May 4 10:09:25 2017 -0700

----------------------------------------------------------------------
 nifi-assembly/pom.xml    | 35 -----------------------------------
 nifi-nar-bundles/pom.xml | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/d9410d64/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index cd8c0d1..c92228e 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -49,28 +49,6 @@
                     </execution>
                 </executions>
             </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>
     </build>
     <dependencies>
@@ -855,18 +833,5 @@
                 </plugins>
             </build>
         </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>
 </project>

http://git-wip-us.apache.org/repos/asf/nifi/blob/d9410d64/nifi-nar-bundles/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml
index d7bcf30..8807b8f 100755
--- a/nifi-nar-bundles/pom.xml
+++ b/nifi-nar-bundles/pom.xml
@@ -113,6 +113,23 @@
         </plugins>
     </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>
         <dependencies>
             <dependency>


Mime
View raw message