diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt index 6aab328ea605..5437a227e2e8 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt @@ -10,7 +10,7 @@ import java.io.ByteArrayOutputStream import java.io.DataOutputStream import java.util.* -private const val MARKETPLACE_BROKEN_PLUGINS_URL = "https://plugins.jetbrains.com/files/brokenPlugins.json" +private const val MARKETPLACE_BROKEN_PLUGINS_URL = "https://plugins.openide.ru/files/brokenPlugins.json" /** * Generate the 'brokenPlugins.txt' file using JetBrains Marketplace. diff --git a/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt b/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt index fcb00de05a54..050d5c307b00 100644 --- a/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt +++ b/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt @@ -37,7 +37,8 @@ internal class InstallPluginService : RestService() { "www.jetbrains.com", "www.jetbrains.com.cn", "vision.jetbrains.dev", - "internal.vision.jetbrains.dev" + "internal.vision.jetbrains.dev", + "plugins.openide.ru" ) override fun execute(urlDecoder: QueryStringDecoder, request: FullHttpRequest, context: ChannelHandlerContext): String? { diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index 33857e56d053..976336f7726a 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -33,8 +33,8 @@ import java.util.*; */ @ApiStatus.Internal public final class ApplicationInfoImpl extends ApplicationInfoEx { - public static final String DEFAULT_PLUGINS_HOST = "https://plugins.jetbrains.com"; - public static final String IDEA_PLUGINS_HOST_PROPERTY = "idea.plugins.host"; + public static final String DEFAULT_PLUGINS_HOST = "https://plugins.openide.ru"; + static final String IDEA_PLUGINS_HOST_PROPERTY = "idea.plugins.host"; private static final String IDEA_APPLICATION_INFO_DEFAULT_DARK_LAF = "idea.application.info.default.dark.laf"; private static final String IDEA_APPLICATION_INFO_DEFAULT_CLASSIC_DARK_LAF = "idea.application.info.default.classic.dark.laf"; diff --git a/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt b/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt index 62b362f69087..e2910690f0b6 100644 --- a/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt +++ b/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt @@ -18,8 +18,9 @@ object WhiteListUrls { "https://pypi.python.org", "http://localhost", "https://services.gradle.org", - "https://plugins.jetbrains.com", // TODO [OpenIDE]: replace url - "https://downloads.marketplace.jetbrains.com/files", // TODO [OpenIDE]: replace url + "https://plugins.openide.ru/", + "https://downloads.marketplace.openide.ru", + "https://downloads.openide.ru", "https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/1.2023.10/plantuml-1.2023.10.jar", "https://amplicode.ru", "https://download.openide.ru" diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/StandalonePluginUpdateChecker.kt b/platform/platform-impl/src/com/intellij/ide/plugins/StandalonePluginUpdateChecker.kt index bea4f92bec56..385f21405d24 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/StandalonePluginUpdateChecker.kt +++ b/platform/platform-impl/src/com/intellij/ide/plugins/StandalonePluginUpdateChecker.kt @@ -183,7 +183,7 @@ open class StandalonePluginUpdateChecker( val buildNumber = ApplicationInfo.getInstance().apiVersion val os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION, CharsetToolkit.UTF8) val pluginId = pluginId.idString - val url = "https://plugins.jetbrains.com/plugins/list?pluginId=$pluginId&build=$buildNumber&pluginVersion=$currentVersion&os=$os" + val url = "https://plugins.openide.ru/plugins/list?pluginId=$pluginId&build=$buildNumber&pluginVersion=$currentVersion&os=$os" val responseDoc = HttpRequests.request(url).connect { JDOMUtil.load(it.inputStream) } if (responseDoc.name != "plugin-repository") { diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java index 9342a81293a2..2c45c9302db7 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java @@ -4,7 +4,9 @@ package com.intellij.ide.plugins.newui; import com.intellij.icons.AllIcons; import com.intellij.ide.BrowserUtil; import com.intellij.ide.IdeBundle; +import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManagerConfigurable; +import com.intellij.ide.plugins.PluginNode; import com.intellij.openapi.application.IdeUrlTrackingParametersProvider; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.text.StringUtil; @@ -25,6 +27,7 @@ import java.awt.*; import java.time.Duration; import java.time.Instant; import java.util.Date; +import java.util.List; import java.util.function.Supplier; /** @@ -162,7 +165,7 @@ public final class LicensePanel extends NonOpaquePanel { setLink(IdeBundle.message("plugins.configurable.buy.the.license"), () -> BrowserUtil.browse(IdeUrlTrackingParametersProvider.getInstance() - .augmentUrl("https://plugins.jetbrains.com/purchase-link/" + plugin.getProductCode())), true); + .augmentUrl("https://plugins.openide.ru/purchase-link/" + plugin.getProductCode())), true); if (forUpdate) { updateLink(IdeBundle.message("label.plugin.paid"), false); diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 54c0f4ebddf8..46e31e99874f 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1981,7 +1981,7 @@ ast.loading.filter=false ast.loading.filter.description=Enables the mechanism that disables AST loading in particular thread marketplace.certificate.signature.check=true -marketplace.certificate.signature.check.description=Verify signatures for plugins downloaded from plugins.jetbrains.com +marketplace.certificate.signature.check.description=Verify signatures for plugins downloaded from plugins.openide.ru custom-repository.certificate.signature.check=false custom-repository.certificate.signature.check.description=Verify signatures for plugins downloaded from custom plugin repositories and installed from disk