diff --git a/.idea/libraries/JSch.xml b/.idea/libraries/JSch.xml index aa824af4653c..7748450b9444 100644 --- a/.idea/libraries/JSch.xml +++ b/.idea/libraries/JSch.xml @@ -1,11 +1,12 @@ - + + - + - + \ No newline at end of file diff --git a/lib/jsch-0.1.54.jar b/lib/jsch-0.1.54.jar deleted file mode 100644 index 1372c8e98f61..000000000000 Binary files a/lib/jsch-0.1.54.jar and /dev/null differ diff --git a/lib/src/jsch-0.1.54.zip b/lib/src/jsch-0.1.54.zip deleted file mode 100644 index 37e74bd6e0a2..000000000000 Binary files a/lib/src/jsch-0.1.54.zip and /dev/null differ diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildUtils.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildUtils.groovy index 03f1fd6d5689..a67431b321f5 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildUtils.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildUtils.groovy @@ -120,13 +120,17 @@ class BuildUtils { * Defines sshexec task using libraries from IntelliJ IDEA project sources. */ @CompileDynamic - static void defineSshTask(AntBuilder ant, String communityLib) { + static void defineSshTask(BuildContext context) { + List jschJars = context.project.libraryCollection.findLibrary("JSch").getFiles(JpsOrderRootType.COMPILED) + + [new File(context.paths.communityHome, "lib/ant/lib/ant-jsch.jar")] + def ant = context.ant def sshTaskLoaderRef = "SSH_TASK_CLASS_LOADER" if (ant.project.hasReference(sshTaskLoaderRef)) return Path pathSsh = new Path(ant.project) - pathSsh.createPathElement().setLocation(new File("$communityLib/jsch-0.1.54.jar")) - pathSsh.createPathElement().setLocation(new File("$communityLib/ant/lib/ant-jsch.jar")) + jschJars.each { + pathSsh.createPathElement().setLocation(it) + } ant.project.addReference(sshTaskLoaderRef, new SplitClassLoader(ant.project.getClass().getClassLoader(), pathSsh, ant.project, ["SSHExec", "SSHBase", "LogListener", "SSHUserInfo"] as String[])) ant.taskdef(name: "sshexec", classname: "org.apache.tools.ant.taskdefs.optional.ssh.SSHExec", loaderRef: sshTaskLoaderRef) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy index ec87fcd2826d..774f8a522c34 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy @@ -62,7 +62,7 @@ class MacDmgBuilder { private static MacDmgBuilder createInstance(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties) { BuildUtils.defineFtpTask(buildContext) - BuildUtils.defineSshTask(buildContext.ant, "${buildContext.paths.communityHome}/lib") + BuildUtils.defineSshTask(buildContext) String currentDateTimeString = LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME).replace(':', '-') int randomSeed = new Random().nextInt(Integer.MAX_VALUE)