Retrograde ant dependency to 1.7.1

rundeck · Nov 2, 2011 · d5d0bb9 · d5d0bb9
1 parent 16121fc
commit d5d0bb9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 118 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -17,8 +17,8 @@ repositories {
 }
 dependencies {
     compile( 
-        [group: 'ant', name: 'ant', version: '1.8.1',ext:'jar'],
-        [group: 'ant-launcher', name: 'ant-launcher', version: '1.8.1',ext:'jar'],
+        [group: 'org.apache.ant', name: 'ant', version: '1.7.1',ext:'jar'],
+        [group: 'org.apache.ant', name: 'ant-launcher', version: '1.7.1',ext:'jar'],
         [group: 'log4j', name: 'log4j', version: '1.2.15',ext:'jar'],
         [group: 'commons-codec', name: 'commons-codec', version: '1.3',ext:'jar'],
         [group: 'commons-httpclient', name: 'commons-httpclient', version: '3.0.1',ext:'jar'],
@@ -31,7 +31,7 @@ dependencies {
         [group: 'dom4j', name: 'dom4j', version: '1.6.1',ext:'jar'],
         [group: 'jaxen', name: 'jaxen', version: '1.1',ext:'jar'],
         [group: 'commons-cli', name: 'commons-cli', version: '1.0',ext:'jar'],
-        [group: 'ant-jsch', name: 'ant-jsch', version: '1.8.1',ext:'jar'],
+        [group: 'ant-jsch', name: 'ant-jsch', version: '1.7.1',ext:'jar'],
         [group: 'jsch', name: 'jsch', version: '0.1.42',ext:'jar'],
         [group: 'org.yaml',name:'snakeyaml',version:'1.9']
     )

diff --git a/core/src/java/com/dtolabs/rundeck/core/common/impl/AntGetTaskUpdater.java b/core/src/java/com/dtolabs/rundeck/core/common/impl/AntGetTaskUpdater.java
diff --git a/core/src/java/com/dtolabs/rundeck/core/tasks/net/ExtSSHExec.java b/core/src/java/com/dtolabs/rundeck/core/tasks/net/ExtSSHExec.java
@@ -268,9 +268,8 @@ && getUserInfo().getPassword() == null) {
     private void executeCommand(Session session, String cmd, StringBuffer sb)
         throws BuildException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        TeeOutputStream tee =
-            new TeeOutputStream(out,
-                                KeepAliveOutputStream.wrapSystemOut());
+        TeeOutputStream tee = 
+            new TeeOutputStream(out, new KeepAliveOutputStream(System.out));
 
         InputStream istream = null ;
         if (inputFile != null) {