<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>4.0.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
<relativePath>../odlparent-lite</relativePath>
</parent>
<!-- 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>
+ <karaf.version>4.2.2</karaf.version>
<!-- Used in bgpcep, lispflowmapping -->
<projectinfo>2.8.1</projectinfo>
<!-- Supporting Libraries -->
<!-- Only used internally -->
- <bouncycastle.version>1.60</bouncycastle.version>
+ <bouncycastle.version>1.61</bouncycastle.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. -->
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-artifacts</artifactId>
- <version>4.0.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- We import Karaf dependencies to ensure we converge by default on the versions used there -->
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</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.12</version>
+ <version>8.16</version>
</dependency>
<!-- Testing Dependencies -->
<version>3.0.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.7.4</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
- <version>1.7.4</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-support</artifactId>
- <version>1.7.4</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
- <version>1.7.4</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.7.4</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
- <version>1.7.4</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<!-- Generates immutable implementations, builders, the works -->
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
- <version>2.7.1</version>
+ <version>2.7.3</version>
<!-- Must be provided; scope=test here breaks APT in Eclipse :( -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
- <version>2.11.1</version>
+ <version>2.11.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
by checking it here: https://github.com/mycila/guice/blob/master/pom.xml#L103 -->
<version>4.1.0</version>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.3</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.11</version>
+ <version>1.12</version>
</dependency>
<!-- Jersey for JAXRS -->
<dependency>
<version>1.1.2</version>
</dependency>
- <!-- servlet 3.x support -->
- <!-- FIXME : remove all dependencies for jersey 1.17 -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>1.19.4</version>
- </dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>1.19.4</version>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>2.5.8</version>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.19.4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>1.19.4</version>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.3.2</version>
</dependency>
+
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>1.19.4</version>
- <scope>test</scope>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-inmemory</artifactId>
- <version>1.19.4</version>
- <scope>test</scope>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2</version>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>1.19.4</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
</dependency>
+
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.1</version>
</dependency>
+ <!-- These three need to be consistent:
+ jackson-2.9 needs woodstox-5.0.x
+ woodstox-5.0 needs stax2-api-3.1.x
+ -->
<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.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>5.0.3</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
- <version>2.9.7</version>
+ <version>2.9.8</version>
<scope>import</scope>
<type>pom</type>
</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.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>netty-all</artifactId>
<!-- If these are updated, the version in features.xml needs to be changed too -->
<!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
- <version>4.1.31.Final</version>
+ <version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.31.Final</version>
+ <version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
- <version>4.1.31.Final</version>
+ <version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.1.31.Final</version>
+ <version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.31.Final</version>
+ <version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.31.Final</version>
+ <version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
- <version>4.1.31.Final</version>
+ <version>4.1.33.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.31.Final</version>
+ <version>4.1.33.Final</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>1.2.0</version>
+ <version>1.2.2</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>
- <!-- 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>
+ <!-- This must be aligned with the version of enunciate-maven-plugin specified below -->
<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>
<artifactId>jolokia-osgi</artifactId>
<version>1.6.0</version>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20131018</version>
- </dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>6.2.1</version>
+ <version>7.0</version>
</dependency>
<!-- Configuration library -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>ssl-config-core_2.12</artifactId>
- <version>0.2.4</version>
+ <version>0.3.6</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.12</artifactId>
<!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-osgi_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-persistence-tck_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-protobuf_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-stream_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.12</artifactId>
- <version>2.5.14</version>
+ <version>2.5.21</version>
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.agrona</groupId>
<artifactId>agrona</artifactId>
- <version>0.9.21</version>
+ <version>0.9.33</version>
</dependency>
<dependency>
<groupId>io.aeron</groupId>
<artifactId>aeron-client</artifactId>
- <version>1.9.3</version>
+ <version>1.15.3</version>
</dependency>
<dependency>
<groupId>io.aeron</groupId>
<artifactId>aeron-driver</artifactId>
- <version>1.9.3</version>
+ <version>1.15.3</version>
</dependency>
<!-- Scala -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>2.12.7</version>
+ <version>2.12.8</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
- <version>2.12.7</version>
+ <version>2.12.8</version>
</dependency>
<!-- LMAX Disruptor -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-extender-service</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-inject</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-invoker-junit</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-features</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<type>xml</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-assembly</artifactId>
- <version>4.12.0</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-api</artifactId>
<!-- Note: keep this version synchronized with karaf -->
- <version>7.2.3</version>
+ <version>7.2.5</version>
</dependency>
<dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>9.4.11.v20180605</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.11.v20180605</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>9.4.11.v20180605</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.4.11.v20180605</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.196</version>
+ <version>1.4.198</version>
</dependency>
<!-- Xtend http://xtend-lang.org
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
- <version>2.16.0.M3</version>
+ <version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib.macro</artifactId>
- <version>2.16.0.M3</version>
+ <version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.lib</artifactId>
- <version>2.16.0.M3</version>
+ <version>2.16.0</version>
</dependency>
<!-- Annotations -->
<optional>true</optional>
</dependency>
- <!-- Cassandra -->
- <dependency>
- <groupId>com.datastax.cassandra</groupId>
- <artifactId>cassandra-driver-core</artifactId>
- <version>2.1.9</version>
- </dependency>
-
<!-- jung, a graph library -->
<dependency>
<groupId>net.sf.jung</groupId>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.7.1</version>
+ <version>4.7.2</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.9.0</version>
+ <version>1.10.1</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<!-- Apache SSHD with netty -->
<dependency>
<groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- <version>2.0.0</version>
+ <artifactId>sshd-netty</artifactId>
+ <version>2.2.0</version>
+ <exclusions>
+ <exclusion>
+ <!-- We provide sshd-osgi instead -->
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
- <artifactId>sshd-netty</artifactId>
- <version>2.0.0</version>
+ <artifactId>sshd-osgi</artifactId>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>net.i2p.crypto</groupId>
<version>0.3.0</version>
</dependency>
+ <!-- TrieMap library -->
+ <dependency>
+ <groupId>tech.pantheon.triemap</groupId>
+ <artifactId>bom</artifactId>
+ <version>1.0.4</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- Dropwizard metrics -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-bom</artifactId>
+ <version>4.0.5</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
<!-- JAXB for Java 11+ -->
- <!-- Since we need to run on Java 8, this should be 2.2.8, but unfortunately karaf-4.2.1 has a bad definition
- in its jre.properties.
- FIXME: bump this to 2.2.8 once we upgrade karaf to 4.2.2+
+ <!--
FIXME: bump this to 2.3.0 once we require Java 9+
FIXME: bump this to whatever karaf provides once we require Java 11+
-->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.1</version>
+ <version>2.2.8</version>
<exclusions>
<exclusion>
<!-- Provided by JRE -->
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.11</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
- <version>8.12</version>
+ <version>8.16</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>checkstyle</artifactId>
- <version>4.0.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>4.0.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.sevntu-checkstyle</groupId>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<artifactItem>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odl-license</artifactId>
- <version>4.0.3-SNAPSHOT</version>
+ <version>5.0.0-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},${project.build.directory}/classes/LICENSE,META-INF/git.properties=-${project.build.directory}/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,META-INF/services=-${project.build.directory}/classes/META-INF/services</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. -->
</plugin>
<plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
<!-- 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>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
+ <version>2.11.1</version>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>findbugs</artifactId>
- <version>4.0.3-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
- to 'Low'.
- -->
- <effort>Max</effort>
- <!-- Reports all bugs (other values are medium and max) -->
- <threshold>Low</threshold>
- <!-- Build doesn't fail if problems are found -->
- <failOnError>false</failOnError>
- <!-- References the excluded rules -->
- <excludeFilterFile>findbugs-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>
- </configuration>
- <executions>
- <!--
- Ensures that FindBugs inspects source code when project is compiled.
- -->
- <execution>
- <id>analyze-compile</id>
- <phase>compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>spotbugs</artifactId>
- <version>4.0.3-SNAPSHOT</version>
+ <version>5.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <!-- The SpotBugs Maven plugin uses SLF4J 1.8 beta 2 -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.8.0-beta2</version>
</dependency>
</dependencies>
<configuration>
<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.16.0.M3</version>
+ <version>2.16.0</version>
<executions>
<execution>
<goals>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
- <version>4.7.1</version>
+ <version>4.7.2</version>
</plugin>
</plugins>
</pluginManagement>
</plugin>
</plugins>
</reporting>
-
- <profiles>
- <profile>
- <!-- On JDK9-and-later findbugs fails -->
- <id>jdk9-findbugs</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <findbugs.skip>true</findbugs.skip>
- </properties>
- </profile>
- </profiles>
-
</project>
Code Review / odlparent.git / blobdiff