Merge "Bump Checkstyle version from 6.2 to 6.16"
authorRobert Varga <nite@hq.sk>
Tue, 17 May 2016 15:03:44 +0000 (15:03 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 17 May 2016 15:03:44 +0000 (15:03 +0000)
1  2 
odlparent/pom.xml

diff --combined odlparent/pom.xml
index 114000cddb21f53b0a58707e8c4b2927a4b0abdb,a5b2ea92abc051dcf85a98cd00df1932ade1c677..95b76e7dc4db9c80172908e5643b850b6d3cfcba
@@@ -61,7 -61,7 +61,7 @@@
      <!-- Maven plugin versions, in random formats -->
      <bundle.plugin.version>${maven.bundle.version}</bundle.plugin.version>
      <!-- Checkstyle 6.2 is the same as what the previous version 2.15 of maven-checkstyle-plugin used -->
-     <checkstyle.runtime.version>6.2</checkstyle.runtime.version>
+     <checkstyle.runtime.version>6.16</checkstyle.runtime.version>
      <!-- TODO rename checkstyle.version to checkstyle.maven.plugin.version,
           or just remove it, incl. all usages of it in a number of pom.xml; because normally,
           as maven-checkstyle-plugin is in pluginManagement, this should not have to be repeated. -->
@@@ -84,9 -84,7 +84,9 @@@
      -->
      <jacoco.version>0.7.2.201409121644</jacoco.version>
      <jar.plugin.version>${maven.jar.version}</jar.plugin.version>
 -    <karaf.version>3.0.3</karaf.version> <!-- Needs to remain exported, as its used for dependencies, too -->
 +    <!-- Used in aaa, controller, coretutorials, integration/distribution, l2switch, lacp, lispflowmapping, netide,
 +         nic, openflowplugin, ovsdb, persistence, sfc, snbi, snmp4sdn?, sxp, topoprocessing, unimgr, vtn -->
 +    <karaf.version>3.0.6</karaf.version>
      <projectinfo>2.8.1</projectinfo>
      <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
      <releaseplugin.version>${maven.release.version}</releaseplugin.version>
        <dependency>
            <groupId>org.jboss.resteasy</groupId>
            <artifactId>jaxrs-api</artifactId>
 -          <version>3.0.4.Final</version>
 +          <version>3.0.12.Final</version>
        </dependency>
  
        <dependency>
        <dependency>
          <groupId>commons-net</groupId>
          <artifactId>commons-net</artifactId>
 -        <version>3.4</version>
 +        <version>3.5</version>
        </dependency>
        <dependency>
          <groupId>eclipselink</groupId>