From 5028c2fb7d194efb82cc9456b8d5e39e556e197c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 13 Nov 2024 08:31:00 +0100 Subject: [PATCH] Fix conflicting/suspicious .gitignore config --- .gitignore | 11 ++++------- .idea/.gitignore | 9 +++++++++ .release/.gitignore | 3 ++- databases/.gitignore | 4 ---- drivers/.gitignore | 4 +++- hibernate-spatial/.gitignore | 1 - hibernate-spatial/.sdkmanrc | 4 ---- 7 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 .idea/.gitignore delete mode 100644 databases/.gitignore delete mode 100644 hibernate-spatial/.gitignore delete mode 100644 hibernate-spatial/.sdkmanrc diff --git a/.gitignore b/.gitignore index a8c02f23b2..8d0d975bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,9 +16,7 @@ lib # IntelliJ specific files/directories out -.idea -!.idea/codeStyles/Project.xml -!.idea/inspectionProfiles/Project_Default.xml +# See .idea/.gitignore for more precise rules in that directory *.ipr *.iws *.iml @@ -47,10 +45,9 @@ ObjectStore *.hprof /.nb-gradle/ -# Additional databases used in local envs -databases/mysql/ -databases/postgis/ - # Vim *.swp *.swo + +# SDKman, used by some module maintainers +.sdkmanrc \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000..f54e307840 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,9 @@ +* +!.gitignore + +# See https://stackoverflow.com/a/67976259/6692043 +!codeStyles/ +!codeStyles/Project.xml +!codeStyles/codeStyleConfig.xml +!inspectionProfiles/ +!inspectionProfiles/Project_Default.xml \ No newline at end of file diff --git a/.release/.gitignore b/.release/.gitignore index 20f846ffeb..cdd9a17d6b 100644 --- a/.release/.gitignore +++ b/.release/.gitignore @@ -1,2 +1,3 @@ # The folder into which we checkout our release scripts into -* \ No newline at end of file +* +!.gitignore \ No newline at end of file diff --git a/databases/.gitignore b/databases/.gitignore deleted file mode 100644 index ee4c8ef2c6..0000000000 --- a/databases/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -!mariadb/ -!pgsql/ -!derby/ -./ \ No newline at end of file diff --git a/drivers/.gitignore b/drivers/.gitignore index 01b7e33fd4..144978ed23 100644 --- a/drivers/.gitignore +++ b/drivers/.gitignore @@ -1 +1,3 @@ -**/* \ No newline at end of file +* +!.gitignore +!README.adoc \ No newline at end of file diff --git a/hibernate-spatial/.gitignore b/hibernate-spatial/.gitignore deleted file mode 100644 index e0b3904e6b..0000000000 --- a/hibernate-spatial/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.sdkmanrc diff --git a/hibernate-spatial/.sdkmanrc b/hibernate-spatial/.sdkmanrc deleted file mode 100644 index 92d04b893e..0000000000 --- a/hibernate-spatial/.sdkmanrc +++ /dev/null @@ -1,4 +0,0 @@ -# Enable auto-env through the sdkman_auto_env config -# Add key=value pairs of SDKs to use below -java=8.0.252.hs-adpt -