diff --git a/.idea/libraries/jgroups.xml b/.idea/libraries/jgroups.xml
deleted file mode 100644
index 1c00f56f53e..00000000000
--- a/.idea/libraries/jgroups.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="jgroups">
-    <CLASSES>
-      <root url="jar://$GRADLE_REPOSITORY$/jgroups/jgroups/jars/jgroups-2.9.0.GA.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="file://$PROJECT_DIR$/../../../opt/jgroups/2.9.0.GA.src/src" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/spymemcached.xml b/.idea/libraries/spymemcached.xml
deleted file mode 100644
index 6655e882415..00000000000
--- a/.idea/libraries/spymemcached.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="spymemcached">
-    <CLASSES>
-      <root url="jar://$GRADLE_REPOSITORY$/spy/memcached/jars/memcached-2.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/tika.xml b/.idea/libraries/tika.xml
deleted file mode 100644
index 3cf8b22c249..00000000000
--- a/.idea/libraries/tika.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="tika">
-    <CLASSES>
-      <root url="jar://$GRADLE_REPOSITORY$/org.apache.tika/tika-app/bundles/tika-app-0.7.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules/plugin-discovery-jgroups.iml b/.idea/modules/plugin-discovery-jgroups.iml
index f964f059594..9150a6a1f9f 100644
--- a/.idea/modules/plugin-discovery-jgroups.iml
+++ b/.idea/modules/plugin-discovery-jgroups.iml
@@ -12,7 +12,15 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="elasticsearch" />
-    <orderEntry type="library" name="jgroups" level="project" />
+    <orderEntry type="module-library">
+      <library name="jgroups">
+        <CLASSES>
+          <root url="jar://$GRADLE_REPOSITORY$/jgroups/jgroups/jars/jgroups-2.9.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="test-testng" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="testng" level="project" />
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
diff --git a/.idea/modules/plugin-mapper-attachments.iml b/.idea/modules/plugin-mapper-attachments.iml
index fe6379591db..a5cbfb33b1e 100644
--- a/.idea/modules/plugin-mapper-attachments.iml
+++ b/.idea/modules/plugin-mapper-attachments.iml
@@ -13,7 +13,15 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="elasticsearch" />
-    <orderEntry type="library" name="tika" level="project" />
+    <orderEntry type="module-library">
+      <library name="tika">
+        <CLASSES>
+          <root url="jar://$GRADLE_REPOSITORY$/org.apache.tika/tika-app/bundles/tika-app-0.7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="test-testng" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="testng" level="project" />
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
diff --git a/.idea/modules/plugin-transport-memcached.iml b/.idea/modules/plugin-transport-memcached.iml
index 90834e9bcf7..f6a9a51c841 100644
--- a/.idea/modules/plugin-transport-memcached.iml
+++ b/.idea/modules/plugin-transport-memcached.iml
@@ -13,7 +13,15 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="elasticsearch" />
-    <orderEntry type="library" scope="TEST" name="spymemcached" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library name="spymemcached">
+        <CLASSES>
+          <root url="jar://$GRADLE_REPOSITORY$/spy/memcached/jars/memcached-2.4.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="test-testng" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
     <orderEntry type="library" scope="TEST" name="testng" level="project" />