Zond: патчим Apache Exec

zond/build.gradle

@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.3-SNAPSHOT'
+version = '0.4-SNAPSHOT'
 
 apply plugin: 'application'
 
@@ -7,16 +7,25 @@ mainClassName = "asys.zond.Main"
 
 configurations {
     included
+    includedEx
     compile.extendsFrom included
+    compile.extendsFrom includedEx
 }
 
 compileJava {
     dependsOn ':bridge-protocol:compileJava'
 }
 
+def zp(FileTree ft) {
+    return ft.matching {
+        exclude 'org/apache/commons/exec/StreamPumper.class'
+    }
+}
+
 jar {
     dependsOn ':bridge-protocol:jar'
     dependsOn configurations.included
+    dependsOn configurations.includedEx
     manifest {
         attributes 'Implementation-Title': 'ASys Zond',
                    'Implementation-Version': version,
@@ -24,6 +33,7 @@ jar {
     }
     baseName = project.group + '.' + project.name
     from { configurations.included.collect { it.isDirectory() ? it : zipTree(it) } }
+    from { configurations.includedEx.collect { it.isDirectory() ? it : zp(zipTree(it)) } }
 }
 
 ext {
@@ -33,7 +43,7 @@ ext {
 dependencies {
     included files(project(':bridge-protocol').sourceSets.main.output.classesDir)
     included group: 'org.fusesource.jansi', name: 'jansi', version: '1.11'
-    included group: 'org.apache.commons', name: 'commons-exec', version: '1.3'
+    includedEx group: 'org.apache.commons', name: 'commons-exec', version: '1.3'
     included group: 'io.netty', name: 'netty-codec', version: nettyVersion
     included group: 'com.google.guava', name: 'guava', version: '21.0'
 }