Improvement to deployment installDist task (#22)

Author: richturner

deployment/build.gradle

@@ -1,7 +1,12 @@
 apply plugin: "java-library"
 
+configurations {
+    managerRuntime
+}
+
 dependencies {
     api project(":setup")
+    managerRuntime "io.openremote:openremote-manager:$openremoteVersion"
 }
 
 tasks.register('license') {
@@ -35,10 +40,14 @@ tasks.register('installDist', Copy) {
 
     into("image") {
         from projectDir
-        exclude "build.gradle", "Dockerfile", "build", "**/*.mbtiles", "src", "**/*.md", ".gitignore"
+        exclude "build.gradle", "Dockerfile", "build", "**/*.mbtiles", "src", "**/*.md", ".gitignore", "**/*.encrypted"
     }
 
     into("image/manager/extensions") {
-        from getDeploymentJars()
+        from configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts.collect {it.file }
+        // Don't include deps baked into the manager docker image
+        exclude configurations.managerRuntime.resolvedConfiguration.resolvedArtifacts.collect {it.file.name }
+        // Don't include any ui packaged JARs (used for dev purposes only)
+        exclude { (it.file.path.contains(".gradle")  || it.file.path.contains(".m2")) && it.file.path.contains("io.openremote.ui") }
     }
 }

project.gradle

@@ -306,26 +306,10 @@ def getYarnInstallTask() {
     }
 }
 
-// Gets the list of runtime JAR dependencies; can be used in custom project deployment installDist task to populate
-// extensions directory
-def getDeploymentJars(Project project = project) {
-    if (project.configurations.find { it.name == "runtimeClasspath" } == null) {
-        return []
-    }
-
-    // Dependencies already part of the manager are excluded so they do not appear on the classpath twice
-    return project.configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts
-            .findAll { !it.file.path.contains(".gradle") && !it.file.path.contains(".m2") }
-            .collect {
-                println "CopyLibs Artifact: ${it.file.path}"
-                return it.file
-            }
-}
 
 ext {
     resolveTask = this.&resolveTask
     getYarnInstallTask = this.&getYarnInstallTask
-    getDeploymentJars = this.&getDeploymentJars
     createTSGeneratorConfigForClient = this.&createTSGeneratorConfigForClient
     createTSGeneratorConfigForModel = this.&createTSGeneratorConfigForModel
 }