diff --git a/.idea/libraries/JSch.xml b/.idea/libraries/JSch.xml new file mode 100644 index 000000000000..4f02d423ca41 --- /dev/null +++ b/.idea/libraries/JSch.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 9be221c1865e..33cf1b14881b 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -278,7 +278,6 @@ public def layoutCommunityPlugins(String home) { } fileset(dir: "$home/plugins/git4idea/lib/jgit") { include(name: "org.eclipse.jgit*.jar") - include(name: "jsch*.jar") exclude(name: "*.zip") } } diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index b066904d60ba..a20e60893e35 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -195,7 +195,7 @@ libraryLicense(name: "JGoodies Forms", libraryName: "jgoodies-forms", version: " libraryLicense(name: "JGoodies Looks", libraryName: "jgoodies-looks", version: "2.4.2", license: "BSD ", url: "http://www.jgoodies.com/freeware/looks/", licenseUrl: "http://www.jgoodies.com/downloads/libraries.html") libraryLicense(name: "JGoodies Common", libraryName: "jgoodies-common", version: "1.2.1", license: "BSD ", url: "http://www.jgoodies.com/freeware/looks/", licenseUrl: "http://www.jgoodies.com/downloads/libraries.html") libraryLicense(name: "JNA", libraryName: "jna", version: "3.4.0", license: "LGPL 2.1", url: "https://jna.dev.java.net/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php") -libraryLicense(name: "JSch", libraryName: "JSch", version: "0.1.44", license: "BSD", url: "http://www.jcraft.com/jsch/", licenseUrl: "http://www.jcraft.com/jsch/LICENSE.txt") +libraryLicense(name: "JSch", libraryName: "JSch", version: "0.1.49", license: "BSD", url: "http://www.jcraft.com/jsch/", licenseUrl: "http://www.jcraft.com/jsch/LICENSE.txt") libraryLicense(name: "JUnit", libraryName: "JUnit3", version: "3.8.1", license: "CPL 1.0", url: "http://junit.org/") libraryLicense(name: "JUnit", libraryName: "JUnit4", version: "4.8", license: "CPL 1.0", url: "http://junit.org/") libraryLicense(name: "Log4j", libraryName: "Log4J", version: "1.2", license: "Apache 2.0", url: "http://logging.apache.org/log4j/1.2/index.html", licenseUrl: "http://logging.apache.org/license.html") diff --git a/lib/jsch-0.1.49.jar b/lib/jsch-0.1.49.jar new file mode 100644 index 000000000000..18e31bacbb32 Binary files /dev/null and b/lib/jsch-0.1.49.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 0c24b25d83c2..6f6e00443b90 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -19,6 +19,7 @@ jgoodies-forms.jar jh.jar jna-utils.jar jna.jar +jsch-0.1.49.jar jsr173_1.0_api.jar junit.jar junit-4.10.jar diff --git a/lib/src/jsch-0.1.49-sources.jar b/lib/src/jsch-0.1.49-sources.jar new file mode 100644 index 000000000000..73f3b4fefae7 Binary files /dev/null and b/lib/src/jsch-0.1.49-sources.jar differ diff --git a/plugins/git4idea/git4idea.iml b/plugins/git4idea/git4idea.iml index 9871c3cff054..796e2f7e0852 100644 --- a/plugins/git4idea/git4idea.iml +++ b/plugins/git4idea/git4idea.iml @@ -61,22 +61,11 @@ - - - - - - - - - - - - + diff --git a/plugins/git4idea/lib/jgit/jsch-0.1.44.jar b/plugins/git4idea/lib/jgit/jsch-0.1.44.jar deleted file mode 100644 index 644850c83eb7..000000000000 Binary files a/plugins/git4idea/lib/jgit/jsch-0.1.44.jar and /dev/null differ diff --git a/plugins/git4idea/lib/jgit/jsch-0.1.44.zip b/plugins/git4idea/lib/jgit/jsch-0.1.44.zip deleted file mode 100644 index 10f3e7cc34d6..000000000000 Binary files a/plugins/git4idea/lib/jgit/jsch-0.1.44.zip and /dev/null differ