From 8c1cf8351063a4e453d362c394516df26ec60e94 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 11 Oct 2017 11:26:10 +0300 Subject: [PATCH] build scripts: get paths to JUnit4 JARs from project configuration These JARs aren't located under community/lib since JUnit4 was converted to a repository library. --- .../org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy index 9ca242bd9cfb..95bcae556cde 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy @@ -7,6 +7,7 @@ import org.jetbrains.intellij.build.* import org.jetbrains.jps.model.artifact.JpsArtifactService import org.jetbrains.jps.model.java.JavaResourceRootType import org.jetbrains.jps.model.java.JavaSourceRootType +import org.jetbrains.jps.model.library.JpsOrderRootType import org.jetbrains.jps.model.module.JpsModule import java.time.ZoneOffset @@ -362,9 +363,8 @@ idea.fatal.error.notification=disabled } buildContext.ant.zip(destfile: "$buildContext.paths.artifacts/internalUtilities.zip") { fileset(file: "$buildContext.paths.buildOutputRoot/internal/internalUtilities.jar") - fileset(dir: "$buildContext.paths.communityHome/lib") { - include(name: "junit-4*.jar") - include(name: "hamcrest-core-*.jar") + buildContext.project.libraryCollection.findLibrary("JUnit4").getFiles(JpsOrderRootType.COMPILED).each { + fileset(file: it.absolutePath) } zipfileset(src: "$buildContext.paths.buildOutputRoot/internal/internalUtilities.jar") { include(name: "*.xml")