diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/checkstyle/src/main/resources/honeycomb-checkstyle.xml | 5 | ||||
| -rw-r--r-- | common/honeycomb-parent/pom.xml | 25 | ||||
| -rw-r--r-- | common/scripts-parent/pom.xml | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml b/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml index e3a220742..fec708a37 100644 --- a/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml +++ b/common/checkstyle/src/main/resources/honeycomb-checkstyle.xml @@ -43,10 +43,7 @@ <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> </module> <module name="NeedBraces"/> - <module name="LeftCurly"> - <property name="maxLineLength" value="100"/> - </module> - <module name="RightCurly"/> + <module name="LeftCurly"/> <module name="RightCurly"> <property name="option" value="alone"/> <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml index 530235637..1a13b07cb 100644 --- a/common/honeycomb-parent/pom.xml +++ b/common/honeycomb-parent/pom.xml @@ -46,14 +46,14 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- ODL dependencies --> - <odl.yangtools.version>2.0.11</odl.yangtools.version> - <odl.mdsal.version>2.5.0</odl.mdsal.version> - <odl.mdsal.controller.version>1.8.0</odl.mdsal.controller.version> - <odl.mdsalmodel.version>0.13.0</odl.mdsalmodel.version> - <odl.netconf.version>1.5.0</odl.netconf.version> - <odl.restconf.version>1.8.0</odl.restconf.version> - <odl.salGenerator.version>0.13.0</odl.salGenerator.version> - <odl.bgpcep.version>0.10.0</odl.bgpcep.version> + <odl.yangtools.version>2.1.8</odl.yangtools.version> + <odl.mdsal.version>3.0.6</odl.mdsal.version> + <odl.mdsal.controller.version>1.9.0</odl.mdsal.controller.version> + <odl.mdsalmodel.version>0.13.2</odl.mdsalmodel.version> + <odl.netconf.version>1.6.0</odl.netconf.version> + <odl.restconf.version>1.9.0</odl.restconf.version> + <odl.salGenerator.version>0.13.2</odl.salGenerator.version> + <odl.bgpcep.version>0.11.0</odl.bgpcep.version> <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath> <!-- common dependencies --> @@ -66,8 +66,8 @@ <jdt.version>2.1.150</jdt.version> <!-- plugins --> - <checkstyle.plugin.version>2.17</checkstyle.plugin.version> - <checkstyle.version>7.1.2</checkstyle.version> + <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version> + <checkstyle.version>8.18</checkstyle.version> <maven.javadoc.version>2.10.3</maven.javadoc.version> <jacoco.version>0.7.9</jacoco.version> <enforcer.version>1.4</enforcer.version> @@ -275,7 +275,10 @@ <phase>process-sources</phase> <configuration> <configLocation>honeycomb-checkstyle-logging.xml</configLocation> - <sourceDirectory>${project.basedir}</sourceDirectory> + <sourceDirectories> + <sourceDirectory>${project.basedir}</sourceDirectory> + </sourceDirectories> + <outputFile>${project.build.directory}/checkstyle-logging-result.xml</outputFile> </configuration> </execution> diff --git a/common/scripts-parent/pom.xml b/common/scripts-parent/pom.xml index a454b02f9..82bbf4fa9 100644 --- a/common/scripts-parent/pom.xml +++ b/common/scripts-parent/pom.xml @@ -32,7 +32,7 @@ <groovy.version>2.4.7</groovy.version> <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> - <odl.yang-binding.version>0.13.0</odl.yang-binding.version> + <odl.yang-binding.version>0.13.2</odl.yang-binding.version> </properties> <dependencyManagement> |