Some forgotten cleanup left over from building the Confluent archive.

Author: BillFarber

build.gradle

@@ -79,13 +79,15 @@ task deploy {
 
 // Tasks for building the archive required for submitting to the Confluence Connector Hub
 import org.apache.tools.ant.filters.*
+def baseArchiveBuildDir = "build/connectorArchive"
+def baseArchiveName = "${componentOwner}-${componentName}-${version}"
 task connectorArchive_CopyManifestToBuildDirectory(type: Copy) {
     description = "Copy the project manifest into the root folder"
     group = 'connector archive'
 
     from '.'
     include 'manifest.json'
-    into 'build/connectorArchive'
+    into "${baseArchiveBuildDir}/${baseArchiveName}"
     filter(ReplaceTokens, tokens:[CONFLUENT_USER:componentOwner, VERSION:version])
 }
 
@@ -94,7 +96,7 @@ task connectorArchive_CopyAssetsToBuildDirectory(type: Copy) {
     group = 'connector archive'
 
     from configurations.assets
-    into 'build/connectorArchive/assets'
+    into "${baseArchiveBuildDir}/${baseArchiveName}/assets"
 }
 
 task connectorArchive_CopyEtcToBuildDirectory(type: Copy) {
@@ -103,15 +105,15 @@ task connectorArchive_CopyEtcToBuildDirectory(type: Copy) {
 
     from 'config'
     include '*'
-    into 'build/connectorArchive/etc'
+    into "${baseArchiveBuildDir}/${baseArchiveName}/etc"
 }
 
 task connectorArchive_CopyDocumentationToBuildDirectory(type: Copy) {
     description = "Copy the project documentation into the doc folder"
     group = 'connector archive'
 
     from configurations.documentation
-    into 'build/connectorArchive/doc'
+    into "${baseArchiveBuildDir}/${baseArchiveName}/doc"
 }
 
 task connectorArchive_CopyDependenciesToBuildDirectory(type: Copy) {
@@ -121,7 +123,7 @@ task connectorArchive_CopyDependenciesToBuildDirectory(type: Copy) {
 
     from jar
     from configurations.compile
-    into 'build/connectorArchive/lib'
+    into "${baseArchiveBuildDir}/${baseArchiveName}/lib"
 }
 
 task connectorArchive_BuildDirectory() {
@@ -138,9 +140,8 @@ task connectorArchive(type: Zip, dependsOn: connectorArchive_BuildDirectory) {
     description = 'Build a Connector Hub for the Confluent Connector Hub'
     group = 'connector archive'
 
-    from 'build/connectorArchive'
-    include '*'
-    include '*/*'
-    archiveName "${componentOwner}-${componentName}-${version}.zip"
+    from "${baseArchiveBuildDir}"
+    include '**/*'
+    archiveName "${baseArchiveName}.zip"
     destinationDir(file('build/distro'))
 }