Update checkstyle config
- allow empty block, as long as there's some comment Change-Id: Idbaf727220dc9b2d301dfa19a8d3e185b1a865cd
Showing
3 changed files
with
8 additions
and
4 deletions
| ... | @@ -77,6 +77,7 @@ | ... | @@ -77,6 +77,7 @@ |
| 77 | 77 | ||
| 78 | <properties> | 78 | <properties> |
| 79 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | 79 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| 80 | + <onos-build-conf.version>1.0</onos-build-conf.version> | ||
| 80 | <netty4.version>4.0.23.Final</netty4.version> | 81 | <netty4.version>4.0.23.Final</netty4.version> |
| 81 | <copycat.version>0.5.0.onos</copycat.version> | 82 | <copycat.version>0.5.0.onos</copycat.version> |
| 82 | <openflowj.version>0.9.0.onos</openflowj.version> | 83 | <openflowj.version>0.9.0.onos</openflowj.version> |
| ... | @@ -596,7 +597,7 @@ | ... | @@ -596,7 +597,7 @@ |
| 596 | <dependency> | 597 | <dependency> |
| 597 | <groupId>org.onosproject</groupId> | 598 | <groupId>org.onosproject</groupId> |
| 598 | <artifactId>onos-build-conf</artifactId> | 599 | <artifactId>onos-build-conf</artifactId> |
| 599 | - <version>1.0</version> | 600 | + <version>${onos-build-conf.version}</version> |
| 600 | </dependency> | 601 | </dependency> |
| 601 | </dependencies> | 602 | </dependencies> |
| 602 | <configuration> | 603 | <configuration> |
| ... | @@ -652,7 +653,7 @@ | ... | @@ -652,7 +653,7 @@ |
| 652 | <dependency> | 653 | <dependency> |
| 653 | <groupId>org.onosproject</groupId> | 654 | <groupId>org.onosproject</groupId> |
| 654 | <artifactId>onos-build-conf</artifactId> | 655 | <artifactId>onos-build-conf</artifactId> |
| 655 | - <version>1.0</version> | 656 | + <version>${onos-build-conf.version}</version> |
| 656 | </dependency> | 657 | </dependency> |
| 657 | <!-- For Java 8 lambda support--> | 658 | <!-- For Java 8 lambda support--> |
| 658 | <dependency> | 659 | <dependency> | ... | ... |
| ... | @@ -27,7 +27,7 @@ | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | ||
| 28 | <groupId>org.onosproject</groupId> | 28 | <groupId>org.onosproject</groupId> |
| 29 | <artifactId>onos-build-conf</artifactId> | 29 | <artifactId>onos-build-conf</artifactId> |
| 30 | - <version>1.0</version> | 30 | + <version>1.1</version> |
| 31 | <description>Various ONOS build settings</description> | 31 | <description>Various ONOS build settings</description> |
| 32 | 32 | ||
| 33 | <properties> | 33 | <properties> | ... | ... |
| ... | @@ -229,7 +229,10 @@ | ... | @@ -229,7 +229,10 @@ |
| 229 | <!-- ONOS alows declarations inside of switch case blocks --> | 229 | <!-- ONOS alows declarations inside of switch case blocks --> |
| 230 | <property name="allowInSwitchCase" value="true"/> | 230 | <property name="allowInSwitchCase" value="true"/> |
| 231 | </module> | 231 | </module> |
| 232 | - <module name="EmptyBlock"/> | 232 | + <module name="EmptyBlock"> |
| 233 | + <!-- allow empty block, as long as there's some comment --> | ||
| 234 | + <property name="option" value="text"/> | ||
| 235 | + </module> | ||
| 233 | <module name="LeftCurly"/> | 236 | <module name="LeftCurly"/> |
| 234 | <module name="NeedBraces"/> | 237 | <module name="NeedBraces"/> |
| 235 | <module name="RightCurly"/> | 238 | <module name="RightCurly"/> | ... | ... |
-
Please register or login to post a comment