From 4cf56bff402ed40e4085c8b0e124646e0b4e0b80 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 16 Mar 2018 18:29:03 +0100
Subject: [PATCH] =?UTF-8?q?do=20not=20export=20Mock=20library=20blindly=20?=
 =?UTF-8?q?=E2=80=94=20prefer=20direct=20dependency=20(since=20not=20requi?=
 =?UTF-8?q?red=20for=20most=20of=20clients)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform/lang-api/intellij.platform.lang.iml   |  6 +++---
 .../lang-impl/intellij.platform.lang.impl.iml  |  2 +-
 .../lang-impl/intellij.platform.lang.tests.iml |  2 +-
 .../intellij.platform.testExtensions.iml       |  2 +-
 .../intellij.platform.testFramework.iml        |  1 -
 .../xml/index/XsdNamespaceBuilder.java         | 18 ++----------------
 6 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/platform/lang-api/intellij.platform.lang.iml b/platform/lang-api/intellij.platform.lang.iml
index 64fa26f5c89c..37595b30178c 100644
--- a/platform/lang-api/intellij.platform.lang.iml
+++ b/platform/lang-api/intellij.platform.lang.iml
@@ -10,13 +10,13 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" exported="" />
-    <orderEntry type="library" exported="" name="NanoXML" level="project" />
+    <orderEntry type="library" name="NanoXML" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
-    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
     <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
+    <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index eb56b11ffd83..628bcade54e5 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -16,7 +16,7 @@
     <orderEntry type="library" name="Velocity" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.usageView" exported="" />
-    <orderEntry type="library" exported="" name="cli-parser" level="project" />
+    <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
     <orderEntry type="library" name="Snappy-Java" level="project" />
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index a627215af10d..3a0baf5ff9ef 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -15,7 +15,7 @@
     <orderEntry type="library" name="Velocity" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.usageView" exported="" />
-    <orderEntry type="library" exported="" name="cli-parser" level="project" />
+    <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
     <orderEntry type="library" name="Snappy-Java" level="project" />
diff --git a/platform/testFramework/extensions/intellij.platform.testExtensions.iml b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
index 754a20183d67..aa7f9bd5d0de 100644
--- a/platform/testFramework/extensions/intellij.platform.testExtensions.iml
+++ b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
@@ -10,7 +10,7 @@
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
-    <orderEntry type="library" exported="" scope="TEST" name="JDOM" level="project" />
+    <orderEntry type="library" scope="TEST" name="JDOM" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
     <orderEntry type="library" scope="TEST" name="snakeyaml" level="project" />
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 53cc794947c9..a1bebda9364a 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="intellij.platform.lvcs.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.tools.testsBootstrap" />
     <orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
-    <orderEntry type="library" exported="" scope="TEST" name="Mocks" level="project" />
     <orderEntry type="module" module-name="intellij.java.rt" exported="" />
     <orderEntry type="library" exported="" name="Groovy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.resources" exported="" scope="RUNTIME" />
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/index/XsdNamespaceBuilder.java b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdNamespaceBuilder.java
index 9a6c35a686df..b1507dc24aa0 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/index/XsdNamespaceBuilder.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdNamespaceBuilder.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 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.
 
 package com.intellij.xml.index;
 
@@ -84,7 +70,7 @@ public class XsdNamespaceBuilder extends NanoXmlUtil.IXMLBuilderAdapter implemen
   }
 
   @Override
-  public void endElement(String name, String nsPrefix, String nsURI) throws Exception {
+  public void endElement(String name, String nsPrefix, String nsURI) {
     myCurrentDepth--;
     myCurrentTag = null;
   }