From 1e1d87d55f7b97eebb5d8b0c3e5e8c1f8422dc44 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Tue, 10 Nov 2015 11:40:38 +0300
Subject: [PATCH] maven: exclude sisu-guava-0.9.9.jar from maven3.0.x modules
 dependencies

---
 .../maven3-server-common.iml                  | 33 +++++++++++++++++--
 .../maven30-server-impl.iml                   | 33 +++++++++++++++++--
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/plugins/maven/maven3-server-common/maven3-server-common.iml b/plugins/maven/maven3-server-common/maven3-server-common.iml
index 585533b9a91d..80778cfde700 100644
--- a/plugins/maven/maven3-server-common/maven3-server-common.iml
+++ b/plugins/maven/maven3-server-common/maven3-server-common.iml
@@ -14,11 +14,40 @@
       <library name="Maven3">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/boot/plexus-classworlds-2.4.jar!/" />
-          <root url="file://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/aether-api-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/aether-connector-wagon-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/aether-impl-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/aether-spi-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/aether-util-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/commons-cli-1.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/commons-io-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/commons-lang-2.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-aether-provider-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-artifact-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-compat-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-core-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-embedder-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-model-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-model-builder-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-plugin-api-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-repository-metadata-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-settings-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/maven-settings-builder-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/plexus-cipher-1.7.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/plexus-component-annotations-1.5.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/plexus-interpolation-1.14.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/plexus-sec-dispatcher-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/plexus-utils-2.0.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/sisu-guice-3.1.0-no_aop.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/sisu-inject-bean-2.3.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/sisu-inject-plexus-2.3.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/wagon-file-2.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/wagon-http-2.8-shaded.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/wagon-http-shared-2.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib/wagon-provider-api-2.8.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/../maven30-server-impl/lib/maven3/lib" recursive="false" />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
diff --git a/plugins/maven/maven30-server-impl/maven30-server-impl.iml b/plugins/maven/maven30-server-impl/maven30-server-impl.iml
index 61fd91b52dfa..f5efd505c00e 100644
--- a/plugins/maven/maven30-server-impl/maven30-server-impl.iml
+++ b/plugins/maven/maven30-server-impl/maven30-server-impl.iml
@@ -14,11 +14,40 @@
       <library name="Maven3">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/maven3/boot/plexus-classworlds-2.4.jar!/" />
-          <root url="file://$MODULE_DIR$/lib/maven3/lib" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-artifact-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/plexus-interpolation-1.14.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/commons-io-2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/commons-cli-1.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/sisu-inject-bean-2.3.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-settings-builder-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/sisu-inject-plexus-2.3.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-settings-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/aether-api-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-compat-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-model-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-embedder-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-plugin-api-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/aether-connector-wagon-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/aether-util-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/aether-spi-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-model-builder-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/wagon-http-shared-2.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/plexus-sec-dispatcher-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/plexus-component-annotations-1.5.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/wagon-file-2.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-aether-provider-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-repository-metadata-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/aether-impl-1.13.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/plexus-utils-2.0.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/wagon-provider-api-2.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/sisu-guice-3.1.0-no_aop.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/maven-core-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/plexus-cipher-1.7.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/commons-lang-2.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/maven3/lib/wagon-http-2.8-shaded.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/lib/maven3/lib" recursive="false" />
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="maven" scope="TEST" />