diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml
index 6109eb8210..fb61fb16e2 100644
--- a/minifi/minifi-assembly/pom.xml
+++ b/minifi/minifi-assembly/pom.xml
@@ -54,7 +54,6 @@ limitations under the License.
dir
zip
- tar.gz
@@ -399,5 +398,45 @@ limitations under the License.
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ minifi-${project.version}
+ false
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0775
+ 0775
+ 0664
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+
+ tar.gz
+
+
+
+
+
+
+
+
diff --git a/minifi/minifi-c2/minifi-c2-assembly/pom.xml b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
index 957fa9146b..388322a484 100644
--- a/minifi/minifi-c2/minifi-c2-assembly/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
@@ -64,6 +64,7 @@ limitations under the License.
src/main/assembly/dependencies.xml
posix
+ zip
\
@@ -180,4 +181,45 @@ limitations under the License.
war
+
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ minifi-c2-${project.version}
+ false
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0755
+ 0755
+ 0644
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+ tar.gz
+ \
+
+
+
+
+
+
+
+
diff --git a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
index dd8e3b361c..478e97b555 100644
--- a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
+++ b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
@@ -49,7 +49,7 @@ limitations under the License.
src/main/assembly/dependencies.xml
- posix
+ zip
@@ -63,4 +63,44 @@ limitations under the License.
${project.version}
+
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ minifi-toolkit-${project.version}
+ false
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0755
+ 0755
+ 0644
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+ tar.gz
+
+
+
+
+
+
+
+
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index c3a814511b..80a24b4d11 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -70,7 +70,6 @@ language governing permissions and limitations under the License. -->
dir
zip
- tar.gz
@@ -1102,6 +1101,44 @@ language governing permissions and limitations under the License. -->
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+
+ make shared resource
+
+ single
+
+ package
+
+ nifi-${project.version}
+ false
+
+ 0775
+ 0775
+ 0664
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+
+ tar.gz
+
+
+
+
+
+
+
+
rpm
diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
index d321fc1e10..554aa4454d 100644
--- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
+++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
@@ -165,7 +165,7 @@
posix
- tar.gz
+ zip
@@ -173,4 +173,47 @@
+
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ nifi-kafka-connector-assembly-${project.version}
+ true
+ false
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0775
+ 0775
+ 0664
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+
+ tar.gz
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nifi-registry/nifi-registry-assembly/pom.xml b/nifi-registry/nifi-registry-assembly/pom.xml
index b8080f6759..a5d838fa84 100644
--- a/nifi-registry/nifi-registry-assembly/pom.xml
+++ b/nifi-registry/nifi-registry-assembly/pom.xml
@@ -48,6 +48,7 @@
src/main/assembly/dependencies.xml
posix
+ zip
@@ -463,5 +464,80 @@
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ nifi-registry-${project.version}
+ false
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0775
+ 0775
+ 0664
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+ tar.gz
+
+
+
+
+
+
+
+
+ dir-only
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ nifi-registry-${project.version}
+ false
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0775
+ 0775
+ 0664
+
+
+ src/main/assembly/dependencies.xml
+
+ dir
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml
index 1c3a09ab4c..d5a7acff90 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/pom.xml
@@ -51,10 +51,45 @@
src/main/assembly/extension.xml
+ zip
+
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ true
+
+
+
+ assemble-aws-extensions
+
+ single
+
+ package
+
+
+ src/main/assembly/extension.xml
+
+ posix
+ tar.gz
+
+
+
+
+
+
+
+
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml
index 011a9956ec..ae3c945f00 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/pom.xml
@@ -56,10 +56,45 @@
src/main/assembly/extension.xml
+ zip
+
+
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ true
+
+
+
+ assembly-ranger-extension
+
+ single
+
+ package
+
+
+ src/main/assembly/extension.xml
+
+ tar.gz
+
+
+
+
+
+
+
+
diff --git a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml
index f0cf222a8a..1beb2d732b 100644
--- a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml
+++ b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/pom.xml
@@ -43,6 +43,7 @@ language governing permissions and limitations under the License. -->
src/main/assembly/dependencies.xml
posix
+ zip
@@ -65,4 +66,43 @@ language governing permissions and limitations under the License. -->
logback-classic
+
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ nifi-registry-toolkit-${project.version}
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0755
+ 0755
+ 0644
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+ tar.gz
+
+
+
+
+
+
+
+
diff --git a/nifi-stateless/nifi-stateless-assembly/pom.xml b/nifi-stateless/nifi-stateless-assembly/pom.xml
index 3cf0812b7f..83d1eabf96 100644
--- a/nifi-stateless/nifi-stateless-assembly/pom.xml
+++ b/nifi-stateless/nifi-stateless-assembly/pom.xml
@@ -172,7 +172,7 @@
posix
dir
- tar.gz
+ zip
@@ -225,5 +225,46 @@
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ nifi-stateless-${project.version}
+ false
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0775
+ 0775
+ 0664
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+
+ dir
+ tar.gz
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nifi-toolkit/nifi-toolkit-assembly/pom.xml b/nifi-toolkit/nifi-toolkit-assembly/pom.xml
index 760b66d701..2ab5f356d0 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-assembly/pom.xml
@@ -55,6 +55,7 @@ language governing permissions and limitations under the License. -->
src/main/assembly/dependencies.xml
posix
+ zip
@@ -396,5 +397,78 @@ language governing permissions and limitations under the License. -->
+
+ targz
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ nifi-toolkit-${project.version}
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0755
+ 0755
+ 0644
+
+
+ src/main/assembly/dependencies.xml
+
+ posix
+ tar.gz
+
+
+
+
+
+
+
+
+ dir-only
+
+ false
+
+
+
+
+ maven-assembly-plugin
+
+ nifi-toolkit-${project.version}
+
+
+
+ make shared resource
+
+ single
+
+ package
+
+
+ 0755
+ 0755
+ 0644
+
+
+ src/main/assembly/dependencies.xml
+
+ dir
+
+
+
+
+
+
+