From d069bf9c3ee83a6fa41f36065131f72ade74fc70 Mon Sep 17 00:00:00 2001
From: Joey Frazee <jfrazee@apache.org>
Date: Fri, 5 May 2017 18:10:14 +0000
Subject: [PATCH] NIFI-3815 This closes #1763. Fix build RPM using mvn install
 -Prpm,generateArchives

Signed-off-by: joewitt <joewitt@apache.org>
---
 nifi-assembly/pom.xml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index c92228e412..1fb72e2e9f 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -522,17 +522,13 @@
                         <configuration>
                             <name>nifi</name>
                             <summary>Apache NiFi</summary>
-                            <description>Apache NiFi is dataflow system
-                                based on the Flow-Based Programming
-                                concepts.</description>
-                            <license>Apache License, Version 2.0 and
-                                others (see included LICENSE file)</license>
+                            <description>Apache NiFi is dataflow system based on the Flow-Based Programming concepts.</description>
+                            <license>Apache License, Version 2.0 and others (see included LICENSE file)</license>
                             <url>http://nifi.apache.org</url>
                             <group>Utilities</group>
                             <prefix>/opt/nifi</prefix>
                             <defineStatements>
-                                <defineStatement>_use_internal_dependency_generator
-                                    0</defineStatement>
+                                <defineStatement>_use_internal_dependency_generator 0</defineStatement>
                             </defineStatements>
                             <defaultDirmode>750</defaultDirmode>
                             <defaultFilemode>640</defaultFilemode>
@@ -548,15 +544,7 @@
                                 <script>sed -i s/^run\.as=$/run\.as=${nifi.run.as}/ $RPM_BUILD_ROOT/opt/nifi/nifi-${project.version}/conf/bootstrap.conf</script>
                             </installScriptlet>
                             <preinstallScriptlet>
-                                <script>
-                                    /usr/bin/getent group nifi
-                                    &gt;/dev/null || /usr/sbin/groupadd
-                                    -r nifi; /usr/bin/getent passwd nifi
-                                    &gt;/dev/null || /usr/sbin/useradd
-                                    -r -g nifi -d /opt/nifi -s
-                                    /sbin/nologin -c "NiFi System User"
-                                    nifi
-                                </script>
+                                <script>/usr/bin/getent group nifi &gt;/dev/null || /usr/sbin/groupadd -r nifi; /usr/bin/getent passwd nifi &gt;/dev/null || /usr/sbin/useradd -r -g nifi -d /opt/nifi -s /sbin/nologin -c "NiFi System User" nifi</script>
                             </preinstallScriptlet>
                         </configuration>
                         <executions>