Updating code style guide

velo · velo · commit 8117fcfe6fcf · 2018-05-17T16:08:36.000+12:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,7 +17,10 @@ Pull requests eventually need to resolve to a single commit. The commit log shou
   * The unreleased minor version is often a good default.
 
 ## Code Style
-When submitting code, please ensure you follow the [Google Style Guide](https://google.github.io/styleguide/javaguide.html). For example, you can format code with IntelliJ 13 using [this file](https://google.github.io/styleguide/intellij-java-google-style.xml) and with IntelliJ 15 using [this file](https://raw.githubusercontent.com/garukun/styleguide/add-intellij-15-java/intellij-15-java-google-style.xml).
+
+When submitting code, please use the feign code format conventions. If you use Eclipse `m2eclipse` should take care of all settings automatically.
+You can also import formatter settings using the [`eclipse-java-style.xml`](https://github.com/OpenFeign/feign/blob/master/src/config/eclipse-java-style.xml) file.
+If using IntelliJ IDEA, you can use the [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file.
 
 ## License
 
diff --git a/core/src/test/java/feign/client/TrustingSSLSocketFactory.java b/core/src/test/java/feign/client/TrustingSSLSocketFactory.java
@@ -26,7 +26,6 @@
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.net.ssl.*;
 
 /**
diff --git a/pom.xml b/pom.xml
@@ -448,7 +448,7 @@
         <version>2.2.0</version>
         <configuration>
           <lineEnding>LF</lineEnding>
-          <configFile>${main.basedir}/src/config/eclipse-java-google-style.xml</configFile>
+          <configFile>${main.basedir}/src/config/eclipse-java-style.xml</configFile>
         </configuration>
         <executions>
           <execution>
diff --git a/src/config/eclipse-java-style.xml b/src/config/eclipse-java-style.xml
