From bb613281636ff0575f286684645e3aba0dce1797 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 22 May 2018 09:40:08 +0300 Subject: [PATCH] build scripts: restore JAR name in intellij-core artifact Rename annotations-java5-16.0.2.jar to annotations.jar to fix compatibility with Kotlin build scripts. --- .../intellij/build/IntelliJCoreArtifactsBuilder.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy index b7919ea40ba5..aef83b69613b 100644 --- a/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy @@ -93,11 +93,13 @@ class IntelliJCoreArtifactsBuilder { [ "ASM", "Guava", "picocontainer", "Trove4j", "cli-parser", "lz4-java", "jayatana", "imgscalr", "batik", "xmlgraphics-commons", - "JDOM", "OroMatcher", "jna", "Log4J", "StreamEx", "jetbrains-annotations-java5" + "JDOM", "OroMatcher", "jna", "Log4J", "StreamEx" ].each { projectLibrary(it) } + projectLibrary("jetbrains-annotations-java5", true) } + ant.move(file: "$coreArtifactDir/annotations-java5.jar", tofile: "$coreArtifactDir/annotations.jar") buildContext.notifyArtifactBuilt(coreArtifactDir) def intellijCoreZip = "${buildContext.paths.artifacts}/intellij-core-${buildContext.buildNumber}.zip"