diff --git a/.gitignore b/.gitignore
index b1e82d1d6b6..3fb62088a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,14 +8,15 @@ logs/
 build/
 target/
 
-
-## eclipse ignores (use 'gradle eclipse' to build eclipse projects)
+## eclipse ignores (use 'mvn eclipse:eclipse' to build eclipse projects)
+## The only configuration files which are not ignored are .settings since
+## these files ensure common coding style across Eclipse and IDEA
+## Other files (.project, .classpath) should be generated through Maven which
+## will correctly set the classpath based on the declared dependencies.
 .project
 .classpath
-.settings
 */.project
 */.classpath
-*/.settings
 */eclipse-build
 
 ## netbeans ignores
diff --git a/src/eclipse/dot.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from src/eclipse/dot.settings/org.eclipse.core.resources.prefs
rename to .settings/org.eclipse.core.resources.prefs
diff --git a/src/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from src/eclipse/dot.settings/org.eclipse.jdt.core.prefs
rename to .settings/org.eclipse.jdt.core.prefs
diff --git a/src/eclipse/dot.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from src/eclipse/dot.settings/org.eclipse.jdt.ui.prefs
rename to .settings/org.eclipse.jdt.ui.prefs
diff --git a/pom.xml b/pom.xml
index f476a77021e..7221294b2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -896,26 +896,6 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <configuration>
-                        <additionalConfig>
-                            <file>
-                                <name>.settings/org.eclipse.jdt.core.prefs</name>
-                                <location>src/eclipse/dot.settings/org.eclipse.jdt.core.prefs</location>
-                            </file>
-                            <file>
-                                <name>.settings/org.eclipse.jdt.ui.prefs</name>
-                                <location>src/eclipse/dot.settings/org.eclipse.jdt.ui.prefs</location>
-                            </file>
-                            <file>
-                                <name>.settings/org.eclipse.core.resources.prefs</name>
-                                <location>src/eclipse/dot.settings/org.eclipse.core.resources.prefs</location>
-                            </file>
-                        </additionalConfig>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/src/eclipse/README b/src/eclipse/README
deleted file mode 100644
index ee4874d2311..00000000000
--- a/src/eclipse/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Eclipse configuration files
-
-You can use them by running
-  mvn eclipse:clean eclipse:eclipse
-and importing the project into Eclipse (File > Import > Existing Project into
-workspace) or refreshing it (F5) if you already imported it.