From 2d3a221dcf8fc01919108bf59de35a22e9cb2846 Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@apache.org>
Date: Sat, 24 Oct 2020 11:09:55 -0400
Subject: [PATCH] .gitignore clean up (#1993)

* Reorganized
* Removed outdated entries
* Moved some rules from the repo root to Solr
---
 .gitignore      | 64 +++++++++++++++++++------------------------------
 solr/.gitignore |  5 ++--
 2 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e61830567f..8d271bfa0e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,27 @@
-# .
-/eclipse-build
-/maven-build
-/classes
-build
-/idea-build
-dist
-lib
-test-lib
-*~
-.#*
-/build.properties
-/.idea
-lucene/**/*.iml
-parent.iml
-*.ipr
-*.iws
-/*.iml
-.project
-.classpath
-.settings
-/.caches
-/prj.el
-bin
-/bin
-/bin.*
-pom.xml
-/nbproject
-/nb-build
-.pydevproject
-__pycache__
-/dev-tools/scripts/scripts.iml
+# Gradle
+#    Ignore the generated local settings file.
+/gradle.properties
+.gradle/
+build/
+
+# IntelliJ IDEA
+/.idea/
+#    IntelliJ creates this folder, ignore.
+/dev-tools/missing-doclet/out/
+
+# Eclipse
+/.project
+/.classpath
+/.settings/
+#    Eclipse Gradle oddity
+**/bin/default/
+
+# macOS
 .DS_Store
 
-build/
-.gradle/
-.idea/
+# Python
+.pydevproject
+__pycache__
 
-# Ignore the generated local settings file.
-gradle.properties
-
-# IntelliJ creates this folder, ignore.
-dev-tools/missing-doclet/out/
+# Emacs backup
+*~
diff --git a/solr/.gitignore b/solr/.gitignore
index a0d8aa8096c..e6e2e7e442f 100644
--- a/solr/.gitignore
+++ b/solr/.gitignore
@@ -1,5 +1,3 @@
-*.iml
-
 /bin/*.pid
 
 /core/test-lib/
@@ -24,3 +22,6 @@
 
 *.out
 *.err
+
+lib/
+test-lib/