Plugin descriptors: remove deprecated attribute idea-plugin@version (IDEA-163694)

diff --git a/images/src/META-INF/ImagesPlugin.xml b/images/src/META-INF/ImagesPlugin.xml
index 05e559eb7488686840b819164734d6a1bdd58da8..5a364be95779d826bc0d53363fe6b93b56d38daf 100644 (file)
--- a/images/src/META-INF/ImagesPlugin.xml
+++ b/images/src/META-INF/ImagesPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <vendor>JetBrains</vendor>
 

diff --git a/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml b/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml
index fd9626d32976ae18e981e87dddc6304769a4af12..f6e75a781905a54dc3c61828c78a0e9a306daf8c 100644 (file)
--- a/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml
+++ b/java/java-tests/testData/ide/plugins/pluginDescriptor/spaces spaces/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
     <name>URLs Test</name>
     <id>com.jetbrains.plugins.urls</id>
     <idea-version since-build="10000"/>

diff --git a/platform/platform-resources/src/META-INF/JsonPlugin.xml b/platform/platform-resources/src/META-INF/JsonPlugin.xml
index 856fcfcc169458c2a101a7c87c0224665a09667c..d818b431c304c190e9cce318bd0baa13e43c941f 100644 (file)
--- a/platform/platform-resources/src/META-INF/JsonPlugin.xml
+++ b/platform/platform-resources/src/META-INF/JsonPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <module value="com.intellij.modules.json"/>
 

diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 5b36b9cc07f24e39ff02a337e515296c37bfc21e..3a980ff3b4c8f991d7f5cdad17d5b7f476955a3e 100644 (file)
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 

diff --git a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
index 3156132f904aa6d575affc19dc00d3735ed3c91e..46837919f2016c4e10ff00682d10110f010f0425 100644 (file)
--- a/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangXmlPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <xi:include href="/META-INF/PlatformLangPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>

diff --git a/platform/platform-resources/src/META-INF/PlatformPlugin.xml b/platform/platform-resources/src/META-INF/PlatformPlugin.xml
index fd5b7a1f99d76954f150784a466153ddec002e46..4f31470fd65ac77bfd42decac13b210db05945d3 100644 (file)
--- a/platform/platform-resources/src/META-INF/PlatformPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 

diff --git a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml
index 1304944983495c51f7415a2bcbef57547b1ee127..b8be8385f65025eeef6f2825ff32f838a9a65bc2 100644 (file)
--- a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml
+++ b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
   <id>testPluginId</id>
   <name>testPluginId</name>
   <description>

diff --git a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml
index e730cc2df9e44c575fc9f9e9386fdcc5a80799f3..dbfd3b9d868aa3298f26ee0c013f379ad5c06814 100644 (file)
--- a/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml
+++ b/platform/platform-tests/testData/updates/customRepositories/onlyCompatiblePluginsAreChecked/plugin2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
   <id>testPluginId</id>
   <name>testPluginId</name>
   <description>

diff --git a/plugins/ByteCodeViewer/src/META-INF/plugin.xml b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
index e1799b7b8323866c26b3a18c04ff447a14d09425..1c005ad35875bee56147f5de17f30f0c71c2a463 100644 (file)
--- a/plugins/ByteCodeViewer/src/META-INF/plugin.xml
+++ b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Bytecode Viewer</name>
   <id>ByteCodeViewer</id>
   <version>0.1</version>

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
index 6cf25dbe39b42b44171e49a86090dab997398b1f..b2b2f1fe19b7f50e7f41dc215efe621c0a9a4b5d 100644 (file)
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
 

diff --git a/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml b/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml
index 658b9983d6ee58975e3298722c3ec1b42778348d..9815fd4a99f5e7ddc765a997d16796a138c1fade 100644 (file)
--- a/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml
+++ b/plugins/IntelliLang/src/META-INF/intellilang-java-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
     <localInspection shortName="UnknownLanguage" displayName="Unknown Language ID" groupName="Language Injection" enabledByDefault="true"

diff --git a/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml b/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml
index 9392fba45f34685f915cd1be45ed010ec95c7038..e6dd7f3337cdda47553cc6fc28f5ba7ce01f64c7 100644 (file)
--- a/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml
+++ b/plugins/IntelliLang/src/META-INF/intellilang-xml-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
     <multiHostInjector implementation="org.intellij.plugins.intelliLang.inject.xml.XmlLanguageInjector"/>

diff --git a/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml b/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml
index 093f8148302e484cb140964f8f514abf67a37c00..5dda5f5102ba9830284a48b78550a4ad4cad4886 100644 (file)
--- a/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml
+++ b/plugins/IntelliLang/src/META-INF/intellilang-xpath-support.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="org.intellij.plugins.intelliLang.inject.config.XPathSupportProxy"
                         serviceImplementation="org.intellij.plugins.intelliLang.inject.config.XPathSupportProxyImpl"/>

diff --git a/plugins/IntelliLang/src/META-INF/plugin.xml b/plugins/IntelliLang/src/META-INF/plugin.xml
index a9789064a1f21cbe28f7e78672d23247c9191fc5..1cdc38748ce5a589d58ee0eaa4301b0011255f8c 100644 (file)
--- a/plugins/IntelliLang/src/META-INF/plugin.xml
+++ b/plugins/IntelliLang/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>IntelliLang</name>
   <id>org.intellij.intelliLang</id>
   <vendor>JetBrains</vendor>

diff --git a/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml b/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml
index 0e7d73362ffde9c5253d982367b86e570359294d..6b2d94cf39e333dbe81a5b28de66517fd2d78841 100644 (file)
--- a/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml
+++ b/plugins/IntentionPowerPak/src/META-INF/IntentionPowerPack.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="com.intellij">
 

diff --git a/plugins/ShortcutPromoter/resources/META-INF/plugin.xml b/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
index 0ea57fcaabed624a60daafb5a20582f2aaee64ed..4ea4e3771c410d94517dbe97b2769dae160afb1f 100644 (file)
--- a/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
+++ b/plugins/ShortcutPromoter/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Shortcut Promoter</name>
   <id>com.intellij.promoter</id>
   <version>1.0</version>

diff --git a/plugins/ant/src/META-INF/plugin.xml b/plugins/ant/src/META-INF/plugin.xml
index def130955ae0792298b34f7de447e03cce1ea789..9ad1648a626929889ee5070e7c47193d217358eb 100644 (file)
--- a/plugins/ant/src/META-INF/plugin.xml
+++ b/plugins/ant/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Ant Support</name>
   <id>AntSupport</id>
   <version>1.0</version>

diff --git a/plugins/copyright/src/META-INF/plugin.xml b/plugins/copyright/src/META-INF/plugin.xml
index 0a583be018b5784c5c67c39030cdcd00aa72c218..02c994b86385b35ec875129397936a1fd6e5a930 100644 (file)
--- a/plugins/copyright/src/META-INF/plugin.xml
+++ b/plugins/copyright/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Copyright</name>
   <id>com.intellij.copyright</id>
   <description>

diff --git a/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml b/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml
index 028b043cf6d06db289ee862a1b81676b9dbf2655..1bf507b68be27701b062aec9d8cf934601cbbc91 100644 (file)
--- a/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml
+++ b/plugins/coverage-common/src/META-INF/coverage-common-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.coverageRunner" interface="com.intellij.coverage.CoverageRunner"/>
     <extensionPoint qualifiedName="com.intellij.coverageEngine" interface="com.intellij.coverage.CoverageEngine"/>

diff --git a/plugins/coverage/src/META-INF/plugin.xml b/plugins/coverage/src/META-INF/plugin.xml
index d366b0275441aa9169778fbe1cc8641cd8fa4c1a..6b9f5961d53e86ddff5a55f18c7aee65d3d1b6e4 100644 (file)
--- a/plugins/coverage/src/META-INF/plugin.xml
+++ b/plugins/coverage/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Coverage</name>
   <depends optional="true" config-file="testng-integration.xml">TestNG-J</depends>
   <depends optional="true" config-file="junit-integration.xml">JUnit</depends>

diff --git a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
index e6d2cfc6902ab7e7fef882e96eef576ead95d7e6..7b3f36c476e71f00c23c948a7b70a44de2b2a295 100644 (file)
--- a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
+++ b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>CVS Integration</name>
   <id>CVS</id>
   <version>11</version>

diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 36933ac68e19e4cd1bd4075d9da77989852ff1b0..9a560466a8175f124cc730aa143e227fcde44e24 100644 (file)
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Plugin DevKit</name>
   <id>DevKit</id>
   <version>1.0</version>

diff --git a/plugins/devkit/testData/build/simple/META-INF/plugin.xml b/plugins/devkit/testData/build/simple/META-INF/plugin.xml
index e5b561ad04239b9cae2806394f692350ef744a8d..85a919a930a6d3741ca4e930d90a701bb0241d39 100644 (file)
--- a/plugins/devkit/testData/build/simple/META-INF/plugin.xml
+++ b/plugins/devkit/testData/build/simple/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>test.plugin</id>
   <name>Test Plugin</name>
   <version>1.0</version>

diff --git a/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml b/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml
index 0def625fa1c2b60947fe0a0efd9548fe15ad00f7..598ff4ec7466182192775770ea6d7d58ae1ba766 100644 (file)
--- a/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml
+++ b/plugins/devkit/testData/build/withJpsModule/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>test.plugin</id>
   <name>Test Plugin</name>
   <version>1.0</version>

diff --git a/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml b/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml
index 3de5442209ef7fdcdc39fcb9aa7865b7e6b735e2..97ee8d3968c88692959690984afac3a7f3fda6c4 100644 (file)
--- a/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml
+++ b/plugins/devkit/testData/codeInsight/createRequiredAttribute.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 

diff --git a/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml b/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml
index cbdf9c454c7b18fb45e7b8ec4bedd2a2a8ee1c8c..602a28315e093cc83fe890ef0a28bbbede789bdc 100644 (file)
--- a/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml
+++ b/plugins/devkit/testData/codeInsight/createRequiredAttribute_after.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 

diff --git a/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml b/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml
index 482186899455aed036132781bbdfa046a7dd8daf..951bf3a85b9132acb7f0b6981ad590a9fa395ed5 100644 (file)
--- a/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml
+++ b/plugins/devkit/testData/codeInsight/extensionPointPresentation.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
     <id>foo</id>
 

diff --git a/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml b/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml
index 9325b3115c34e717081337ce3b952a6f7f739f2a..c1d1e9cca203420e5dfc2ceb526b789d4e057cea 100644 (file)
--- a/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml
+++ b/plugins/devkit/testData/inspections/inspectionDescription/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.example</id>
 
   <extensions defaultExtensionNs="com.intellij">

diff --git a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml
index cb7aba24ab39f595d9c802f397e61ed821f68e6b..7efd17bf06476c938dcd9aae002bed380b54084d 100644 (file)
--- a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml
+++ b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMapping.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <id>com.intellij</id>
 

diff --git a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml
index 0f614a1cec0ccd77f38a152d16d0c52008b297f6..5059c9e74544164aa852a1ec4a4bd782a912765e 100644 (file)
--- a/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml
+++ b/plugins/devkit/testData/inspections/inspectionMappingConsistency/inspectionMappingWithDefaultBundle.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <id>com.intellij</id>
   <resource-bundle>bundle</resource-bundle>

diff --git a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml
index 280b9b93c5558f06418c2043d0057dd32e210f0e..571c18b32c28393404ddbc7ba8d3b0e858c864d3 100644 (file)
--- a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml
+++ b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude-main.xml
@@ -1,4 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" version="2">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
 
     <id>com.intellij</id>
 

diff --git a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml
index 849086d4989fefe6f9e6bd0a6857e36f9881371e..593dd40f18d4abc78719235e5280566aa6af56af 100644 (file)
--- a/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml
+++ b/plugins/devkit/testData/pluginXmlDomStubs/pluginWithXInclude.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
     <id>foo</id>
 

diff --git a/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml b/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml
index 482186899455aed036132781bbdfa046a7dd8daf..951bf3a85b9132acb7f0b6981ad590a9fa395ed5 100644 (file)
--- a/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml
+++ b/plugins/devkit/testData/references/extensions/extensionPointDocumentation.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
     <id>foo</id>
 

diff --git a/plugins/editorconfig/src/META-INF/plugin.xml b/plugins/editorconfig/src/META-INF/plugin.xml
index 8d8ff18f313962139618d00514a854609cb6b055..b194bdbcdd8abe2d9d54adda43ca2bf8140972e7 100644 (file)
--- a/plugins/editorconfig/src/META-INF/plugin.xml
+++ b/plugins/editorconfig/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>org.editorconfig.editorconfigjetbrains</id>
   <name>EditorConfig</name>
   <vendor url="http://editorconfig.org">Kevin Bell, JetBrains</vendor>

diff --git a/plugins/github/src/META-INF/github-tracker.xml b/plugins/github/src/META-INF/github-tracker.xml
index 0e9c8dd3d6cce7e8bce1b901dd211dd5e0b7c23a..8e0c06190aa8e05d535dc9c0f2cff504924b4dea 100644 (file)
--- a/plugins/github/src/META-INF/github-tracker.xml
+++ b/plugins/github/src/META-INF/github-tracker.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <tasks.repositoryType implementation="org.jetbrains.plugins.github.tasks.GithubRepositoryType"/>
   </extensions>

diff --git a/plugins/github/src/META-INF/plugin.xml b/plugins/github/src/META-INF/plugin.xml
index acafb311cc1ad6edd08c400c0a47864d9a044b05..64f5ccebd3f34515a1df8a4f1bcd7256b2ec3e8c 100644 (file)
--- a/plugins/github/src/META-INF/plugin.xml
+++ b/plugins/github/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>GitHub</name>
   <id>org.jetbrains.plugins.github</id>
   <vendor>JetBrains</vendor>

diff --git a/plugins/gradle/src/META-INF/gradle-maven-integration.xml b/plugins/gradle/src/META-INF/gradle-maven-integration.xml
index b8fad2f5c3beef4751715edde78dbdb05cef347b..2cd12be2fd3837aa18aa97f62f3ba53e5fbd10c3 100644 (file)
--- a/plugins/gradle/src/META-INF/gradle-maven-integration.xml
+++ b/plugins/gradle/src/META-INF/gradle-maven-integration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<idea-plugin version="2">
+<idea-plugin>
 
   <project-components>
     <component>

diff --git a/plugins/groovy/src/META-INF/intellilang-groovy-support.xml b/plugins/groovy/src/META-INF/intellilang-groovy-support.xml
index e5eeb6090acbf93216e1a0f6795d0f8c2ef2ff26..cd2108a8c0f3d650f161df78248ddbe634754e58 100644 (file)
--- a/plugins/groovy/src/META-INF/intellilang-groovy-support.xml
+++ b/plugins/groovy/src/META-INF/intellilang-groovy-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <extensions defaultExtensionNs="org.intellij.intelliLang">
     <languageSupport implementation="org.intellij.plugins.intelliLang.inject.groovy.GroovyLanguageInjectionSupport"/>

diff --git a/plugins/java-decompiler/plugin/src/META-INF/plugin.xml b/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
index c4657b4cd5fa2977024374be45affa33b6cf964b..b64e370c615b43e0f4226994037de6ce2b02e7f3 100644 (file)
--- a/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
+++ b/plugins/java-decompiler/plugin/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <id>org.jetbrains.java.decompiler</id>
   <name>Java Bytecode Decompiler</name>

diff --git a/plugins/java-i18n/src/META-INF/plugin.xml b/plugins/java-i18n/src/META-INF/plugin.xml
index f5c57b0dd861d9a40b880dc2f6d544b86ff0833b..7e906375ff7ac0f5976d15ca36870b555d85a2f3 100644 (file)
--- a/plugins/java-i18n/src/META-INF/plugin.xml
+++ b/plugins/java-i18n/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.java-i18n</id>
   <name>I18n for Java</name>
   <depends>com.intellij.properties</depends>

diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml
index 2fc00e59a77052f7b8f239a4019e37cd0a9ee948..3a374559f16c5762822e363c7a1fe3eb85da8f38 100644 (file)
--- a/plugins/properties/src/META-INF/plugin.xml
+++ b/plugins/properties/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.properties</id>
   <name>Properties Support</name>
   <depends>com.intellij.modules.xml</depends>

diff --git a/plugins/settings-repository/resources/META-INF/plugin.xml b/plugins/settings-repository/resources/META-INF/plugin.xml
index 337c79b57bf22e0e08c1aec1a22f6cbf9f9c9d2c..d549e09ba0e6d7ff9ed72e1ae91d2e85459a377e 100644 (file)
--- a/plugins/settings-repository/resources/META-INF/plugin.xml
+++ b/plugins/settings-repository/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Settings Repository</name>
   <id>org.jetbrains.settingsRepository</id>
   <description><![CDATA[

diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index ec8278d42098a24a559dac662cc7eb824d9548fc..ce552db3cd3d631493269b4a6793226859030594 100644 (file)
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Subversion Integration</name>
   <id>Subversion</id>
   <version>1.1</version>

diff --git a/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml b/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml
index 8d8623e399905492a6967cf6a1e7a8191e0d9fe4..f6de89f2b8c08acbee06f30c814bad390220ee3c 100644 (file)
--- a/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/java-contexts.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij.tasks">
 
     <contextProvider implementation="com.intellij.tasks.context.java.BreakpointsContextProvider"/>

diff --git a/plugins/tasks/tasks-core/src/META-INF/plugin.xml b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
index 68d4adcfbb0a964910b8319090ee23bfacbc2b25..544e19c5d6566e53516a97329113e7650e5559d6 100644 (file)
--- a/plugins/tasks/tasks-core/src/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.intellij.tasks</id>
   <name>Task Management</name>
   <description>Enables task and context management</description>

diff --git a/plugins/terminal/resources/META-INF/plugin.xml b/plugins/terminal/resources/META-INF/plugin.xml
index 906e9270c9eaca78400e1c2d69bed24b44836f01..24150834ebbffeffd20257a89fb7d36dd389f6b0 100644 (file)
--- a/plugins/terminal/resources/META-INF/plugin.xml
+++ b/plugins/terminal/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2"  xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Terminal</name>
   <id>org.jetbrains.plugins.terminal</id>
   <version>0.1</version>

diff --git a/plugins/terminal/resources/META-INF/terminal.xml b/plugins/terminal/resources/META-INF/terminal.xml
index 165952ce6e924dde3a33c91ab502b06bf280b6b1..1e8fa4bb67733821d93beebf359aedfe63ee43ac 100644 (file)
--- a/plugins/terminal/resources/META-INF/terminal.xml
+++ b/plugins/terminal/resources/META-INF/terminal.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <depends optional="true" config-file="terminal-for-remote-servers.xml">com.intellij.modules.remoteServers</depends>
 
   <extensions defaultExtensionNs="com.intellij">

diff --git a/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml b/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
index 499619eea8eb3e9fbf1484597d6dd649ce0d3677..f4800c37d94aab476469f06a26372b1f2b996369 100644 (file)
--- a/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
+++ b/plugins/ui-designer-core/src/META-INF/DesignerCorePlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <module value="com.intellij.ui-designer-new"/>
 

diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index 649a94223feb549b6c60e4324ca16ee8e60e2e19..fac25aa43de16216883ba9c01ee4824d08c8cf30 100644 (file)
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>UI Designer</name>
   <id>com.intellij.uiDesigner</id>
   <vendor>JetBrains</vendor>

diff --git a/plugins/xpath/xpath-view/src/META-INF/plugin.xml b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
index 03951216939ff7a8574f422063744475cab5aadf..41f4170bc60d1eca5840f8962dce143c7150a828 100644 (file)
--- a/plugins/xpath/xpath-view/src/META-INF/plugin.xml
+++ b/plugins/xpath/xpath-view/src/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<idea-plugin version="2">
+<idea-plugin>
 
   <!-- Plugin name -->
   <id>XPathView</id>

diff --git a/plugins/xslt-debugger/src/META-INF/plugin.xml b/plugins/xslt-debugger/src/META-INF/plugin.xml
index 2affaff7fd5b3765e5c5253a4a1b62cdb82c21a1..caf0d31950cb7dfcbe6ec700645a582b3a013dcd 100644 (file)
--- a/plugins/xslt-debugger/src/META-INF/plugin.xml
+++ b/plugins/xslt-debugger/src/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" url="https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger">
+<idea-plugin url="https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger">
   <name>XSLT-Debugger</name>
   <id>XSLT-Debugger</id>
 

diff --git a/plugins/yaml/resources/META-INF/plugin.xml b/plugins/yaml/resources/META-INF/plugin.xml
index 9288a63d97a6812cd476b86f2610d5be8d8b72f7..12b2fa58e7c5fe8c09b8d58d7a64dfd63e996b04 100644 (file)
--- a/plugins/yaml/resources/META-INF/plugin.xml
+++ b/plugins/yaml/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>YAML</name>
   <id>org.jetbrains.plugins.yaml</id>
   <vendor>JetBrains</vendor>

diff --git a/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml b/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml
index c96f0b7f2b3aa4af36280c3aa60ea43c5f214384..f3f24406ab3befea088ecdd1b4fc57ef0377dd31 100644 (file)
--- a/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml
+++ b/python/IntelliLang-python/resources/META-INF/intellilang-python-support.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="org.intellij.intelliLang">
     <languageSupport implementation="com.jetbrains.python.intelliLang.PyLanguageInjectionSupport"/>
     <injectionConfig config="resources/pyInjections.xml"/>

diff --git a/python/IntelliLang-python/resources/META-INF/plugin.xml b/python/IntelliLang-python/resources/META-INF/plugin.xml
index 902e05447b7b10fc6233d7b9b864888f51b7b077..40b746dd27e0c5b4cb90cba8f2c0c4c8e42a11a6 100644 (file)
--- a/python/IntelliLang-python/resources/META-INF/plugin.xml
+++ b/python/IntelliLang-python/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Python IntelliLang</name>
   <id>org.jetbrains.plugins.python-intelliLang</id>
   <version>VERSION</version>

diff --git a/python/educational-core/course-creator/resources/META-INF/plugin.xml b/python/educational-core/course-creator/resources/META-INF/plugin.xml
index b4072b3de1bfda306d16deb02631ce7fba432ac5..253ecc51e3760260e2816a9411f3d83510759dab 100644 (file)
--- a/python/educational-core/course-creator/resources/META-INF/plugin.xml
+++ b/python/educational-core/course-creator/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.edu.coursecreator</id>
   <name>Course Creator Plugin</name>
   <version>2.0.3</version>

diff --git a/python/educational-core/student/resources/META-INF/plugin.xml b/python/educational-core/student/resources/META-INF/plugin.xml
index c0ad88e0a78843e002f2cd7a9bad21b415c0a554..6f842f044c9fc546f131af4a7846063338383c9a 100644 (file)
--- a/python/educational-core/student/resources/META-INF/plugin.xml
+++ b/python/educational-core/student/resources/META-INF/plugin.xml
@@ -1,5 +1,5 @@
 <!--suppress XmlUnboundNsPrefix -->
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.edu.interactivelearning</id>
   <name>Educational plugin core</name>
   <version>2.0.4</version>

diff --git a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
index 935305d81f4ecf3730358e3cbf8c9763c454440a..85ec939dd37e4870ab0c5c1cfb2d64778a157d7e 100644 (file)
--- a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.edu.coursecreator.python</id>
   <name>Course Creator for PyCharm Edu</name>
   <version>2.0.3</version>

diff --git a/python/educational-python/src/META-INF/IdeTipsAndTricks.xml b/python/educational-python/src/META-INF/IdeTipsAndTricks.xml
index fdef342ecb9d75854c059b499733d03fd5de55c0..45d7c8f4fdf597c1f9092b98fc923bab832d0fc7 100644 (file)
--- a/python/educational-python/src/META-INF/IdeTipsAndTricks.xml
+++ b/python/educational-python/src/META-INF/IdeTipsAndTricks.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
         <tipAndTrick file="Welcome.html"/>
         <tipAndTrick file="MultipleProjects.html"/>

diff --git a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
index 1ab0655a25eaa2db2c2d9736d3f34f771ab36398..7283b7cecd28260e382c7c4fd8a73f4220aa4ca7 100644 (file)
--- a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work ONLY in Pycharm Educational Edition -->
 
   <application-components>

diff --git a/python/educational-python/student-python/resources/META-INF/plugin.xml b/python/educational-python/student-python/resources/META-INF/plugin.xml
index f42556f44a198eaea410282ff12c571cbe2e7292..73c614773484764bda60c5898206930590c3be86 100644 (file)
--- a/python/educational-python/student-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/student-python/resources/META-INF/plugin.xml
@@ -1,5 +1,5 @@
 <!--suppress XmlUnboundNsPrefix -->
-<idea-plugin version="2">
+<idea-plugin>
   <id>com.jetbrains.python.edu.interactivelearning.python</id>
   <name>Educational plugin for PyCharm</name>
   <version>2.0.4</version>

diff --git a/python/ide/src/META-INF/PyCharmCorePlugin.xml b/python/ide/src/META-INF/PyCharmCorePlugin.xml
index e8a88bce634e5f8311bf17accc88a8de18f296b9..3e1f95d0b15b213b764d29177c0b79dd0a160424 100644 (file)
--- a/python/ide/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide/src/META-INF/PyCharmCorePlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-core-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 

diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index f711f7df3a1876e062175bb99562b5a8208b7e70..6c026f880445f401f3be145aafbcca9d4213bd7e 100644 (file)
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -1,4 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" version="2">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 

diff --git a/python/ipnb/resources/META-INF/ipython-notebook.xml b/python/ipnb/resources/META-INF/ipython-notebook.xml
index 1dbc44eb4753ae7dfdffefd885a4b65399258f91..e895c65688d7e4e5a07756c56ab68804423df71e 100644 (file)
--- a/python/ipnb/resources/META-INF/ipython-notebook.xml
+++ b/python/ipnb/resources/META-INF/ipython-notebook.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <project-components>
     <component>
       <implementation-class>org.jetbrains.plugins.ipnb.configuration.IpnbConnectionManager</implementation-class>

diff --git a/python/ipnb/resources/META-INF/plugin.xml b/python/ipnb/resources/META-INF/plugin.xml
index bb9560c957439c4d11ccc5626948a7973d5b843c..58edb28db8b2444b5d9a103280516ace1dc54886 100644 (file)
--- a/python/ipnb/resources/META-INF/plugin.xml
+++ b/python/ipnb/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>IPython Notebook</name>
   <id>org.jetbrains.plugins.ipnb</id>
   <version>0.1</version>

diff --git a/python/pluginCore/META-INF/python-community-plugin-core.xml b/python/pluginCore/META-INF/python-community-plugin-core.xml
index 773c0f08e9ca7660bd16ee1a9e8d59174acf4d27..722cace688971b7cb81c7af1fba6bd628dc6785e 100644 (file)
--- a/python/pluginCore/META-INF/python-community-plugin-core.xml
+++ b/python/pluginCore/META-INF/python-community-plugin-core.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <!-- Components and extensions declared in this file work ONLY in the Python plugin,
        both Community and Professional versions. -->
 

diff --git a/python/pluginJava/META-INF/python-community-plugin-java.xml b/python/pluginJava/META-INF/python-community-plugin-java.xml
index de5ddc95d72a9036df78b465dfdcd88f87ef999d..90f3df261b846d6bd074840eb0f69708ab546904 100644 (file)
--- a/python/pluginJava/META-INF/python-community-plugin-java.xml
+++ b/python/pluginJava/META-INF/python-community-plugin-java.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <!-- Components and extensions declared in this file work ONLY in the Python plugin,
        both Community and Professional versions. -->
   <extensions defaultExtensionNs="com.intellij">

diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
index 983b2d14798f897e71029e3e184eb96acca0e982..41e58fe864edacc557121e7e13b9c2f39db3e5b0 100644 (file)
--- a/python/pluginResources/META-INF/plugin.xml
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
   <!-- Components and extensions declared in this file work ONLY in Python plugin, not in standalone PyCharm.
        Anything related to Python/Java integration must go in this file. -->
 

diff --git a/python/python-community-configure/resources/META-INF/python-community-configure-common.xml b/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
index 4c5ca9ea7ac051fcfc48909172afd26a49f82ea6..e14a21990a0ee005d368801571043b6e6980767c 100644 (file)
--- a/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
+++ b/python/python-community-configure/resources/META-INF/python-community-configure-common.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" url="https://confluence.jetbrains.com/display/PYH/">
+<idea-plugin url="https://confluence.jetbrains.com/display/PYH/">
   <!-- Components and extensions declared in this file work ONLY in PyCharm and CLion Python plugin, not in Standard Python plugin.
        Both Community and Professional editions. -->
 

diff --git a/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml b/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
index ed54098266fd070e8f7e646342a14b8e3ef7dca4..975d12d49ce34d2468983aa4476ca21c6bfcbccb 100644 (file)
--- a/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
+++ b/python/python-community-configure/resources/META-INF/python-community-configure-ide.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 

diff --git a/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml b/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml
index 06b2dadd1557e8dcf30aacaee7443045d1a44fc7..5d95fdb9c0fcd790487c6659b8b3b4cfae87726f 100644 (file)
--- a/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml
+++ b/python/python-community-ide-resources/resources/META-INF/IdeTipsAndTricks.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <tipAndTrick file="Welcome.html"/>
     <tipAndTrick file="MultipleProjects.html"/>

diff --git a/python/python-rest/resources/META-INF/plugin.xml b/python/python-rest/resources/META-INF/plugin.xml
index 12679768df35dd0fef0002165a2f3a92ef5d230b..547df9d77af8dbd0cf812514ed419704d2bc820f 100644 (file)
--- a/python/python-rest/resources/META-INF/plugin.xml
+++ b/python/python-rest/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Python ReStructureText Integration</name>
   <id>org.jetbrains.plugins.python-rest</id>
   <version>1.0</version>

diff --git a/python/python-rest/resources/META-INF/python-rest-plugin.xml b/python/python-rest/resources/META-INF/python-rest-plugin.xml
index 59a28682435fa37357f9dde7ef35a29e0e442589..9bd933de2a0df707d030467f3df9832ee9e65d7c 100644 (file)
--- a/python/python-rest/resources/META-INF/python-rest-plugin.xml
+++ b/python/python-rest/resources/META-INF/python-rest-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
 
     <lang.fileViewProviderFactory language="ReST"

diff --git a/python/python-terminal/resources/META-INF/plugin.xml b/python/python-terminal/resources/META-INF/plugin.xml
index 742ab2cd25ccc5c202e3388b0dd62a6045edded0..40959c35a95427aef67a68fa6abac4a604107476 100644 (file)
--- a/python/python-terminal/resources/META-INF/plugin.xml
+++ b/python/python-terminal/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>Python Terminal</name>
   <id>org.jetbrains.plugins.python-terminal</id>
   <version>VERSION</version>

diff --git a/python/python-terminal/resources/META-INF/python-terminal-plugin.xml b/python/python-terminal/resources/META-INF/python-terminal-plugin.xml
index fb3dbafc50c0b2d0e1afe682e44df88fe7c1e4aa..bd4bbdf7012876d89b70bce1b71a6d6c284e44d5 100644 (file)
--- a/python/python-terminal/resources/META-INF/python-terminal-plugin.xml
+++ b/python/python-terminal/resources/META-INF/python-terminal-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="org.jetbrains.plugins.terminal">
     <localTerminalCustomizer implementation="com.jetbrains.python.sdk.PyVirtualEnvTerminalCustomizer"/>
   </extensions>

diff --git a/python/rest/resources/META-INF/plugin.xml b/python/rest/resources/META-INF/plugin.xml
index 201c25ce1d060eb7ea2f79970558dd3b5576d826..ddf769ed974dd6af79e320b78f75001ed8df5f26 100644 (file)
--- a/python/rest/resources/META-INF/plugin.xml
+++ b/python/rest/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <name>ReStructuredText Support</name>
   <id>org.jetbrains.plugins.rest</id>
   <description>This plugin enables support for reStructuredText files (*.rst)</description>

diff --git a/python/rest/resources/META-INF/rest.xml b/python/rest/resources/META-INF/rest.xml
index 70c4a3478bfb4cb413a6d4f717a1b6ae53a4131f..eaa2d1c54a646e20f959449acb03d3bc4ce65ae2 100644 (file)
--- a/python/rest/resources/META-INF/rest.xml
+++ b/python/rest/resources/META-INF/rest.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
 
     <fileTypeFactory implementation="com.jetbrains.rest.RestFileTypeFactory"/>

diff --git a/python/src/META-INF/command-line.xml b/python/src/META-INF/command-line.xml
index c1970825b5ff38aad09037767119f0484988453d..470f0ac63612536719f4d7da18f22eb700f50357 100644 (file)
--- a/python/src/META-INF/command-line.xml
+++ b/python/src/META-INF/command-line.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
 
   <!--
    Extension points to support gnu command line language.

diff --git a/python/src/META-INF/python-core-buildout.xml b/python/src/META-INF/python-core-buildout.xml
index 77395466c21e3329afdc96f71675f3e36488a2c6..caae3219a2e7120a205bfacaa77b7c7601bcc858 100644 (file)
--- a/python/src/META-INF/python-core-buildout.xml
+++ b/python/src/META-INF/python-core-buildout.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <!-- Components and extensions declared in this file work both in PyCharm and Python plugin (but not in CLion).
        Both Community and Professional editions. -->
 

diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 3e33168e5c749b3e0a7804aa2a870389e09ba60e..3955e528e9774279024bf710d142a71239ac9b24 100644 (file)
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work both in PyCharm and Python plugin.
        Both Community and Professional editions. -->
 

diff --git a/python/src/META-INF/python-core-ide.xml b/python/src/META-INF/python-core-ide.xml
index e8f0574a9658e2f819c6d2dd76b9993c05fdacb5..873a4fa9cb3ec513dea69aff5c797bbb6d4d8548 100644 (file)
--- a/python/src/META-INF/python-core-ide.xml
+++ b/python/src/META-INF/python-core-ide.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
        Both Community and Professional editions. -->
 

diff --git a/python/src/META-INF/python-core-plugin.xml b/python/src/META-INF/python-core-plugin.xml
index 0122494064080702c8dcbfd51e2d260a0146312c..311b4296575f778c45debdf362e0e35b16bec6ac 100644 (file)
--- a/python/src/META-INF/python-core-plugin.xml
+++ b/python/src/META-INF/python-core-plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work both in PyCharm and Python plugin.
        Both Community and Professional editions. -->
 

diff --git a/resources/src/META-INF/IdeTipsAndTricks.xml b/resources/src/META-INF/IdeTipsAndTricks.xml
index 8678daa5f499ae637785f6f16ffec08d04e963fe..7b7a394c7dc75a2468f990f48c89d1ceb91cd301 100644 (file)
--- a/resources/src/META-INF/IdeTipsAndTricks.xml
+++ b/resources/src/META-INF/IdeTipsAndTricks.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <!--
     <tipAndTrick file="NotReadyYet.html"/>

diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 38510f8348c2f0a62a7822f3eb3e2cc752c1c8bf..e542635e28d61170c21ffa088f384f5ee944ccc3 100644 (file)
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -13,7 +13,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 

diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index ff41b7b476916b9b6082269ab497ade0921842f3..6dbb8498fa2cb98938867169cfd7139f125f8f52 100644 (file)
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- former Flex IDE foundation, todo: integrate into IdeaPlugin.xml -->
 
   <module value="com.intellij.modules.platform"/>

diff --git a/samples/comparingReferences/source/META-INF/plugin.xml b/samples/comparingReferences/source/META-INF/plugin.xml
index 36bf3d61f8347f154f13cfd7d84a35240a0247b8..38c3b4af80f9fda394dbe86a37660f4a48259a4b 100644 (file)
--- a/samples/comparingReferences/source/META-INF/plugin.xml
+++ b/samples/comparingReferences/source/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
   <name>Comparing References Inspection</name>
   <description>Inspection for (probably) inappropriate use of equality relation operation.</description>
   <version>1.0</version>

diff --git a/samples/conditionalOperatorConvertor/META-INF/plugin.xml b/samples/conditionalOperatorConvertor/META-INF/plugin.xml
index 17c55b92a20049f406ad6be33728e92af2624382..8e10f5ae5d438b58efe22cd8d1e504dc31b0f01a 100644 (file)
--- a/samples/conditionalOperatorConvertor/META-INF/plugin.xml
+++ b/samples/conditionalOperatorConvertor/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin>
     <name>Conditional Operator Converter</name>
     <id>ConditionalOperatorConverter</id>
     <description>Intention action that suggests to convert a conditional operator into

diff --git a/xml/tests/testData/xml/PluginXml.xml b/xml/tests/testData/xml/PluginXml.xml
index 62a7c4dcefec821872134282b416eed4c6f03b68..f5864045d6d37a6efc6813fe0551e2037957a33c 100644 (file)
--- a/xml/tests/testData/xml/PluginXml.xml
+++ b/xml/tests/testData/xml/PluginXml.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
-<idea-plugin version="2">
+<idea-plugin>
     <name>Inspection Gadgets</name>
     <id>InspectionGadgets</id>
     <vendor>InspectionGadgets Software</vendor>