diff --git a/pom.xml b/pom.xml
index bb94b6ad7..5ffc5cdc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,8 @@
4.0.1
- 3.0.0
+ 8.26
+ 3.1.0
3.1.1
3.8.1
3.0.1
@@ -282,18 +283,25 @@
org.apache.maven.plugins
maven-checkstyle-plugin
${version.maven.checkstyle}
+
+
+ checkstyle
+ com.puppycrawl.tools
+ ${version.checkstyle}
+
+
+
+ qa/checkstyle/checkstyle.xml
+ UTF-8
+ true
+ true
+ true
+ warning
+ true
+
- validate
- validate
-
- qa/checkstyle/checkstyle.xml
- UTF-8
- true
- true
- true
- true
-
+ process-classes
check
diff --git a/qa/checkstyle/checkstyle.xml b/qa/checkstyle/checkstyle.xml
index d5041db43..3100daa22 100644
--- a/qa/checkstyle/checkstyle.xml
+++ b/qa/checkstyle/checkstyle.xml
@@ -1,136 +1,285 @@
+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
+ Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ -->
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/qa/eclipse/google-java-format-eclipse-plugin_1.7.0.jar b/qa/eclipse/google-java-format-eclipse-plugin_1.7.0.jar
new file mode 100644
index 000000000..080cea73f
Binary files /dev/null and b/qa/eclipse/google-java-format-eclipse-plugin_1.7.0.jar differ
diff --git a/qa/eclipse/taskana.importorder b/qa/eclipse/taskana.importorder
new file mode 100644
index 000000000..10f3a77d6
--- /dev/null
+++ b/qa/eclipse/taskana.importorder
@@ -0,0 +1,5 @@
+#Organize Import Order
+#Thu Dec 26 21:03:36 CET 2019
+2=pro.taskana
+1=
+0=\#
diff --git a/qa/eclipseFormatter/taskana_formatter.xml b/qa/eclipse/taskana_formatter_eclipse.xml
similarity index 81%
rename from qa/eclipseFormatter/taskana_formatter.xml
rename to qa/eclipse/taskana_formatter_eclipse.xml
index deae63b85..fcfd3a0d1 100644
--- a/qa/eclipseFormatter/taskana_formatter.xml
+++ b/qa/eclipse/taskana_formatter_eclipse.xml
@@ -1,15 +1,15 @@
-
-
+
+
-
+
-
+
@@ -25,15 +25,18 @@
+
-
+
-
-
-
+
+
+
+
+
+
-
@@ -42,16 +45,17 @@
-
+
+
+
-
-
+
@@ -60,10 +64,12 @@
+
+
+
-
@@ -72,30 +78,42 @@
-
-
+
+
+
+
+
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
@@ -103,86 +121,97 @@
+
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
+
-
+
-
+
+
-
+
+
+
+
+
+
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
@@ -192,7 +221,7 @@
-
+
@@ -200,7 +229,6 @@
-
@@ -212,6 +240,7 @@
+
@@ -234,18 +263,21 @@
+
-
+
+
-
+
+
@@ -253,62 +285,77 @@
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
diff --git a/qa/intellij/settings.zip b/qa/intellij/settings.zip
new file mode 100644
index 000000000..93ec5246b
Binary files /dev/null and b/qa/intellij/settings.zip differ
diff --git a/qa/intellij/taskana_formatter_intellij.xml b/qa/intellij/taskana_formatter_intellij.xml
new file mode 100644
index 000000000..ac1ac91b6
--- /dev/null
+++ b/qa/intellij/taskana_formatter_intellij.xml
@@ -0,0 +1,720 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ hashCode
+ true
+
+
+
+
+
+
+
+
+ true
+ equals
+ true
+
+
+
+
+
+
+
+
+ true
+ toString
+ true
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:.*Style
+
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:layout_width
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_height
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_weight
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_margin
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_marginTop
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_marginBottom
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_marginStart
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_marginEnd
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_marginLeft
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_marginRight
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:layout_.*
+
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:padding
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:paddingTop
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:paddingBottom
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:paddingStart
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:paddingEnd
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:paddingLeft
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:paddingRight
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*
+ http://schemas.android.com/apk/res/android
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ http://schemas.android.com/apk/res-auto
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ http://schemas.android.com/tools
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/qa/intellijFormatter/README.md b/qa/intellijFormatter/README.md
deleted file mode 100644
index 80de2a7bb..000000000
--- a/qa/intellijFormatter/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# How to import IntelliJ Settings
-
-File -> import Settings -> select zip file
diff --git a/qa/intellijFormatter/taskana_formatter.zip b/qa/intellijFormatter/taskana_formatter.zip
deleted file mode 100644
index bb377dd96..000000000
Binary files a/qa/intellijFormatter/taskana_formatter.zip and /dev/null differ
diff --git a/web/.editorconfig b/web/.editorconfig
deleted file mode 100644
index 6e87a003d..000000000
--- a/web/.editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-# Editor configuration, see http://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false