From 467ecaaeff752cc463c95eaf45efaecc5357c989 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Thu, 12 Apr 2018 21:52:03 +0200
Subject: [PATCH] Harmonize config locations

---
 .gitignore                                          | 4 ++--
 {config => etc}/checkstyle/checkstyle.xml           | 0
 {config => etc}/checkstyle/header.txt               | 0
 {config => etc}/checkstyle/suppressions.xml         | 0
 {eclipse => etc/eclipse}/.checkstyle                | 0
 {eclipse => etc/eclipse}/eclipse-code-formatter.xml | 0
 {eclipse => etc/eclipse}/org.eclipse.jdt.core.prefs | 0
 {eclipse => etc/eclipse}/org.eclipse.jdt.ui.prefs   | 2 +-
 gradle/java.gradle                                  | 2 +-
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename {config => etc}/checkstyle/checkstyle.xml (100%)
 rename {config => etc}/checkstyle/header.txt (100%)
 rename {config => etc}/checkstyle/suppressions.xml (100%)
 rename {eclipse => etc/eclipse}/.checkstyle (100%)
 rename {eclipse => etc/eclipse}/eclipse-code-formatter.xml (100%)
 rename {eclipse => etc/eclipse}/org.eclipse.jdt.core.prefs (100%)
 rename {eclipse => etc/eclipse}/org.eclipse.jdt.ui.prefs (99%)

diff --git a/.gitignore b/.gitignore
index 644826fa..43750344 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,5 @@ target
 out
 .springBeans
 *.rdb
-!eclispe/.checkstyle
-.checkstyle
\ No newline at end of file
+.checkstyle
+!etc/eclipse/.checkstyle
diff --git a/config/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
similarity index 100%
rename from config/checkstyle/checkstyle.xml
rename to etc/checkstyle/checkstyle.xml
diff --git a/config/checkstyle/header.txt b/etc/checkstyle/header.txt
similarity index 100%
rename from config/checkstyle/header.txt
rename to etc/checkstyle/header.txt
diff --git a/config/checkstyle/suppressions.xml b/etc/checkstyle/suppressions.xml
similarity index 100%
rename from config/checkstyle/suppressions.xml
rename to etc/checkstyle/suppressions.xml
diff --git a/eclipse/.checkstyle b/etc/eclipse/.checkstyle
similarity index 100%
rename from eclipse/.checkstyle
rename to etc/eclipse/.checkstyle
diff --git a/eclipse/eclipse-code-formatter.xml b/etc/eclipse/eclipse-code-formatter.xml
similarity index 100%
rename from eclipse/eclipse-code-formatter.xml
rename to etc/eclipse/eclipse-code-formatter.xml
diff --git a/eclipse/org.eclipse.jdt.core.prefs b/etc/eclipse/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse/org.eclipse.jdt.core.prefs
rename to etc/eclipse/org.eclipse.jdt.core.prefs
diff --git a/eclipse/org.eclipse.jdt.ui.prefs b/etc/eclipse/org.eclipse.jdt.ui.prefs
similarity index 99%
rename from eclipse/org.eclipse.jdt.ui.prefs
rename to etc/eclipse/org.eclipse.jdt.ui.prefs
index 4aa772d8..b7140ec7 100644
--- a/eclipse/org.eclipse.jdt.ui.prefs
+++ b/etc/eclipse/org.eclipse.jdt.ui.prefs
@@ -59,7 +59,7 @@ cleanup_profile=_Spring Boot Cleanup Conventions
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Spring Boot Java Conventions
+formatter_profile=Spring Session Java Conventions
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 3f8b46e6..ceb26c17 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -78,7 +78,7 @@ task integrationTest(type: Test, dependsOn: jar) {
 check.dependsOn integrationTest
 
 checkstyle {
-	configFile = rootProject.file('config/checkstyle/checkstyle.xml')
+	configFile = rootProject.file('etc/checkstyle/checkstyle.xml')
 	configProperties.configDir = configFile.parentFile
 	toolVersion = '6.16.1'
 }