diff --git a/dhp-build/dhp-code-style/pom.xml b/dhp-build/dhp-code-style/pom.xml
index e05788828..830723c9f 100644
--- a/dhp-build/dhp-code-style/pom.xml
+++ b/dhp-build/dhp-code-style/pom.xml
@@ -9,4 +9,10 @@
dhp-code-style
1.1.7-SNAPSHOT
+ jar
+
+
+ UTF-8
+
+
\ No newline at end of file
diff --git a/dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_aosp_custom.xml b/dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_dnet.xml
similarity index 50%
rename from dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_aosp_custom.xml
rename to dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_dnet.xml
index 1371b66aa..fcba2c4b2 100644
--- a/dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_aosp_custom.xml
+++ b/dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_dnet.xml
@@ -362,4 +362,366 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_forge.xml b/dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_forge.xml
deleted file mode 100644
index 871de0469..000000000
--- a/dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_forge.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a60b08d60..bb48c04a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -484,11 +484,31 @@
format
- eclipse/formatter_aosp_custom.xml
+ eclipse/formatter_dnet.xml
+
+ net.revelc.code
+ impsort-maven-plugin
+ 1.4.1
+
+ java.,javax.,org.,com.
+ java,*
+
+ **/thrift/*.java
+
+
+
+
+ sort-imports
+
+ sort
+
+
+
+
org.apache.maven.plugins
maven-release-plugin