From 8e950db6f4c30b08b1eb6ddb17050782d19ec3c0 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 10 Jun 2016 10:36:43 +0100 Subject: [PATCH 1/2] Update .gitignore to use template --- .gitignore | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e43e9a3..4ea327c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - # Package Files # *.jar *.war @@ -10,4 +5,44 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -/target + +# maven build outputs +target/ + +# netbeans legacy +nbproject/ +nbactions.xml + +# eclipse legacy +.project + +# intellij +.idea/libraries/ +.idea/workspace.xml +.idea/uiDesigner.xml +.idea/compiler.xml +.idea/misc.xml +.idea/checkstyle.xml +.idea/artifacts/ +.idea/dataSources* +.idea/tasks.xml +.idea/dictionaries/ +.idea/shelf/ +.idea/dynamic.xml +.idea/sqlDataSources.xml +.idea/gradle.xml +.idea/mongoSettings.xml + +# Spring +spring.log +logs/ +/application.properties +/bootstrap.properties + +# Composer-style +vendor + +# Git and temp files +*.orig +*.patch +*~ From 3984f801468a890ad0da6e8b40ed81140bccae15 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 10 Jun 2016 10:36:59 +0100 Subject: [PATCH 2/2] Add files not longer ignored --- .idea/.name | 1 + .idea/checkstyle-idea.xml | 10 ++ .idea/codeStyleSettings.xml | 105 ++++++++++++++++++ .idea/encodings.xml | 6 + .idea/inspectionProfiles/Project_Default.xml | 60 ++++++++++ .../inspectionProfiles/profiles_settings.xml | 7 ++ .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 + wiser-assertions.iml | 33 ++++++ 9 files changed, 236 insertions(+) create mode 100644 .idea/.name create mode 100644 .idea/checkstyle-idea.xml create mode 100644 .idea/codeStyleSettings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 wiser-assertions.iml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..aa042d1 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +wiser-assertions \ No newline at end of file diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..9d5b48d --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 0000000..fb808ee --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,105 @@ + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..b26911b --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..b42a9f8 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,60 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..3b31283 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..0cf1fee --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/wiser-assertions.iml b/wiser-assertions.iml new file mode 100644 index 0000000..2bfebb1 --- /dev/null +++ b/wiser-assertions.iml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file