diff --git a/.idea/libraries/netty_jps.xml b/.idea/libraries/netty_jps.xml deleted file mode 100644 index f03dd8a2a528..000000000000 --- a/.idea/libraries/netty_jps.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - c78613ac0db94650c03a37b2a35b3238b2d018fcac9f10e5fe268c3887cf5e0b - - - 7d01bf0334ffa3ab55f3828bb50188bf9969774a23791a3df1905e53bfeea8f5 - - - 0b93f01cff5bc2a64af829ca01c826e8e861a03b96a871fa2a240fa25681df78 - - - a7e19945a6baa86ab285383a0bda632eae7703a889da1d20ea4eaad4c996cc21 - - - 5b4e125a341566b24d5030479da475b20ea1f6145bf7b3c3d69fe537088bb4c1 - - - f3272149099883cf98ad8a2a82a08111a78d17e604aebc094c80592a730fcac5 - - - 0f5f7220d34d32751cc624bc9c47afdde7392f0d9551569c90a568309015d796 - - - c07aac2ea55aa42c34fc6b53fbee661e0de077f45483133b6ca297c70a67a44a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/BUILD.bazel b/build/BUILD.bazel index 3fcdbf9afa9f..538fc20b88aa 100644 --- a/build/BUILD.bazel +++ b/build/BUILD.bazel @@ -118,7 +118,9 @@ jvm_library( "//libraries/javax/annotation", "@lib//:jps-javac-extension", "//libraries/protobuf", - "@lib//:netty-jps-provided", + "@lib//:netty-codec-protobuf", + "//libraries/netty/codec-http:libraries-netty-codec-http", + "//libraries/netty/buffer", ] ) ### auto-generated section `build intellij.platform.jps.build.javac.rt` end \ No newline at end of file diff --git a/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml b/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml index e7b76ac6986e..713d2018c76d 100644 --- a/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml +++ b/build/jvm-rules/jps-builders-6/intellij.platform.jps.build.javac.rt.iml @@ -13,6 +13,8 @@ - + + + \ No newline at end of file diff --git a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt index aeafa7ce13fb..63af319529b9 100644 --- a/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt +++ b/build/src/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.kt @@ -106,7 +106,9 @@ suspend fun buildCommunityStandaloneJpsBuilder( "jna", "Log4J", "Eclipse", - "netty-jps", + "netty-codec-http", + "netty-buffer", + "netty-codec-protobuf", "slf4j-api", "jetbrains-annotations", "jps-javac-extension", diff --git a/java/plugin/plugin-content.yaml b/java/plugin/plugin-content.yaml index 7c78d6e0f479..decd92352d09 100644 --- a/java/plugin/plugin-content.yaml +++ b/java/plugin/plugin-content.yaml @@ -67,10 +67,6 @@ - name: lib/modules/intellij.java.compiler.impl.jar contentModules: - name: intellij.java.compiler.impl - library: netty-codec-protobuf - files: - - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4/netty-codec-protobuf-4.jar - reason: <- intellij.java.compiler.impl - name: lib/modules/intellij.java.compiler.jar contentModules: - name: intellij.java.compiler @@ -249,23 +245,16 @@ - name: lib/modules/intellij.uiDesigner.jar contentModules: - name: intellij.uiDesigner +- name: lib/netty-codec-protobuf.jar + library: netty-codec-protobuf + files: + - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4/netty-codec-protobuf-4.jar + reason: withProjectLibrary - name: lib/rt/debugger-agent.jar library: debugger-agent module: intellij.java.debugger.agent.holder files: - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/debugger-agent/1/debugger-agent-1.jar -- name: lib/rt/netty-jps.jar - library: netty-jps - files: - - name: $MAVEN_REPOSITORY$/io/netty/netty-all/4/netty-all-4.jar - - name: $MAVEN_REPOSITORY$/io/netty/netty-buffer/4/netty-buffer-4.jar - - name: $MAVEN_REPOSITORY$/io/netty/netty-codec/4/netty-codec-4.jar - - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-http/4/netty-codec-http-4.jar - - name: $MAVEN_REPOSITORY$/io/netty/netty-common/4/netty-common-4.jar - - name: $MAVEN_REPOSITORY$/io/netty/netty-handler/4/netty-handler-4.jar - - name: $MAVEN_REPOSITORY$/io/netty/netty-resolver/4/netty-resolver-4.jar - - name: $MAVEN_REPOSITORY$/io/netty/netty-transport/4/netty-transport-4.jar - reason: withProjectLibrary - name: lib/sa-jdwp.jar library: sa-jdwp module: intellij.java.debugger.impl diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index 558adec7d04e..09be79f244f7 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -44,7 +44,9 @@ jvm_library( "//libraries/mvstore", "//libraries/http-client", "//libraries/maven-resolver-provider", - "@lib//:netty-jps-provided", + "@lib//:netty-codec-protobuf", + "//libraries/netty/codec-http:libraries-netty-codec-http", + "//libraries/netty/buffer", "@lib//:kotlin-metadata", "//libraries/kotlinx/coroutines/core", "//platform/eel", diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml index 6deb2cd20043..daf2246f6383 100644 --- a/jps/jps-builders/intellij.platform.jps.build.iml +++ b/jps/jps-builders/intellij.platform.jps.build.iml @@ -73,7 +73,9 @@ - + + + diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java index 70e8845d2892..f5a07e5d29ff 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java @@ -22,6 +22,12 @@ import com.intellij.util.lang.HashMapZipFile; import com.intellij.util.lang.JavaVersion; import com.jgoodies.forms.layout.CellConstraints; import com.thoughtworks.qdox.JavaProjectBuilder; +import io.netty.buffer.ByteBufAllocator; +import io.netty.channel.EventLoopGroup; +import io.netty.handler.codec.ByteToMessageDecoder; +import io.netty.handler.codec.protobuf.ProtobufDecoder; +import io.netty.resolver.AddressResolverGroup; +import io.netty.util.NetUtil; import kotlin.metadata.jvm.JvmMetadataUtil; import kotlinx.coroutines.Deferred; import net.n3.nanoxml.IXMLBuilder; @@ -29,7 +35,6 @@ import org.h2.mvstore.MVStore; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.VisibleForTesting; import org.jetbrains.idea.maven.aether.ArtifactRepositoryManager; import org.jetbrains.jps.builders.impl.java.EclipseCompilerTool; import org.jetbrains.jps.builders.java.JavaCompilingTool; @@ -46,7 +51,6 @@ import org.jetbrains.org.objectweb.asm.ClassWriter; import javax.tools.JavaCompiler; import javax.tools.ToolProvider; import java.io.File; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -59,23 +63,19 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import static org.jetbrains.jps.model.serialization.JpsMavenSettings.getMavenRepositoryPath; - @ApiStatus.Internal public final class ClasspathBootstrap { private static final Logger LOG = Logger.getInstance(ClasspathBootstrap.class); private ClasspathBootstrap() { } - private static final Class[] COMMON_REQUIRED_CLASSES = { - // Uncomment to use the same netty that is used in the rest of IDE - //NetUtil.class, // netty common - //EventLoopGroup.class, // netty transport - //AddressResolverGroup.class, // netty resolver - //ByteBufAllocator.class, // netty buffer - //ByteToMessageDecoder.class, // netty codec http - //ProtobufDecoder.class, // netty codec protobuf - + private static final Class[] COMMON_REQUIRED_CLASSES = new Class[]{ + NetUtil.class, // netty common + EventLoopGroup.class, // netty transport + AddressResolverGroup.class, // netty resolver + ByteBufAllocator.class, // netty buffer + ByteToMessageDecoder.class, // netty codec http + ProtobufDecoder.class, // netty codec protobuf Message.class, // protobuf }; @@ -105,30 +105,6 @@ public final class ClasspathBootstrap { "app-backend.java" }; - @VisibleForTesting - public static final String NETTY_JPS_VERSION = "4.1.117.Final"; - private static final String NETTY_JPS_DISTRIBUTION_JAR_NAME = "netty-jps.jar"; - private static final String[] NETTY_ARTIFACT_NAMES = { - "netty-buffer", "netty-codec-http", "netty-codec", "netty-common", "netty-handler", "netty-resolver", "netty-transport" - }; - - private static void getNettyForJpsClasspath(Consumer consumer) { - Path rootPath = Path.of(getResourcePath(ExternalJavacProcess.class)); - Path nettyDistributionPath = rootPath.resolveSibling("rt").resolve(NETTY_JPS_DISTRIBUTION_JAR_NAME); - if (Files.isRegularFile(rootPath) && Files.exists(nettyDistributionPath)) { - // running regular installation - consumer.accept(nettyDistributionPath); - } - else { - // running from sources or on the build server - // take the library from the local maven repository - Path artifactRoot = Path.of(getMavenRepositoryPath()).resolve("io").resolve("netty"); - for (String artifactName : NETTY_ARTIFACT_NAMES) { - consumer.accept(artifactRoot.resolve(artifactName).resolve(NETTY_JPS_VERSION).resolve(artifactName + "-" + NETTY_JPS_VERSION + ".jar")); - } - } - } - private static void addToClassPath(Set result, Class aClass) { Path path = PathManager.getJarForClass(aClass); if (path == null) { @@ -181,7 +157,6 @@ public final class ClasspathBootstrap { addToClassPath(cp, Deferred.class); // kotlinx.coroutines, used intellij.platform.util, EnvironmentUtil addToClassPath(cp, JvmMetadataUtil.class); // kotlin metadata parsing addToClassPath(cp, COMMON_REQUIRED_CLASSES); - getNettyForJpsClasspath(path -> cp.add(path.toString())); addToClassPath(cp, ClassWriter.class); // asm addToClassPath(cp, ClassVisitor.class); // asm-commons @@ -227,7 +202,7 @@ public final class ClasspathBootstrap { } public static List getExternalJavacProcessClasspath(String sdkHome, JavaCompilingTool compilingTool) { - // Important! All dependencies must be java 7 compatible (the oldest supported javac to be launched) + // Important! All dependencies must be java 8 compatible (the oldest supported javac to be launched) final Set cp = new LinkedHashSet<>(); cp.add(getResourceFile(ExternalJavacProcess.class)); // self cp.add(getResourceFile(JavacReferenceCollector.class)); // jps-javac-extension library @@ -236,7 +211,6 @@ public final class ClasspathBootstrap { for (Class aClass : COMMON_REQUIRED_CLASSES) { cp.add(getResourceFile(aClass)); } - getNettyForJpsClasspath(path -> cp.add(path.toFile())); try { final Class cmdLineWrapper = Class.forName("com.intellij.rt.execution.CommandLineWrapper"); diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 73447ee7ac55..9e5db513eeba 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -16642,139 +16642,6 @@ jvm_import( visibility = ["//visibility:public"] ) -copy_file( - name = "io.netty/netty-all-4.1.117.Final.jar_copy", - src = "@io_netty-netty-all-4_1_117_Final_http//file", - out = "io.netty/netty-all-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -copy_file( - name = "io.netty/netty-buffer-4.1.117.Final.jar_copy", - src = "@io_netty-netty-buffer-4_1_117_Final_http//file", - out = "io.netty/netty-buffer-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -copy_file( - name = "io.netty/netty-codec-4.1.117.Final.jar_copy", - src = "@io_netty-netty-codec-4_1_117_Final_http//file", - out = "io.netty/netty-codec-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -copy_file( - name = "io.netty/netty-codec-http-4.1.117.Final.jar_copy", - src = "@io_netty-netty-codec-http-4_1_117_Final_http//file", - out = "io.netty/netty-codec-http-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -copy_file( - name = "io.netty/netty-common-4.1.117.Final.jar_copy", - src = "@io_netty-netty-common-4_1_117_Final_http//file", - out = "io.netty/netty-common-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -copy_file( - name = "io.netty/netty-handler-4.1.117.Final.jar_copy", - src = "@io_netty-netty-handler-4_1_117_Final_http//file", - out = "io.netty/netty-handler-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -copy_file( - name = "io.netty/netty-resolver-4.1.117.Final.jar_copy", - src = "@io_netty-netty-resolver-4_1_117_Final_http//file", - out = "io.netty/netty-resolver-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -copy_file( - name = "io.netty/netty-transport-4.1.117.Final.jar_copy", - src = "@io_netty-netty-transport-4_1_117_Final_http//file", - out = "io.netty/netty-transport-4.1.117.Final.jar", - allow_symlink = True, - visibility = ["//visibility:public"] -) - -java_library( - name = "netty-jps", - exports = [ - ":io_netty-netty-all-4_1_117_Final_http_import", - ":io_netty-netty-buffer-4_1_117_Final_http_import", - ":io_netty-netty-codec-4_1_117_Final_http_import", - ":io_netty-netty-codec-http-4_1_117_Final_http_import", - ":io_netty-netty-common-4_1_117_Final_http_import", - ":io_netty-netty-handler-4_1_117_Final_http_import", - ":io_netty-netty-resolver-4_1_117_Final_http_import", - ":io_netty-netty-transport-4_1_117_Final_http_import", - ], - visibility = ["//visibility:public"] -) - -jvm_import( - name = "io_netty-netty-all-4_1_117_Final_http_import", - jar = "@io_netty-netty-all-4_1_117_Final_http//file" -) - -jvm_import( - name = "io_netty-netty-buffer-4_1_117_Final_http_import", - jar = "@io_netty-netty-buffer-4_1_117_Final_http//file", - source_jar = "@io_netty-netty-buffer-4_1_117_Final-sources_http//file" -) - -jvm_import( - name = "io_netty-netty-codec-4_1_117_Final_http_import", - jar = "@io_netty-netty-codec-4_1_117_Final_http//file", - source_jar = "@io_netty-netty-codec-4_1_117_Final-sources_http//file" -) - -jvm_import( - name = "io_netty-netty-codec-http-4_1_117_Final_http_import", - jar = "@io_netty-netty-codec-http-4_1_117_Final_http//file", - source_jar = "@io_netty-netty-codec-http-4_1_117_Final-sources_http//file" -) - -jvm_import( - name = "io_netty-netty-common-4_1_117_Final_http_import", - jar = "@io_netty-netty-common-4_1_117_Final_http//file", - source_jar = "@io_netty-netty-common-4_1_117_Final-sources_http//file" -) - -jvm_import( - name = "io_netty-netty-handler-4_1_117_Final_http_import", - jar = "@io_netty-netty-handler-4_1_117_Final_http//file", - source_jar = "@io_netty-netty-handler-4_1_117_Final-sources_http//file" -) - -jvm_import( - name = "io_netty-netty-resolver-4_1_117_Final_http_import", - jar = "@io_netty-netty-resolver-4_1_117_Final_http//file", - source_jar = "@io_netty-netty-resolver-4_1_117_Final-sources_http//file" -) - -jvm_import( - name = "io_netty-netty-transport-4_1_117_Final_http_import", - jar = "@io_netty-netty-transport-4_1_117_Final_http//file", - source_jar = "@io_netty-netty-transport-4_1_117_Final-sources_http//file" -) - -java_library( - name = "netty-jps-provided", - exports = [":netty-jps"], - neverlink = True, - visibility = ["//visibility:public"] -) - copy_file( name = "io.netty/netty-tcnative-boringssl-static-2.0.73.Final.jar_copy", src = "@io_netty-netty-tcnative-boringssl-static-2_0_73_Final_http//file", diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index e2af69474026..79b9e23bdf7b 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -13222,111 +13222,6 @@ http_file( downloaded_file_path = "netty-codec-protobuf-4.2.0.RC2-sources.jar" ) -http_file( - name = "io_netty-netty-all-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-all/4.1.117.Final/netty-all-4.1.117.Final.jar", - sha256 = "c78613ac0db94650c03a37b2a35b3238b2d018fcac9f10e5fe268c3887cf5e0b", - downloaded_file_path = "netty-all-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-buffer-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-buffer/4.1.117.Final/netty-buffer-4.1.117.Final.jar", - sha256 = "7d01bf0334ffa3ab55f3828bb50188bf9969774a23791a3df1905e53bfeea8f5", - downloaded_file_path = "netty-buffer-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-codec-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec/4.1.117.Final/netty-codec-4.1.117.Final.jar", - sha256 = "0b93f01cff5bc2a64af829ca01c826e8e861a03b96a871fa2a240fa25681df78", - downloaded_file_path = "netty-codec-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-codec-http-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.117.Final/netty-codec-http-4.1.117.Final.jar", - sha256 = "a7e19945a6baa86ab285383a0bda632eae7703a889da1d20ea4eaad4c996cc21", - downloaded_file_path = "netty-codec-http-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-common-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-common/4.1.117.Final/netty-common-4.1.117.Final.jar", - sha256 = "5b4e125a341566b24d5030479da475b20ea1f6145bf7b3c3d69fe537088bb4c1", - downloaded_file_path = "netty-common-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-handler-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-handler/4.1.117.Final/netty-handler-4.1.117.Final.jar", - sha256 = "f3272149099883cf98ad8a2a82a08111a78d17e604aebc094c80592a730fcac5", - downloaded_file_path = "netty-handler-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-resolver-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-resolver/4.1.117.Final/netty-resolver-4.1.117.Final.jar", - sha256 = "0f5f7220d34d32751cc624bc9c47afdde7392f0d9551569c90a568309015d796", - downloaded_file_path = "netty-resolver-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-transport-4_1_117_Final_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-transport/4.1.117.Final/netty-transport-4.1.117.Final.jar", - sha256 = "c07aac2ea55aa42c34fc6b53fbee661e0de077f45483133b6ca297c70a67a44a", - downloaded_file_path = "netty-transport-4.1.117.Final.jar" -) - -http_file( - name = "io_netty-netty-buffer-4_1_117_Final-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-buffer/4.1.117.Final/netty-buffer-4.1.117.Final-sources.jar", - sha256 = "918f7561293bb6212646e7cb417b43ed7a638a29f3e08a21f7c540fd2757788e", - downloaded_file_path = "netty-buffer-4.1.117.Final-sources.jar" -) - -http_file( - name = "io_netty-netty-codec-4_1_117_Final-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec/4.1.117.Final/netty-codec-4.1.117.Final-sources.jar", - sha256 = "008eec001d04023dc6becd6b82a6848c10fbd6decfed5e6efeca46fe23532d40", - downloaded_file_path = "netty-codec-4.1.117.Final-sources.jar" -) - -http_file( - name = "io_netty-netty-codec-http-4_1_117_Final-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.117.Final/netty-codec-http-4.1.117.Final-sources.jar", - sha256 = "ac6d1a9e7897235a149d5050f0970b681bf979b48489d67ba0125f239d1672bb", - downloaded_file_path = "netty-codec-http-4.1.117.Final-sources.jar" -) - -http_file( - name = "io_netty-netty-common-4_1_117_Final-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-common/4.1.117.Final/netty-common-4.1.117.Final-sources.jar", - sha256 = "a981e69ef6c23db2e2ba1cccc567dae50480bda46415f564acfe033fc923d153", - downloaded_file_path = "netty-common-4.1.117.Final-sources.jar" -) - -http_file( - name = "io_netty-netty-handler-4_1_117_Final-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-handler/4.1.117.Final/netty-handler-4.1.117.Final-sources.jar", - sha256 = "8a18ddaffbc8f30c7f06b135f06f9b418c65717f3f8c19da6e3726dfd3d3a185", - downloaded_file_path = "netty-handler-4.1.117.Final-sources.jar" -) - -http_file( - name = "io_netty-netty-resolver-4_1_117_Final-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-resolver/4.1.117.Final/netty-resolver-4.1.117.Final-sources.jar", - sha256 = "2716e7689a71211ec2e6fb443f44d3ce82e218cc52f25bd541531e7883234d35", - downloaded_file_path = "netty-resolver-4.1.117.Final-sources.jar" -) - -http_file( - name = "io_netty-netty-transport-4_1_117_Final-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-transport/4.1.117.Final/netty-transport-4.1.117.Final-sources.jar", - sha256 = "528859630b9e07e317fc912dd75c6b835cd6169291d9658d8e93f9a664f344f8", - downloaded_file_path = "netty-transport-4.1.117.Final-sources.jar" -) - http_file( name = "io_netty-netty-tcnative-boringssl-static-2_0_73_Final_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/2.0.73.Final/netty-tcnative-boringssl-static-2.0.73.Final.jar", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt index 1a5958663974..b5d291414929 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt @@ -11,12 +11,12 @@ object JavaPluginLayout { spec.directoryName = "java" spec.mainJarName = "java-impl.jar" - spec.withProjectLibrary("netty-jps", "rt/netty-jps.jar") - spec.withModule("intellij.platform.jps.build.launcher", "jps-launcher.jar") spec.withModuleLibrary("debugger-agent", "intellij.java.debugger.agent.holder", "rt") + spec.withProjectLibrary("netty-codec-protobuf", "netty-codec-protobuf.jar") + spec.withProjectLibrary("Eclipse", "ecj") spec.withProjectLibrary("jps-javac-extension") spec.withProjectLibrary("kotlin-metadata")