diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/jsch-0.1.50.jar | bin | 249317 -> 0 bytes | |||
| -rw-r--r-- | lib/jsch-0.1.51.jar | bin | 0 -> 260010 bytes | |||
| -rw-r--r-- | lib/required_for_dist.txt | 4 | ||||
| -rw-r--r-- | lib/src/ecjsrc-4.3.2.jar | bin | 1451984 -> 0 bytes | |||
| -rw-r--r-- | lib/src/jsch-0.1.50.zip | bin | 351616 -> 0 bytes | |||
| -rw-r--r-- | lib/src/jsch-0.1.51.zip | bin | 0 -> 359905 bytes | |||
| -rw-r--r-- | lib/src/winp-1.17-patched-src.zip | bin | 17906 -> 0 bytes | |||
| -rw-r--r-- | lib/src/winp-1.21-patched.zip | bin | 0 -> 44830 bytes | |||
| -rw-r--r-- | lib/src/winp.patch | 26 | ||||
| -rw-r--r-- | lib/winp-1.17-patched.jar | bin | 27960 -> 0 bytes | |||
| -rw-r--r-- | lib/winp-1.21-patched.jar | bin | 0 -> 27809 bytes |
11 files changed, 28 insertions, 2 deletions
diff --git a/lib/jsch-0.1.50.jar b/lib/jsch-0.1.50.jar Binary files differdeleted file mode 100644 index de6cd0cda26b..000000000000 --- a/lib/jsch-0.1.50.jar +++ /dev/null diff --git a/lib/jsch-0.1.51.jar b/lib/jsch-0.1.51.jar Binary files differnew file mode 100644 index 000000000000..70d13988ccec --- /dev/null +++ b/lib/jsch-0.1.51.jar diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 094e94784836..997eb52a6fc6 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -30,7 +30,7 @@ jgoodies-looks-2.4.2.jar jh.jar jna-utils.jar jna.jar -jsch-0.1.50.jar +jsch-0.1.51.jar jsch.agentproxy.connector-factory.jar jsch.agentproxy.core.jar jsch.agentproxy.pageant.jar @@ -63,7 +63,7 @@ snappy-in-java-0.3.jar swingx-core-1.6.2.jar trove4j.jar velocity.jar -winp-1.17-patched.jar +winp-1.21-patched.jar xbean.jar xerces.jar xmlrpc-2.0.jar diff --git a/lib/src/ecjsrc-4.3.2.jar b/lib/src/ecjsrc-4.3.2.jar Binary files differdeleted file mode 100644 index 5d54db8bb843..000000000000 --- a/lib/src/ecjsrc-4.3.2.jar +++ /dev/null diff --git a/lib/src/jsch-0.1.50.zip b/lib/src/jsch-0.1.50.zip Binary files differdeleted file mode 100644 index a90c40d2f272..000000000000 --- a/lib/src/jsch-0.1.50.zip +++ /dev/null diff --git a/lib/src/jsch-0.1.51.zip b/lib/src/jsch-0.1.51.zip Binary files differnew file mode 100644 index 000000000000..f4652c479d8c --- /dev/null +++ b/lib/src/jsch-0.1.51.zip diff --git a/lib/src/winp-1.17-patched-src.zip b/lib/src/winp-1.17-patched-src.zip Binary files differdeleted file mode 100644 index 02f7972bc776..000000000000 --- a/lib/src/winp-1.17-patched-src.zip +++ /dev/null diff --git a/lib/src/winp-1.21-patched.zip b/lib/src/winp-1.21-patched.zip Binary files differnew file mode 100644 index 000000000000..24a308323632 --- /dev/null +++ b/lib/src/winp-1.21-patched.zip diff --git a/lib/src/winp.patch b/lib/src/winp.patch new file mode 100644 index 000000000000..c3828306e8ee --- /dev/null +++ b/lib/src/winp.patch @@ -0,0 +1,26 @@ +diff -ur winp-winp-1.17/src/main/java/org/jvnet/winp/Native.java winp-1.17-patched/src/main/java/org/jvnet/winp/Native.java +--- winp-winp-1.17/src/main/java/org/jvnet/winp/Native.java 2013-01-03 09:26:13.000000000 +0400 ++++ winp-1.17-patched/src/main/java/org/jvnet/winp/Native.java 2013-02-25 16:23:24.000000000 +0400 +@@ -47,6 +47,7 @@ + private static final Logger LOGGER = Logger.getLogger(Native.class.getName()); + // system property holding the preferred folder for copying the dll file to. + private static final String DLL_TARGET = "winp.folder.preferred"; ++ private static final String UNPACK_DLL_TO_PARENT_DIR = "winp.unpack.dll.to.parent.dir"; + + static { + load(); +@@ -61,7 +62,12 @@ + final URL res = Native.class.getClassLoader().getResource(dllName+".dll"); + if(res!=null) { + String url = res.toExternalForm(); +- if(url.startsWith("jar:") || url.startsWith("wsjar:")) { ++ ++ //patched by JetBrains: do not try to unpack the dll file to the directory containing the jar file by default. ++ // It can fail because the process has no rights to write to that directory and also pollutes the project directories if the jar is used in development mode. ++ boolean unpackToParentDir = Boolean.parseBoolean(System.getProperty(UNPACK_DLL_TO_PARENT_DIR)); ++ ++ if(unpackToParentDir && (url.startsWith("jar:") || url.startsWith("wsjar:"))) { + int idx = url.lastIndexOf('!'); + String filePortion = url.substring(url.indexOf(':')+1,idx); + while(filePortion.startsWith("/")) + diff --git a/lib/winp-1.17-patched.jar b/lib/winp-1.17-patched.jar Binary files differdeleted file mode 100644 index 21a670e11aba..000000000000 --- a/lib/winp-1.17-patched.jar +++ /dev/null diff --git a/lib/winp-1.21-patched.jar b/lib/winp-1.21-patched.jar Binary files differnew file mode 100644 index 000000000000..76141dcd8911 --- /dev/null +++ b/lib/winp-1.21-patched.jar |