You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2018/01/03 22:38:26 UTC
[cxf-build-utils] branch master updated: Attempt to find an import
order that is at least similar to what we have been using to avoid a
MASSIVE set of changes. Will still require a ton though. :(
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git
The following commit(s) were added to refs/heads/master by this push:
new b535a86 Attempt to find an import order that is at least similar to what we have been using to avoid a MASSIVE set of changes. Will still require a ton though. :(
b535a86 is described below
commit b535a869dc40cff152af3977a55fb6c89d993f14
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Jan 3 17:37:37 2018 -0500
Attempt to find an import order that is at least similar to what we have been using to avoid a MASSIVE set of changes. Will still require a ton though. :(
---
buildtools/src/main/resources/cxf-checkstyle-corba.xml | 10 +++++++---
buildtools/src/main/resources/cxf-checkstyle.xml | 8 ++++++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/buildtools/src/main/resources/cxf-checkstyle-corba.xml b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
index 2ace74b..7fbbbce 100644
--- a/buildtools/src/main/resources/cxf-checkstyle-corba.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
@@ -83,9 +83,13 @@
<module name="RedundantImport" />
<module name="UnusedImports" />
<module name="ImportOrder">
- <property name="groups"
- value="java,javax,org.w3c,org.xml,junit,antlr,com,net,org,*" />
- <property name="ordered" value="true" />
+ <property name="groups" value="java,javax,org.w3c,org.xml,antlr,com,*,/^org\.(easymock|junit)\./" />
+ <property name="ordered" value="true" />
+ <property name="separated" value="true"/>
+
+ <!-- static imports sorted at the bottom -->
+ <property name="option" value="bottom"/>
+ <property name="sortStaticImportsAlphabetically" value="true"/>
</module>
<!--
<module name="ImportControl">
diff --git a/buildtools/src/main/resources/cxf-checkstyle.xml b/buildtools/src/main/resources/cxf-checkstyle.xml
index 8c964f4..438a72d 100644
--- a/buildtools/src/main/resources/cxf-checkstyle.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle.xml
@@ -80,9 +80,13 @@
<module name="RedundantImport" />
<module name="UnusedImports" />
<module name="ImportOrder">
- <property name="groups"
- value="java,javax,org.w3c,org.xml,junit,antlr,com.,net,org,*" />
+ <property name="groups" value="java,javax,org.w3c,org.xml,antlr,com,*,/^org\.(easymock|junit)\./" />
<property name="ordered" value="true" />
+ <property name="separated" value="true"/>
+
+ <!-- static imports sorted at the bottom -->
+ <property name="option" value="bottom"/>
+ <property name="sortStaticImportsAlphabetically" value="true"/>
</module>
<!--
<module name="ImportControl">
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].