<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../odlparent-lite</relativePath>
</parent>
<java.version.source>${maven.compiler.source}</java.version.source>
<java.version.target>${maven.compiler.target}</java.version.target>
- <!-- Maven plugin versions, in the 'canonical' format -->
- <!-- Used in controller, didm, neutron, openflowplugin, persistence; see also affinity -->
- <maven.bundle.version>3.3.0</maven.bundle.version>
- <!-- Used in sxp -->
- <maven.clean.plugin.version>2.6.1</maven.clean.plugin.version>
- <!-- Used in controller, didm, l2switch, lacp, persistence; see also toolkit, tsdr, ttp -->
- <maven.compile.plugin.version>3.7.0</maven.compile.plugin.version>
- <!-- Used in controller, coretutorials, mdsal, snbi, yangtools -->
- <maven.javadoc.version>2.10.4</maven.javadoc.version>
- <!-- Used in snmp -->
- <maven.plugin.version>3.5</maven.plugin.version>
- <!-- Used in neutron, of-config, tsdr, yangtools -->
- <!-- Later versions break tests in downstream projects -->
- <maven.surefire.version>2.18.1</maven.surefire.version>
-
- <!-- Maven plugin versions, in random formats -->
- <!-- Used in aaa, alto, controller, didm, tsdr; see also affinity, snmp4sdn, toolkit, ttp -->
- <bundle.plugin.version>${maven.bundle.version}</bundle.plugin.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. -->
- <!-- Used in alto, controller, lacp, netide, openflowjava, packetcable, snmp4sdn, ttp; see also affinity, opendove,
- toolkit -->
- <checkstyle.version>2.17</checkstyle.version>
- <!-- Used in controller, packetcable -->
- <odl.checkstyle.version>3.0.0-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 -->
- <enforcer.version>3.0.0-M1</enforcer.version>
- <!-- Used in affinity, controller, nemo, opendove, snmp4sdn -->
- <enunciate.version>1.31</enunciate.version>
- <!-- Used in affinity, coretutorials, netide -->
- <exam.version>4.11.0</exam.version>
- <!-- Used in affinity, controller, neutron, of-config; see also snmp4sdn -->
- <failsafe.version>2.20.1</failsafe.version>
- <!-- Used in controller, netvirt, neutron, of-config, ovsdb, persistence, snmp4sdn, vtn; see also usc -->
- <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.1.2</karaf.version>
- <karaf.plugin.version>4.1.2</karaf.plugin.version>
- <!-- Used in lispflowmapping, snmp4sdn, vtn -->
+ <!-- Used in openflowplugin -->
+ <enforcer.version>3.0.0-M2</enforcer.version>
+ <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
+ <karaf.version>4.2.1</karaf.version>
+ <!-- Used in bgpcep, lispflowmapping -->
<projectinfo>2.8.1</projectinfo>
- <!-- Used in of-config; see also snmp4sdn -->
- <propertymavenplugin.version>1.0.0</propertymavenplugin.version>
- <!-- Used in topoprocessing; see also defense4all, snmp4sdn, toolkit -->
- <releaseplugin.version>2.5.3</releaseplugin.version>
<!-- Supporting Libraries -->
- <!-- Used by controller -->
- <bouncycastle.version>1.58</bouncycastle.version>
+ <!-- Only used internally -->
+ <bouncycastle.version>1.60</bouncycastle.version>
- <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
- <osgi.core.version>5.0.0</osgi.core.version>
-
- <akka.version>2.5.4</akka.version>
- <leveldb.version>0.7</leveldb.version>
+ <!-- JaCoCo configuration, by default tied to Sonar configuration, but can be overridden separately
+ to allow projects to report Sonar values from the entire project. -->
+ <jacoco.destFile>${project.build.directory}/code-coverage/jacoco.exec</jacoco.destFile>
<!-- Default Sonar configuration -->
<sonar-jacoco-listeners.version>3.8</sonar-jacoco-listeners.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
- <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
+ <sonar.jacoco.reportPath>${jacoco.destFile}</sonar.jacoco.reportPath>
<sonar.jacoco.itReportPath>${project.build.directory}/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+
<!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
<sonar.exclusions>**/gen/**,**/generated-sources/**,**/generated-test-sources/**,**/yang-gen/**,**/yang-gen-config/**,**/yang-gen-sal/**,**/yang-gen-code/**,**/pax/**</sonar.exclusions>
- <pmd.cpd.fail>false</pmd.cpd.fail>
+ <!-- Opt-in code quality checks -->
+ <pmd.cpd.fail>false</pmd.cpd.fail> <!-- Copy/paste detection -->
+ <duplicate-finder.skip>true</duplicate-finder.skip> <!-- Classpath duplicates -->
+
+ <!-- Redirect test output to files (overridable) -->
+ <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-artifacts</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<!-- This should match the plugin management on maven-checkstyle-plugin below -->
- <version>8.4</version>
+ <version>8.12</version>
</dependency>
<!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
- <version>1.3.0</version>
+ <version>1.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
+ <version>2.20.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>2.20.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>0.36</version>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+ <version>0.42</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth.extensions</groupId>
<artifactId>truth-java8-extension</artifactId>
- <version>0.36</version>
+ <version>0.42</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>2.0.0</version>
+ <version>3.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility-proxy</artifactId>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.6.4</version>
+ <version>1.7.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-support</artifactId>
- <version>1.6.4</version>
+ <version>1.7.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
- <version>1.6.4</version>
+ <version>1.7.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.6.4</version>
+ <version>1.7.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
- <version>1.6.4</version>
+ <version>1.7.4</version>
<scope>test</scope>
</dependency>
<!-- Generates immutable implementations, builders, the works -->
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
- <version>2.5.6</version>
+ <version>2.7.1</version>
<!-- Must be provided; scope=test here breaks APT in Eclipse :( -->
<scope>provided</scope>
</dependency>
<!-- Generates META-INF/services entries for ServiceLoader -->
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.21</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.21</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.21</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.21</version>
+ <version>1.7.25</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
- </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
+ </dependency>
+
+ <!-- log4j2 -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-bom</artifactId>
+ <version>2.11.1</version>
+ <scope>import</scope>
+ <type>pom</type>
</dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>23.3-jre</version>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+ <version>25.1-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
- <version>23.3-jre</version>
+ <version>25.1-jre</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>mycila-guice-jsr250</artifactId>
<!-- Make sure this version is in sync with the guice one below -->
<version>4.0.rc1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.6</version>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+ <version>3.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
<version>2.6</version>
</dependency>
<dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.17</version>
+ <version>1.19.4</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>1.17</version>
+ <version>1.19.4</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.17</version>
+ <version>1.19.4</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
- <version>1.17</version>
+ <version>1.19.4</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>1.17</version>
+ <version>1.19.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-inmemory</artifactId>
- <version>1.17</version>
+ <version>1.19.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.17</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller.thirdparty</groupId>
- <artifactId>com.sun.jersey.jersey-servlet</artifactId>
- <version>1.17</version>
+ <version>1.19.4</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<version>3.1.4</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-json-org</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.8.9</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>2.8.9</version>
+ <groupId>com.fasterxml.jackson</groupId>
+ <artifactId>jackson-bom</artifactId>
+ <version>2.9.6</version>
+ <scope>import</scope>
+ <type>pom</type>
</dependency>
<!-- TODO do we really need resteasy ? -->
<version>3.0.12.Final</version>
</dependency>
- <dependency>
- <groupId>com.sun.xml.txw2</groupId>
- <artifactId>txw2</artifactId>
- <version>20110809</version>
- </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.annotation</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.7</version>
+ <version>2.8.5</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
- <dependency>
- <groupId>eclipselink</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>2.0.4.v201112161009</version>
- </dependency>
- <dependency>
- <groupId>eclipselink</groupId>
- <artifactId>javax.resource</artifactId>
- <version>1.5.0.v200906010428</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.9.1.v20130814-1242</version>
- </dependency>
- <!-- Gemini Web -->
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.gemini.web.core</artifactId>
- <version>2.2.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.gemini.web.extender</artifactId>
- <version>2.2.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.gemini.web.tomcat</artifactId>
- <version>2.2.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.virgo.kernel.equinox.extensions</artifactId>
- <version>3.6.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.virgo.util.common</artifactId>
- <version>3.6.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.virgo.util.io</artifactId>
- <version>3.6.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.virgo.util.math</artifactId>
- <version>3.6.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.virgo.util.osgi</artifactId>
- <version>3.6.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.virgo.util.osgi.manifest</artifactId>
- <version>3.6.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>geminiweb</groupId>
- <artifactId>org.eclipse.virgo.util.parser.manifest</artifactId>
- <version>3.6.0.RELEASE</version>
- </dependency>
<!-- Netty -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<!-- If these are updated, the version in features.xml needs to be changed too -->
- <version>4.1.16.Final</version>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+ <version>4.1.28.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.16.Final</version>
+ <version>4.1.28.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
- <version>4.1.16.Final</version>
+ <version>4.1.28.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.1.16.Final</version>
+ <version>4.1.28.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.16.Final</version>
+ <version>4.1.28.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.16.Final</version>
+ <version>4.1.28.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
- <version>4.1.16.Final</version>
+ <version>4.1.28.Final</version>
</dependency>
<!-- Here we need to define all available native epoll implementations; we can't limit ourselves to the build
platform and we can't require the build platform to have an implementation (e.g. OS X) -->
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-x86_64</classifier>
- <version>4.1.16.Final</version>
+ <version>4.1.28.Final</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.activation</artifactId>
- <version>1.1.0.v201211130549</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.annotation</artifactId>
- <version>1.1.0.v201209060031</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.ejb</artifactId>
- <version>3.1.1.v201204261316</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.el</artifactId>
- <version>2.2.0.v201108011116</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.mail.glassfish</artifactId>
- <version>1.4.1.v201108011116</version>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- <version>1.2.0.v201105211821</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.servlet.jsp.jstl.impl</artifactId>
- <version>1.2.0.v201210211230</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>javax.xml.rpc</artifactId>
- <version>1.1.0.v201005080400</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.catalina</artifactId>
- <version>7.0.53.v201406061610</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.catalina.ha</artifactId>
- <version>7.0.53.v201406070630</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.catalina.tribes</artifactId>
- <version>7.0.53.v201406070630</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.coyote</artifactId>
- <version>7.0.53.v201406070630</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.el</artifactId>
- <version>7.0.53.v201406060720</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.jasper</artifactId>
- <version>7.0.53.v201406070630</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.juli.extras</artifactId>
- <version>7.0.53.v201406060720</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.tomcat.api</artifactId>
- <version>7.0.53.v201406060720</version>
- </dependency>
- <dependency>
- <groupId>orbit</groupId>
- <artifactId>org.apache.tomcat.util</artifactId>
- <version>7.0.53.v201406070630</version>
- </dependency>
- <dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
- <version>1.0.0</version>
- </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>4.3.0</version>
+ <version>4.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.shell</artifactId>
- <version>4.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>3.5.4</version>
+ <version>4.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>1.1.2</version>
- </dependency>
- <!-- felix webconsole -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.2.14</version>
- <!-- the all bundle includes all the necessary plugins -->
- <classifier>all</classifier>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
- <version>${enunciate.version}</version>
+ <!-- This must be aligned with the version of maven-enunciate-plugin specified below -->
+ <version>1.31</version>
+ <exclusions>
+ <exclusion>
+ <!-- JSR 250 API has 6 very old versions of javax.annotation @PreDestroy & Co.
+ which are in core rt.jar since Java 6; it also has Java EE @DataSourceDefinition
+ and @RunAs and @PermitAll & Co. which we do not require
+ (or at least not from jsr250-api via enunciate) -->
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.webcohesion.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
- <version>2.6.0</version>
+ <version>2.11.1</version>
+ <exclusions>
+ <exclusion>
+ <!-- see above -->
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.8</version>
- </dependency>
- <!-- equinox http service bridge -->
- <dependency>
- <groupId>org.eclipse.equinox.http</groupId>
- <artifactId>servlet</artifactId>
- <version>1.0.0-v20070606</version>
+ <version>1.4.0</version>
</dependency>
<!-- To upgrade org.eclipse.persistence dependencies to 2.6.0+, we need to ensure all downstreams consumers
pull in javax.validation first:
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.antlr</artifactId>
- <version>2.6.2</version>
+ <version>2.7.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.6.2</version>
+ <version>2.7.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
- <version>2.6.2</version>
+ <version>2.7.3</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.21.0-GA</version>
+ <version>3.23.1-GA</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-osgi</artifactId>
- <version>1.3.7</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.core.version}</version>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${osgi.core.version}</version>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>5.1</version>
- </dependency>
- <!-- Visual VM hook -->
- <dependency>
- <groupId>org.ow2.chameleon.management</groupId>
- <artifactId>chameleon-mbeans</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>3.2.17.RELEASE</version>
- </dependency>
- <!-- Spring security -->
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>3.2.9.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>3.2.9.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-taglibs</artifactId>
- <version>3.2.9.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>3.2.9.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>virgomirror</groupId>
- <artifactId>org.eclipse.jdt.core.compiler.batch</artifactId>
- <version>3.8.0.I20120518-2145</version>
+ <artifactId>asm</artifactId>
+ <version>6.2.1</version>
</dependency>
<!-- Configuration library -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2</version>
</dependency>
<!-- Reactive Streams, used by Akka -->
</dependency>
<!-- Akka -->
- <dependency>
- <groupId>com.typesafe</groupId>
- <artifactId>ssl-config-akka_2.12</artifactId>
- <version>0.2.1</version>
- </dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>ssl-config-core_2.12</artifactId>
- <version>0.2.1</version>
+ <version>0.2.4</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.12</artifactId>
- <version>${akka.version}</version>
+ <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-osgi_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence-tck_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-protobuf_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-stream_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.12</artifactId>
- <version>${akka.version}</version>
+ <version>2.5.14</version>
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_2.12</artifactId>
- <version>1.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.iq80.leveldb</groupId>
- <artifactId>leveldb</artifactId>
- <version>${leveldb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fusesource.leveldbjni</groupId>
- <artifactId>leveldbjni-all</artifactId>
- <version>1.8-odl</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.uncommons.maths</groupId>
<artifactId>uncommons-maths</artifactId>
<version>1.2.2a</version>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
- </dependency>
<!-- Aeron, required by Akka -->
<dependency>
<groupId>org.agrona</groupId>
<artifactId>agrona</artifactId>
- <version>0.9.5</version>
+ <version>0.9.21</version>
</dependency>
<dependency>
<groupId>io.aeron</groupId>
<artifactId>aeron-client</artifactId>
- <version>1.2.5</version>
+ <version>1.9.3</version>
</dependency>
<dependency>
<groupId>io.aeron</groupId>
<artifactId>aeron-driver</artifactId>
- <version>1.2.5</version>
+ <version>1.9.3</version>
</dependency>
<!-- Scala -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.12.3</version>
+ <version>2.12.6</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>2.12.3</version>
+ <version>2.12.6</version>
</dependency>
<!-- LMAX Disruptor -->
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
- <!-- If this is updated, the version in features.xml needs to be changed too -->
- <version>3.3.6</version>
+ <version>3.4.1</version>
</dependency>
<!-- Add Pax Exam -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-extender-service</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-inject</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-invoker-junit</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-features</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<type>xml</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-assembly</artifactId>
- <version>${exam.version}</version>
+ <version>4.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-link</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.5.3</version>
+ <version>2.5.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-api</artifactId>
+ <!-- Note: keep this version synchronized with karaf -->
+ <version>7.2.3</version>
</dependency>
<dependency>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <version>2.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
+ <version>2.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- FIXME: remove this once we have migrated over -->
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.6</version>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-legacy</artifactId>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>9.2.19.v20160908</version>
+ <version>9.4.11.v20180605</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.2.19.v20160908</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet-tester</artifactId>
- <version>9.2.19.v20160908</version>
- <scope>test</scope>
+ <version>9.4.11.v20180605</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>9.2.19.v20160908</version>
+ <version>9.4.11.v20180605</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.2.19.v20160908</version>
+ <version>9.4.11.v20180605</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.193</version>
+ <version>1.4.196</version>
</dependency>
<!-- Xtend http://xtend-lang.org
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
- <version>2.13.0</version>
+ <version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib.macro</artifactId>
- <version>2.13.0</version>
+ <version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.lib</artifactId>
- <version>2.13.0</version>
+ <version>2.14.0</version>
</dependency>
<!-- Annotations -->
<version>1</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.cdi</groupId>
- <artifactId>pax-cdi-api</artifactId>
- <version>1.0.0.RC2</version>
- <optional>true</optional>
- </dependency>
<!-- Cassandra -->
<dependency>
<version>2.1.9</version>
</dependency>
- <!-- Metrics -->
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>3.2.3</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-graphite</artifactId>
- <version>3.2.3</version>
- </dependency>
-
<!-- jung, a graph library -->
<dependency>
<groupId>net.sf.jung</groupId>
<version>${karaf.version}</version>
</dependency>
+ <!-- ThreeTen-Extra, date/time complements -->
+ <dependency>
+ <groupId>org.threeten</groupId>
+ <artifactId>threeten-extra</artifactId>
+ <version>1.4</version>
+ </dependency>
+
<!-- When updating this version, consider antl4-maven-plugin below -->
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.7</version>
+ <version>4.7.1</version>
</dependency>
<!-- Aries' Blueprint version should be kept in sync to the version actually
used by our ${karaf[4].version} ... please bump this when increasing that.
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.7.1</version>
+ <version>1.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-maven-plugin-annotation</artifactId>
+ <version>1.3.0</version>
+ <optional>true</optional>
</dependency>
+ <!-- Apache SSHD with netty -->
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-netty</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.i2p.crypto</groupId>
+ <artifactId>eddsa</artifactId>
+ <version>0.3.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <!-- Karaf provides SL4FJ encapsulation -->
+ <!--
+ We expect slf4j-api to be provided by the platform.
+ Karaf provides it, other containers need to provide it themselves.
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Enable useful code quality annotations everywhere -->
+ <!--
+ Enable useful code quality annotations everywhere. Since these annotations
+ are not required at runtime.
+ -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<artifactId>org.eclipse.jdt.annotation</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!--
+ Testing output should be routed through slf4j-simple.
+ -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!--
+ Unit tests can use JUnit + Mockito + Hamcrest by default.
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.version}</version>
+ <version>3.0.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
- <version>8.4</version>
+ <version>8.12</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>checkstyle</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.sevntu-checkstyle</groupId>
<artifactId>sevntu-checkstyle-maven-plugin</artifactId>
- <version>1.24.2</version>
+ <version>1.32.0</version>
</dependency>
</dependencies>
<configuration>
<configLocation>odl_checks.xml</configLocation>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the
+ <!-- <sourceDirectories> are needed so that checkstyle ignores the
generated sources directory -->
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<includeResources>true</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>true</includeTestResources>
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<excludes>
org/opendaylight/yang/gen/**,
**/protobuff/messages/**,
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.8</version>
+ <version>3.10.0</version>
<executions>
<execution>
<id>cpd</id>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compile.plugin.version}</version>
+ <version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
+ <showWarnings>true</showWarnings>
<compilerArgs>
<arg>-parameters</arg>
+ <arg>-Xlint:deprecation</arg>
+ <arg>-Xlint:unchecked</arg>
</compilerArgs>
</configuration>
</plugin>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
+ <version>2.22.0</version>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>2.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<artifactItem>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${maven.plugin.version}</version>
+ <version>3.5</version>
</plugin>
<plugin>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven.surefire.version}</version>
+ <version>2.22.0</version>
<configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <redirectTestOutputToFile>${maven.test.redirectTestOutputToFile}</redirectTestOutputToFile>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<!-- Support Blueprint XML construction using annotations -->
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin</artifactId>
- <version>1.4.0</version>
- <configuration>
- <scanPaths>
- <scanPath>org.opendaylight</scanPath>
- </scanPaths>
- </configuration>
+ <version>1.10.0</version>
+ <!-- TODO remove dependencies when we bump from 1.10.0 to 1.11.0 (or 1.10.1);
+ see https://jira.opendaylight.org/browse/ODLPARENT-167 & https://jira.apache.org/jira/browse/ARIES-1826 -->
<dependencies>
<dependency>
- <!-- See https://issues.apache.org/jira/browse/ARIES-1596 -->
- <!-- This shouldn't be necessary with plugin version 1.5.0 -->
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
- <version>4.5</version>
+ <version>4.9</version>
</dependency>
</dependencies>
+ <configuration>
+ <scanPaths>
+ <scanPath>org.opendaylight</scanPath>
+ </scanPaths>
+ </configuration>
<executions>
<execution>
<goals>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
+ <version>4.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
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},${project.build.directory}/classes/LICENSE,META-INF/git.properties=-${project.build.directory}/classes/META-INF/git.properties</Include-Resource>
+
+ <!-- Based on https://dev.eclipse.org/mhonarc/lists/equinox-dev/msg01088.html we do want
+ to generate Import-Service and Export-Service headers. -->
+ <_removeheaders>Import-Service,Export-Service</_removeheaders>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>maven-enunciate-plugin</artifactId>
- <version>${enunciate.version}</version>
+ <!-- This must be aligned with the version of enunciate-core-annotations specified above -->
+ <version>1.31</version>
</plugin>
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.12</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.4</version>
+ <version>3.0.5</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>findbugs</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <!-- NOTE: This version SHOULD be kept in sync with the same version in the new spotbugs-maven-plugin below,
+ but 1.4.1 broke compability with (the version we use of) FindBugs, so must keep this at 1.4.0. -->
+ <version>1.4.0</version>
+ </plugin>
+ </plugins>
<!--
Enables analysis which takes more memory but finds more bugs.
If you run out of memory, changes the value of the effort element
<xmlOutput>true</xmlOutput>
<!-- Configures the directory in which the XML report is created -->
<findbugsXmlOutputDirectory>${project.build.directory}/findbugs</findbugsXmlOutputDirectory>
- </configuration>
- <executions>
+ </configuration>
+ <executions>
<!--
Ensures that FindBugs inspects source code when project is compiled.
-->
<goal>check</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.0-RC6</version>
+ <version>3.1.6</version>
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
- <version>3.1.0</version>
+ <version>3.1.7</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>findbugs</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>spotbugs</artifactId>
+ <version>4.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
+ <plugins>
+ <plugin>
+ <groupId>jp.skypencil.findbugs.slf4j</groupId>
+ <artifactId>bug-pattern</artifactId>
+ <!-- NOTE: This version MUST be kept in sync with the same version in the old findbugs-maven-plugin above, if possible -->
+ <version>1.4.1</version>
+ </plugin>
+ </plugins>
<!--
Enables analysis which takes more memory but finds more bugs.
If you run out of memory, changes the value of the effort element
<!-- Build doesn't fail if problems are found -->
<failOnError>false</failOnError>
<!-- References the excluded rules -->
- <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+ <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
<!-- Produces XML report -->
<xmlOutput>true</xmlOutput>
<!-- Configures the directory in which the XML report is created -->
- <findbugsXmlOutputDirectory>${project.build.directory}/findbugs</findbugsXmlOutputDirectory>
+ <findbugsXmlOutputDirectory>${project.build.directory}/spotbugs</findbugsXmlOutputDirectory>
</configuration>
<executions>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
- <version>${propertymavenplugin.version}</version>
+ <version>1.0.0</version>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<!-- NOTE: This version MUST be kept in sync with the Xtend version in <dependencyManagement> -->
- <version>2.13.0</version>
+ <version>2.14.0</version>
<executions>
<execution>
<goals>
</configuration>
</execution>
</executions>
+
+ <!-- This is needed because upstream got broken by their inconsistency: pulling in old core,
+ but using ranges for other components. No wonder it blew up. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.equinox.common</artifactId>
+ <version>3.10.0</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<versionRange>[0.7.0,)</versionRange>
<goals>
<goal>prepare-agent</goal>
- <goal>report</goal>
</goals>
</pluginExecutionFilter>
<action>
</action>
</pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.basepom.maven</groupId>
+ <artifactId>
+ duplicate-finder-maven-plugin
+ </artifactId>
+ <versionRange>[1.2.1,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
<configuration>
<!-- Note: This exclusion list should match <sonar.exclusions>
property above -->
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
- <version>4.7</version>
+ <version>4.7.1</version>
</plugin>
</plugins>
</pluginManagement>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.basepom.maven</groupId>
+ <artifactId>duplicate-finder-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <executions>
+ <execution>
+ <id>find-duplicate-classpath-entries</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- https://github.com/basepom/duplicate-finder-maven-plugin/wiki -->
+ <failBuildInCaseOfConflict>false</failBuildInCaseOfConflict>
+ <failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
+ <failBuildInCaseOfEqualContentConflict>false</failBuildInCaseOfEqualContentConflict>
+ <printEqualFiles>false</printEqualFiles>
+ <quiet>true</quiet>
+ <!-- In addition to https://github.com/basepom/duplicate-finder-maven-plugin/wiki/Default%20ignored%20elements,
+ as explained on https://github.com/basepom/duplicate-finder-maven-plugin/wiki/Ignoring%20Dependencies%20and%20Resources,
+ we use resources not dependencies (see https://github.com/basepom/duplicate-finder-maven-plugin/wiki/Classpath%20Exceptions)
+ also ignore: -->
+ <ignoredResourcePatterns>
+ <ignoredResourcePattern>org/opendaylight/blueprint/.*\.xml$</ignoredResourcePattern>
+ <ignoredResourcePattern>OSGI-OPT/bnd.bnd$</ignoredResourcePattern>
+ <ignoredResourcePattern>WEB-INF/web.xml</ignoredResourcePattern>
+ <ignoredResourcePattern>README.*$</ignoredResourcePattern>
+ <ignoredResourcePattern>.*\.html$</ignoredResourcePattern>
+ <ignoredResourcePattern>reference.conf</ignoredResourcePattern>
+ </ignoredResourcePatterns>
+ <ignoredDependencies>
+ <ignoredDependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </ignoredDependency>
+ <ignoredDependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>opendaylight-karaf-empty</artifactId>
+ </ignoredDependency>
+ </ignoredDependencies>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<goal>prepare-agent</goal>
</goals>
<configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
+ <destFile>${jacoco.destFile}</destFile>
</configuration>
</execution>
</executions>
</dependency>
</dependencies>
</plugin>
-
- <!-- Blueprint dependency injection -->
- <!-- Remove when upgrading to plugin 1.5.0, and use
- <configuration><generatedDir>org/opendaylight/blueprint/</...></...>
- See https://issues.apache.org/jira/browse/ARIES-1597
- BUT beware that the directory is now conditional... -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- This should only run once, in the process-classes phase; but we need it to run after
- process-classes in child projects. Attaching to process-test-classes and prepare-package
- ensures that the file will be moved whether tests are skipped or not. -->
- <execution>
- <id>move-autowire-test</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
- <if>
- <available file="${project.basedir}/src/main/resources/org/opendaylight/blueprint" type="dir"/>
- <then>
- <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
- <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
- todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
- failonerror="false" quiet="true" />
- </then>
- <else>
- <echo>NOT moving autowire.xml (to org/opendaylight/blueprint)</echo>
- </else>
- </if>
- </target>
- </configuration>
- </execution>
- <execution>
- <id>move-autowire-package</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
- <if>
- <available file="${project.basedir}/src/main/resources/org/opendaylight/blueprint" type="dir"/>
- <then>
- <echo>Moving autowire.xml to org/opendaylight/blueprint</echo>
- <move file="${project.build.directory}/generated-resources/OSGI-INF/blueprint/autowire.xml"
- todir="${project.build.directory}/generated-resources/org/opendaylight/blueprint"
- failonerror="false" quiet="true" />
- </then>
- <else>
- <echo>NOT moving autowire.xml (to org/opendaylight/blueprint)</echo>
- </else>
- </if>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.8.1</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.version}</version>
+ <version>3.0.0</version>
</plugin>
<!-- FIXME: activate this
</reportSet>
</reportSets>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://doc.akka.io/japi/akka/${akka.version}/</link>
- <link>https://google.github.io/guava/releases/23.3-jre/api/docs/</link>
- <link>http://netty.io/4.1/api/</link>
- </links>
- </configuration>
- </plugin>
</plugins>
</reporting>
- <!--
- Maven Site Configuration
-
- The following configuration is necessary for maven-site-plugin to
- correctly identify the correct deployment path for OpenDaylight Maven
- sites.
- -->
- <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
- <distributionManagement>
- <site>
- <id>opendaylight-site</id>
- <url>${nexus.site.url}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
+ <profiles>
+ <profile>
+ <!-- On JDK9-and-later findbugs fails -->
+ <id>jdk9-findbugs</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration combine.children="append">
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>