<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
<relativePath>../odlparent-lite</relativePath>
</parent>
toolkit -->
<checkstyle.version>2.17</checkstyle.version>
<!-- Used in controller, packetcable -->
- <odl.checkstyle.version>2.0.1-SNAPSHOT</odl.checkstyle.version>
+ <odl.checkstyle.version>2.0.3-SNAPSHOT</odl.checkstyle.version>
<!-- Used in snmp4sdn; see also toolkit -->
<compiler.version>${maven.compile.plugin.version}</compiler.version>
<!-- Used in controller, l2switch, netide, openflowjava, openflowplugin, snbi, tsdr, ttp; see also toolkit -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<!-- Used in aaa, controller, coretutorials, integration/distribution, l2switch, lacp, lispflowmapping, netide,
nic, openflowplugin, ovsdb, persistence, sfc, snbi, snmp4sdn?, sxp, topoprocessing, unimgr, vtn -->
- <karaf.version>4.0.9</karaf.version>
- <karaf.plugin.version>4.0.9</karaf.plugin.version>
+ <karaf.version>4.0.10</karaf.version>
+ <karaf.plugin.version>4.0.10</karaf.plugin.version>
<!-- Used in lispflowmapping, snmp4sdn, vtn -->
<projectinfo>2.8.1</projectinfo>
<!-- Used in of-config; see also snmp4sdn -->
<!-- Supporting Libraries -->
<!-- Used by controller -->
- <bouncycastle.version>1.56</bouncycastle.version>
+ <bouncycastle.version>1.57</bouncycastle.version>
<!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
<osgi.core.version>5.0.0</osgi.core.version>
- <akka.version>2.4.18</akka.version>
+ <akka.version>2.4.20</akka.version>
<scala.version>2.11</scala.version>
- <scala.micro.version>11</scala.micro.version>
+ <scala.micro.version>12</scala.micro.version>
<leveldb.version>0.7</leveldb.version>
<!-- Default Sonar configuration -->
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-artifacts</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<artifactId>plexus-slf4j-logging</artifactId>
<version>1.1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <!-- Needs to match jackson's idea of import -->
+ <version>3.1.4</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<artifactId>jackson-datatype-json-org</artifactId>
<version>2.3.2</version>
</dependency>
- <!-- TODO do we really need resteasy ? -->
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- <version>3.0.12.Final</version>
- </dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.3.2</version>
</dependency>
+
+ <!-- TODO do we really need resteasy ? -->
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ <version>3.0.12.Final</version>
+ </dependency>
+
<dependency>
<groupId>com.sun.xml.txw2</groupId>
<artifactId>txw2</artifactId>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>orbit</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-link</artifactId>
- <version>2.5.2</version>
+ <version>2.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.5.2</version>
+ <version>2.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.5.2</version>
+ <version>2.5.3</version>
</dependency>
<dependency>
</dependency>
<!-- Karaf console support -->
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.core</artifactId>
+ <version>${karaf.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.sevntu.checkstyle</groupId>
<artifactItem>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<!-- Note the '-' for git.properties.. this is required because git-commit-id-plugin has <failOnNoGitDirectory>false,
so that the build doesn't fail if there is no .../.git/ - so git.properties is effectively optional;
and so the '-' there is needed to make the maven-bundle-plugin if that resource is not present. -->
- <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
+ <Include-Resource>{maven-resources},${project.build.directory}/classes/LICENSE,META-INF/git.properties=-${project.build.directory}/classes/META-INF/git.properties</Include-Resource>
</instructions>
</configuration>
</plugin>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>findbugs</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>