From 232faeab243579dbc6fda1bb905759b3410596ae Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 30 Mar 2017 14:49:05 +0200
Subject: [PATCH] remote repository library support moved from maven plugin to
 IDEA core: component registration and artifacts building

---
 .../intellij/build/CommunityStandaloneJpsBuilder.groovy     | 6 ++----
 build/scripts/layouts.gant                                  | 0
 .../com/intellij/jarRepository/JarRepositoryManager.java    | 2 +-
 .../intellij/build/CommunityRepositoryModules.groovy        | 2 +-
 resources/src/META-INF/IdeaPlugin.xml                       | 2 ++
 5 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 build/scripts/layouts.gant

diff --git a/build/groovy/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.groovy
index 28681b63a4dd..889c3b1e44f6 100644
--- a/build/groovy/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/CommunityStandaloneJpsBuilder.groovy
@@ -80,10 +80,6 @@ class CommunityStandaloneJpsBuilder {
 
         jar("maven-jps-plugin.jar") { module("maven-jps-plugin") }
         jar("aether-dependency-resolver.jar") { module("aether-dependency-resolver") }
-        ant.fileset(dir: "$home/plugins/maven/lib") {
-          include(name: "aether-*.jar")
-          include(name: "maven-aether-provider-*.jar")
-        }
         jar("gradle-jps-plugin.jar") { module("gradle-jps-plugin") }
         ant.fileset(dir: "$home/plugins/maven/maven30-server-impl/lib/maven3/lib") { include(name: "plexus-utils-*.jar") }
 
@@ -108,6 +104,8 @@ class CommunityStandaloneJpsBuilder {
           include(name: "ecj*.jar")
           include(name: "netty-all-*.jar")
           include(name: "snappy-in-java-*.jar")
+          include(name: "aether-*.jar")
+          include(name: "maven-aether-provider-*.jar")
         }
         ant.fileset(dir: "$home/jps/lib") {
           include(name: "optimizedFileManager.jar")
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
index f0e775937dc6..8db950e1aedd 100644
--- a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
+++ b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
@@ -373,7 +373,7 @@ public class JarRepositoryManager {
   @Nullable
   private static <T> T submitModalJob(@Nullable final Project project, final String title, final Function<ProgressIndicator, T> job){
     final Ref<T> result = Ref.create(null);
-    new Task.Modal(project, title, true) {
+    new Task.Modal(project, title, false) {  // todo: is cancel  support possible with aether?
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
         try {
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index 4308dc893753..8d0e64143349 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -89,6 +89,7 @@ class CommunityRepositoryModules {
     "xml-structure-view-impl",
     "xml",
     "configuration-store-impl",
+    "aether-dependency-resolver",
   ]
 
   /**
@@ -158,7 +159,6 @@ class CommunityRepositoryModules {
     },
     plugin("maven") {
       withModule("maven-jps-plugin")
-      withModule("aether-dependency-resolver")
       withModule("maven-server-api")
       withModule("maven2-server-impl")
       withModule("maven3-server-common")
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index ca85bddebc61..fe10c3da1da8 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -324,6 +324,8 @@
     <extensionPoint name="java.inspection.bulkMethodInfo" interface="com.intellij.codeInspection.bulkOperation.BulkMethodInfoProvider"/>
 
     <extensionPoint name="java.refactoring.chainCallExtractor" interface="com.intellij.refactoring.chainCall.ChainCallExtractor"/>
+
+    <extensionPoint name="repositoryLibrary" beanClass="com.intellij.jarRepository.RepositoryLibraryDefinition"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">