diff options
author | 2015-10-09 18:32:44 -0700 | |
---|---|---|
committer | 2015-10-09 18:32:44 -0700 | |
commit | 6a07d2d622eaa06953f3353e39c080984076e8de (patch) | |
tree | bfb50a2090fce186c2cc545a400c969bf2ea702b /framework/src/onos/tools/build/conf | |
parent | e6d71622143ff9b2421a1abbe8434b954b5b1099 (diff) |
Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986
Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f
Diffstat (limited to 'framework/src/onos/tools/build/conf')
-rw-r--r-- | framework/src/onos/tools/build/conf/pom.xml | 2 | ||||
-rw-r--r-- | framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/framework/src/onos/tools/build/conf/pom.xml b/framework/src/onos/tools/build/conf/pom.xml index e4f8e9dc..29e4dea0 100644 --- a/framework/src/onos/tools/build/conf/pom.xml +++ b/framework/src/onos/tools/build/conf/pom.xml @@ -27,7 +27,7 @@ <groupId>org.onosproject</groupId> <artifactId>onos-build-conf</artifactId> - <version>1.0</version> + <version>1.1</version> <description>Various ONOS build settings</description> <properties> diff --git a/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml b/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml index 2908c891..1bb3b0bf 100644 --- a/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml +++ b/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml @@ -229,7 +229,10 @@ <!-- ONOS alows declarations inside of switch case blocks --> <property name="allowInSwitchCase" value="true"/> </module> - <module name="EmptyBlock"/> + <module name="EmptyBlock"> + <!-- allow empty block, as long as there's some comment --> + <property name="option" value="text"/> + </module> <module name="LeftCurly"/> <module name="NeedBraces"/> <module name="RightCurly"/> |