maven: extracted common package to a separate module
authornik <Nikolay.Chashnikov@jetbrains.com>
Thu, 10 Sep 2015 13:18:19 +0000 (16:18 +0300)
committernik <Nikolay.Chashnikov@jetbrains.com>
Thu, 10 Sep 2015 13:19:13 +0000 (16:19 +0300)
.idea/modules.xml
build/scripts/layouts.gant
plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml
plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml
plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml
plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml [new file with mode: 0644]
plugins/maven/artifact-resolver/common/src/org/jetbrains/idea/maven/artifactResolver/common/MavenModuleMap.java [moved from plugins/maven/artifact-resolver-m2/src/org/jetbrains/idea/maven/artifactResolver/common/MavenModuleMap.java with 100% similarity]
plugins/maven/maven.iml

index 0b3aefd372c9ae96d45448c9de204ff652753178..5a29a2a547ff2a6c2050ec5d627ab2015aa7fa1c 100644 (file)
       <module fileurl="file://$PROJECT_DIR$/java/manifest/manifest.iml" filepath="$PROJECT_DIR$/java/manifest/manifest.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml" group="plugins/maven" />
index c120b00ad9581bec7a929f3af4be36653d8ebddb..7e2c6383c35af2f3a696be9890b21a8838578cb7 100644 (file)
@@ -391,20 +391,17 @@ public def layoutCommunityPlugins(String home, boolean maySkipAndroidPlugin = fa
 
       jar("artifact-resolver-m2.jar") {
         module("maven-artifact-resolver-m2")
+        module("maven-artifact-resolver-common")
       }
 
       jar("artifact-resolver-m3.jar") {
         module("maven-artifact-resolver-m3")
-        module("maven-artifact-resolver-m2") {
-          include(name: 'org/jetbrains/idea/maven/artifactResolver/common/*')
-        }
+        module("maven-artifact-resolver-common")
       }
 
       jar("artifact-resolver-m31.jar") {
         module("maven-artifact-resolver-m31")
-        module("maven-artifact-resolver-m2") {
-          include(name: 'org/jetbrains/idea/maven/artifactResolver/common/*')
-        }
+        module("maven-artifact-resolver-common")
       }
 
       dir("maven3-server-lib") {
index ebdc5aee01a71d4d2edb0a8ddc0813b124907690..8f8e2705c340fbec5cf41ded38751e860b5fb3d5 100644 (file)
@@ -16,6 +16,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="maven-artifact-resolver-common" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
index 0b6d39b789939f3ebe59ddf2eadbd955d619e0c1..34398560e6ae3187999c55281bcc798219894479 100644 (file)
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="maven-artifact-resolver-m2" exported="" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -44,6 +43,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="maven-artifact-resolver-common" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
index ba8ab4b132459f2c7b64f9cb3571a691cd81cda2..b24394274b5e800268102c91ea0d773e1ed8285d 100644 (file)
@@ -34,7 +34,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="maven-artifact-resolver-m2" />
+    <orderEntry type="module" module-name="maven-artifact-resolver-common" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml b/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml
new file mode 100644 (file)
index 0000000..13a324e
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../maven30-server-impl/lib/maven3/lib/maven-artifact-3.0.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
index 5e3f5f8d9042e072c67343707055640bb98b88e4..fe06bee51b516a845c60991b4a09cc6926000cbd 100644 (file)
@@ -58,6 +58,7 @@
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="jps-model-impl" />
     <orderEntry type="module" module-name="maven-jps-plugin" />
+    <orderEntry type="module" module-name="maven-artifact-resolver-m2" />
     <orderEntry type="module" module-name="maven-artifact-resolver-m3" />
     <orderEntry type="module" module-name="maven-artifact-resolver-m31" />
     <orderEntry type="module" module-name="spellchecker" />