diff --git a/java/java-backend/resources/META-INF/JavaPlugin.xml b/java/java-backend/resources/META-INF/JavaPlugin.xml index 0ec8ea839511..504db5f86771 100644 --- a/java/java-backend/resources/META-INF/JavaPlugin.xml +++ b/java/java-backend/resources/META-INF/JavaPlugin.xml @@ -1187,7 +1187,7 @@ - + diff --git a/json/resources/intellij.json.xml b/json/resources/intellij.json.xml index c446f71ef35c..134fa5e938fe 100644 --- a/json/resources/intellij.json.xml +++ b/json/resources/intellij.json.xml @@ -51,7 +51,7 @@ - + diff --git a/platform/build-scripts/licenses/src/CommunityLibraryLicenses.kt b/platform/build-scripts/licenses/src/CommunityLibraryLicenses.kt index dff45bfba895..c529a7bc1b0d 100644 --- a/platform/build-scripts/licenses/src/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/licenses/src/CommunityLibraryLicenses.kt @@ -314,12 +314,6 @@ object CommunityLibraryLicenses { .mit("https://github.com/cucumber/cucumber-jvm/blob/main/LICENSE") .suppliedByOrganizations("SmartBear Software"), - LibraryLicense("Dart Analysis Server", version = LibraryLicense.CUSTOM_REVISION, attachedTo = "intellij.dart", url = "https://github.com/dart-lang/eclipse3") - .eplV1("https://github.com/dart-archive/eclipse3/tree/master/docs"), - - LibraryLicense("Dart VM Service drivers", version = LibraryLicense.CUSTOM_REVISION, attachedTo = "intellij.dart", url = "https://github.com/dart-lang/vm_service_drivers") - .newBsd("https://github.com/dart-lang/vm_service_drivers/blob/master/LICENSE"), - LibraryLicense("dbus-java", libraryName = "dbus-java", url = "https://github.com/hypfvieh/dbus-java") .lgpl2("https://github.com/hypfvieh/dbus-java/blob/dbus-java-3.0/LICENSE") .suppliedByPersons("David M. "), @@ -766,9 +760,6 @@ object CommunityLibraryLicenses { .apache("https://github.com/JetBrains/jSerialComm/blob/master/LICENSE-APACHE-2.0") .forkedFrom(groupId = "com.fazecast", artifactId = "jSerialComm", version = "2.11.2", mavenRepositoryUrl = "https://repo1.maven.org/maven2/"), - LibraryLicense("JSON", libraryName = "json.jar", version = LibraryLicense.CUSTOM_REVISION, url = "https://www.json.org/") - .license("JSON License", "https://www.json.org/license.html"), - LibraryLicense("JSON in Java", libraryName = "org.json:json", url = "https://github.com/stleary/JSON-java") .license("JSON License", "https://www.json.org/license.html"), @@ -1385,10 +1376,6 @@ object CommunityLibraryLicenses { LibraryLicense("VS Code Twig Language 2", version = "0.9.4", attachedTo = "intellij.textmate", url = "https://github.com/mblode/vscode-twig-language-2") .mit("https://github.com/mblode/vscode-twig-language-2/blob/master/LICENSE.md"), - // originally https://github.com/pelotoncycle/weberknecht - LibraryLicense("weberknecht", libraryName = "weberknecht-0.1.5.jar", version = "0.1.5", url = "https://github.com/pusher-community/titanium_pusher_android/blob/master/src/de/roderick/weberknecht/") - .apache("https://github.com/pusher-community/titanium_pusher_android/blob/master/src/de/roderick/weberknecht/WebSocket.java"), - LibraryLicense(libraryName = "winp", url = "https://github.com/jenkinsci/winp") .mit("https://github.com/jenkinsci/winp/blob/master/LICENSE.txt") .suppliedByPersons("Kohsuke Kawaguchi"), diff --git a/platform/lang-impl/src/com/intellij/analysis/problemsView/package-info.java b/platform/lang-impl/src/com/intellij/analysis/problemsView/package-info.java index 837eeea13739..40fd12a22704 100644 --- a/platform/lang-impl/src/com/intellij/analysis/problemsView/package-info.java +++ b/platform/lang-impl/src/com/intellij/analysis/problemsView/package-info.java @@ -1,6 +1,6 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. /** - * Framework for presenting problems (e.g. Dart Analysis Server or inspections) + * Framework for presenting problems (e.g., inspections) * in an updateable-on-the-fly table in the tool window, along with context actions, filters and navigation */ package com.intellij.analysis.problemsView; \ No newline at end of file diff --git a/platform/platform-tests/testData/plugins/sort/ultimatePlugins.txt b/platform/platform-tests/testData/plugins/sort/ultimatePlugins.txt index 2c6622f2ffb6..97f449123288 100644 --- a/platform/platform-tests/testData/plugins/sort/ultimatePlugins.txt +++ b/platform/platform-tests/testData/plugins/sort/ultimatePlugins.txt @@ -8,7 +8,6 @@ + -org-editorconfig-editorconfigjetbrains- + -com-jetbrains-plugins-ini4idea- + -Subversion- -+ -Dart- + -com-jetbrains-php-framework- + -com-intellij-phing- + -org-jetbrains-plugins-textmate- diff --git a/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml b/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml index f5a9a60ff18b..bd9fcb04c110 100644 --- a/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml +++ b/platform/platform-tests/testData/plugins/sort/ultimatePlugins.xml @@ -832,15 +832,6 @@ com.intellij.modules.lang com.intellij.modules.coverage - - -Dart- - Dart - com.intellij.modules.xml - -JavaScriptDebugger- - -org-jetbrains-plugins-yaml- - -com-intellij-copyright- - com.intellij.modules.coverage - -Subversion- Subversion diff --git a/plugins/markdown/core/resources/META-INF/plugin.xml b/plugins/markdown/core/resources/META-INF/plugin.xml index fc3c2833234e..5ab599cd8536 100644 --- a/plugins/markdown/core/resources/META-INF/plugin.xml +++ b/plugins/markdown/core/resources/META-INF/plugin.xml @@ -224,7 +224,7 @@ - + diff --git a/plugins/yaml/resources/intellij.yaml.xml b/plugins/yaml/resources/intellij.yaml.xml index 61ca3ae96557..487600c47342 100644 --- a/plugins/yaml/resources/intellij.yaml.xml +++ b/plugins/yaml/resources/intellij.yaml.xml @@ -33,7 +33,7 @@ - + - + - +