diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-08-05 17:56:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-05 17:56:15 +0000 |
| commit | 786f1203928b2e846d291d83fe150cb679d9bc07 (patch) | |
| tree | d85730ef1fd5c3a9bc3354362c52c5a1e2dffd5b | |
| parent | d674b9f99534106b4c99b9aa5e01c27e6585e633 (diff) | |
| parent | 2c39a4de018e8fe7e9b31d64354c2020d20b0366 (diff) | |
Merge "switch to sodium"
24 files changed, 1677 insertions, 1168 deletions
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 5fa6ff70..728496e6 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>odlparent</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> <relativePath/> </parent> @@ -44,26 +44,26 @@ <dependency> <groupId>org.opendaylight.bgpcep</groupId> <artifactId>bgp-artifacts</artifactId> - <version>0.11.1</version> + <version>0.12.3</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-broker-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-broker-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> <type>test-jar</type> <classifier>tests</classifier> <scope>test</scope> @@ -71,26 +71,26 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-test-model</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-artifacts</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-artifacts</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-artifacts</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> <type>pom</type> <scope>import</scope> </dependency> @@ -153,22 +153,7 @@ <artifactId>compress-lzf</artifactId> <version>1.0.2</version> </dependency> - <dependency> - <groupId>com.spatial4j</groupId> - <artifactId>spatial4j</artifactId> - <version>0.5</version> - </dependency> - <dependency> - <groupId>com.tdunning</groupId> - <artifactId>t-digest</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>com.twitter</groupId> - <artifactId>jsr166e</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>1.3.1</version> @@ -230,77 +215,7 @@ </dependency> <!-- There are newer major releases of lucene available --> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers-common</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-backward-codecs</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-grouping</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-highlighter</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-join</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-memory</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-misc</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queries</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queryparser</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-sandbox</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-spatial</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-spatial3d</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-suggest</artifactId> - <version>5.4.1</version> - </dependency> - <dependency> + <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.osgi-mock</artifactId> <version>2.3.10</version> @@ -338,40 +253,14 @@ <version>9.4.12.v20180830</version> </dependency> <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>elasticsearch</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>securesm</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.elasticsearch.plugin</groupId> - <artifactId>delete-by-query</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.hdrhistogram</groupId> - <artifactId>HdrHistogram</artifactId> - <version>2.1.6</version> - </dependency> - <dependency> <groupId>org.java-websocket</groupId> <artifactId>Java-WebSocket</artifactId> <version>1.4.0</version> </dependency> <dependency> - <groupId>org.joda</groupId> - <artifactId>joda-convert</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>2.23.4</version> - <scope>test</scope> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.9.10</version> </dependency> <dependency> <groupId>org.jsoup</groupId> diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index 2b67ffe8..4ca42242 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -20,11 +20,11 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>com.bea.xml</groupId> - <artifactId>jsr173-ri</artifactId> - <version>1.0</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>com.bea.xml</groupId> --> +<!-- <artifactId>jsr173-ri</artifactId> --> +<!-- <version>1.0</version> --> +<!-- </dependency> --> <dependency> <groupId>com.esotericsoftware</groupId> <artifactId>kryo</artifactId> @@ -43,67 +43,47 @@ <dependency> <groupId>com.fasterxml</groupId> <artifactId>classmate</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>com.fasterxml</groupId> - <artifactId>classmate</artifactId> <version>1.3.4</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.9.0</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>2.9.6</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.9.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.9.8</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.9.6</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.9.8</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> - <version>2.9.8</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-base</artifactId> - <version>2.9.8</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.9.8</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>2.9.8</version> + <version>2.9.10</version> </dependency> <dependency> <groupId>com.fasterxml.woodstox</groupId> <artifactId>woodstox-core</artifactId> - <version>5.0.3</version> + <version>5.3.0</version> </dependency> <dependency> <groupId>com.github.mifmif</groupId> @@ -128,7 +108,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>25.1-jre</version> + <version>27.1-jre</version> </dependency> <dependency> <groupId>com.google.j2objc</groupId> @@ -143,12 +123,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.172</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.4.199</version> + <version>1.4.200</version> </dependency> <dependency> <groupId>com.lmax</groupId> @@ -160,26 +135,26 @@ <artifactId>amqp-client</artifactId> <version>4.4.1</version> </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - <version>1.19.4</version> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>1.19.4</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> - </dependency> +<!-- <dependency> --> +<!-- <groupId>com.sun.jersey</groupId> --> +<!-- <artifactId>jersey-client</artifactId> --> +<!-- <version>1.19.4</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>com.sun.jersey</groupId> --> +<!-- <artifactId>jersey-core</artifactId> --> +<!-- <version>1.19.4</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> --> +<!-- </dependency> --> <dependency> <groupId>com.thoughtworks.paranamer</groupId> <artifactId>paranamer</artifactId> @@ -188,42 +163,42 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-actor_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-cluster_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-osgi_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-persistence_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-protobuf_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-remote_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-slf4j_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-stream_2.12</artifactId> - <version>2.5.22</version> + <version>2.5.31</version> </dependency> <dependency> <groupId>com.typesafe</groupId> @@ -233,7 +208,7 @@ <dependency> <groupId>com.typesafe</groupId> <artifactId>ssl-config-core_2.12</artifactId> - <version>0.3.7</version> + <version>0.3.8</version> </dependency> <dependency> <groupId>com.zaxxer</groupId> @@ -243,12 +218,12 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.3</version> + <version>1.9.4</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.12</version> + <version>1.14</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -328,47 +303,47 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-buffer</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-resolver</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport-native-unix-common</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport</artifactId> - <version>4.1.34.Final</version> + <version>4.1.49.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> @@ -393,7 +368,7 @@ <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> + <version>1.3</version> </dependency> <dependency> <groupId>javax.el</groupId> @@ -416,11 +391,6 @@ <version>2.0.1</version> </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>javax.jms-api</artifactId> - <version>2.0</version> - </dependency> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.4.7</version> @@ -448,11 +418,6 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.1.0.Final</version> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> <version>2.0.1.Final</version> </dependency> <dependency> @@ -465,11 +430,11 @@ <artifactId>javax.ws.rs-api</artifactId> <version>2.0.1</version> </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>1.1.1</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>javax.ws.rs</groupId> --> +<!-- <artifactId>jsr311-api</artifactId> --> +<!-- <version>1.1.1</version> --> +<!-- </dependency> --> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> @@ -478,7 +443,7 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.6.6</version> + <version>1.9.10</version> </dependency> <dependency> <groupId>net.i2p.crypto</groupId> @@ -493,11 +458,6 @@ <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> - <version>2.10.3</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> <version>2.10.6</version> </dependency> <dependency> @@ -608,7 +568,7 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>1.10.1</version> + <version>1.10.2</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> @@ -668,32 +628,32 @@ <dependency> <groupId>org.apache.aries.jpa.javax.persistence</groupId> <artifactId>javax.persistence_2.1</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> </dependency> <dependency> <groupId>org.apache.aries.jpa</groupId> <artifactId>org.apache.aries.jpa.api</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> </dependency> <dependency> <groupId>org.apache.aries.jpa</groupId> <artifactId>org.apache.aries.jpa.blueprint</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> </dependency> <dependency> <groupId>org.apache.aries.jpa</groupId> <artifactId>org.apache.aries.jpa.container</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> </dependency> <dependency> <groupId>org.apache.aries.jpa</groupId> <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> </dependency> <dependency> <groupId>org.apache.aries.jpa</groupId> <artifactId>org.apache.aries.jpa.support</artifactId> - <version>2.7.0</version> + <version>2.7.2</version> </dependency> <dependency> <groupId>org.apache.aries</groupId> @@ -703,12 +663,7 @@ <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy</artifactId> - <version>1.1.3</version> - </dependency> - <dependency> - <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy</artifactId> - <version>1.1.4</version> + <version>1.1.6</version> </dependency> <dependency> <groupId>org.apache.aries.quiesce</groupId> @@ -718,11 +673,6 @@ <dependency> <groupId>org.apache.aries.spifly</groupId> <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> - <version>1.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.aries.spifly</groupId> - <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> <version>1.2</version> </dependency> <dependency> @@ -738,11 +688,6 @@ <dependency> <groupId>org.apache.aries.transaction</groupId> <artifactId>org.apache.aries.transaction.blueprint</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.blueprint</artifactId> <version>2.2.0</version> </dependency> <dependency> @@ -758,22 +703,17 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.8.1</version> + <version>3.9</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-pool2</artifactId> - <version>2.4.2</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-pool2</artifactId> - <version>2.5.0</version> + <version>2.6.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.6</version> + <version>1.8</version> </dependency> <dependency> <groupId>org.apache.deltaspike.core</groupId> @@ -828,12 +768,12 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> - <version>10.13.1.1</version> + <version>10.14.2.0</version> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derbyclient</artifactId> - <version>10.13.1.1</version> + <version>10.14.2.0</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -843,7 +783,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.9.10</version> + <version>1.9.14</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -868,12 +808,12 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>5.6.10</version> + <version>5.6.12</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> - <version>4.0.6</version> + <version>4.0.8</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -903,7 +843,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr</artifactId> - <version>2.1.14</version> + <version>2.1.16</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -918,7 +858,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId> - <version>1.0.8</version> + <version>1.0.10</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -933,7 +873,7 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-connector</artifactId> - <version>3.1.1</version> + <version>3.1.4</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -1018,292 +958,292 @@ <dependency> <groupId>org.apache.karaf.audit</groupId> <artifactId>org.apache.karaf.audit.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.bundle</groupId> <artifactId>org.apache.karaf.bundle.blueprintstate</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.bundle</groupId> <artifactId>org.apache.karaf.bundle.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.config</groupId> <artifactId>org.apache.karaf.config.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.blueprint</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.features</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.kar</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.deployer</groupId> <artifactId>org.apache.karaf.deployer.wrap</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.diagnostic</groupId> <artifactId>org.apache.karaf.diagnostic.boot</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.diagnostic</groupId> <artifactId>org.apache.karaf.diagnostic.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.docker</groupId> <artifactId>org.apache.karaf.docker.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.command</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.extension</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.http</groupId> <artifactId>org.apache.karaf.http.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.instance</groupId> <artifactId>org.apache.karaf.instance.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas.blueprint</groupId> <artifactId>org.apache.karaf.jaas.blueprint.config</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas.blueprint</groupId> <artifactId>org.apache.karaf.jaas.blueprint.jasypt</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.boot</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.command</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.config</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.jasypt</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jaas</groupId> <artifactId>org.apache.karaf.jaas.modules</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jdbc</groupId> <artifactId>org.apache.karaf.jdbc.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jms</groupId> <artifactId>org.apache.karaf.jms.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.jndi</groupId> <artifactId>org.apache.karaf.jndi.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.kar</groupId> <artifactId>org.apache.karaf.kar.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.log</groupId> <artifactId>org.apache.karaf.log.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.management</groupId> <artifactId>org.apache.karaf.management.server</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf</groupId> <artifactId>manual</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.maven</groupId> <artifactId>org.apache.karaf.maven.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.obr</groupId> <artifactId>org.apache.karaf.obr.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf</groupId> <artifactId>org.apache.karaf.client</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf</groupId> <artifactId>org.apache.karaf.event</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.package</groupId> <artifactId>org.apache.karaf.package.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.profile</groupId> <artifactId>org.apache.karaf.profile.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.scheduler</groupId> <artifactId>org.apache.karaf.scheduler.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.scr</groupId> <artifactId>org.apache.karaf.scr.management</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.scr</groupId> <artifactId>org.apache.karaf.scr.state</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.service</groupId> <artifactId>org.apache.karaf.service.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.service</groupId> <artifactId>org.apache.karaf.service.guard</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.services</groupId> <artifactId>org.apache.karaf.services.coordinator</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.services</groupId> <artifactId>org.apache.karaf.services.eventadmin</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.commands</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.console</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.ssh</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.table</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.subsystem</groupId> <artifactId>org.apache.karaf.subsystem.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.system</groupId> <artifactId>org.apache.karaf.system.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.tooling</groupId> <artifactId>org.apache.karaf.tools.utils</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.web</groupId> <artifactId>org.apache.karaf.web.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.console</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.features</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.gogo</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.http</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.webconsole</groupId> <artifactId>org.apache.karaf.webconsole.instance</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.karaf.wrapper</groupId> <artifactId>org.apache.karaf.wrapper.core</artifactId> - <version>4.2.2</version> + <version>4.2.6</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> @@ -1315,21 +1255,21 @@ <artifactId>myfaces-impl</artifactId> <version>2.2.12</version> </dependency> - <dependency> - <groupId>org.apache.oltu.oauth2</groupId> - <artifactId>org.apache.oltu.oauth2.authzserver</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.apache.oltu.oauth2</groupId> - <artifactId>org.apache.oltu.oauth2.common</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.apache.oltu.oauth2</groupId> - <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId> - <version>1.0.2</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>org.apache.oltu.oauth2</groupId> --> +<!-- <artifactId>org.apache.oltu.oauth2.authzserver</artifactId> --> +<!-- <version>1.0.2</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.apache.oltu.oauth2</groupId> --> +<!-- <artifactId>org.apache.oltu.oauth2.common</artifactId> --> +<!-- <version>1.0.2</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.apache.oltu.oauth2</groupId> --> +<!-- <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId> --> +<!-- <version>1.0.2</version> --> +<!-- </dependency> --> <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> @@ -1338,28 +1278,28 @@ <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-el22</artifactId> - <version>1.6.3</version> + <version>1.7.6</version> </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-impl</artifactId> - <version>1.6.3</version> + <version>1.7.6</version> </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-spi</artifactId> - <version>1.6.3</version> + <version>1.7.6</version> </dependency> <dependency> <groupId>org.apache.openwebbeans</groupId> <artifactId>openwebbeans-web</artifactId> - <version>1.6.3</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.antlr</artifactId> - <version>2.7.7_5</version> + <version>1.7.6</version> </dependency> +<!-- <dependency> --> +<!-- <groupId>org.apache.servicemix.bundles</groupId> --> +<!-- <artifactId>org.apache.servicemix.bundles.antlr</artifactId> --> +<!-- <version>2.7.7_5</version> --> +<!-- </dependency> --> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.c3p0</artifactId> @@ -1375,11 +1315,11 @@ <artifactId>org.apache.servicemix.bundles.commons-digester</artifactId> <version>1.8_4</version> </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.dom4j</artifactId> - <version>1.6.1_5</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>org.apache.servicemix.bundles</groupId> --> +<!-- <artifactId>org.apache.servicemix.bundles.dom4j</artifactId> --> +<!-- <version>1.6.1_5</version> --> +<!-- </dependency> --> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.jasypt-spring31</artifactId> @@ -1413,47 +1353,42 @@ <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId> - <version>2.5.0</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId> <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.java-persistence-api-2.0</artifactId> - <version>2.5.0</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId> - <version>2.5.0</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId> - <version>2.5.0</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.jaxp-api-1.3</artifactId> - <version>2.5.0</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.jsr250-1.0</artifactId> - <version>2.5.0</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.jsr303-api-1.0.0</artifactId> - <version>2.5.0</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId> - <version>2.5.0</version> + <version>2.9.0</version> </dependency> <dependency> <groupId>org.apache.shiro</groupId> @@ -1473,12 +1408,12 @@ <dependency> <groupId>org.apache.sshd</groupId> <artifactId>sshd-netty</artifactId> - <version>2.2.0</version> + <version>2.3.0</version> </dependency> <dependency> <groupId>org.apache.sshd</groupId> <artifactId>sshd-osgi</artifactId> - <version>2.2.0</version> + <version>2.3.0</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> @@ -1487,53 +1422,38 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm5-shaded</artifactId> - <version>4.4</version> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm6-shaded</artifactId> - <version>4.6</version> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> <artifactId>xbean-asm6-shaded</artifactId> <version>4.9</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-bundleutils</artifactId> - <version>4.4</version> + <artifactId>xbean-asm7-shaded</artifactId> + <version>4.12</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-bundleutils</artifactId> - <version>4.6</version> - </dependency> - <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-finder-shaded</artifactId> - <version>4.4</version> + <version>4.12</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder-shaded</artifactId> - <version>4.6</version> + <version>4.12</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-finder</artifactId> - <version>4.6</version> + <version>4.12</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-naming</artifactId> - <version>4.12</version> + <version>4.14</version> </dependency> <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-reflect</artifactId> - <version>4.6</version> + <version>4.12</version> </dependency> <dependency> <groupId>org.checkerframework</groupId> @@ -1548,12 +1468,12 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-annotations</artifactId> - <version>1.14</version> + <version>1.17</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> - <version>3.1.4</version> + <version>4.2</version> </dependency> <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> @@ -1578,52 +1498,52 @@ <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-common</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-hpack</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>http2-server</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-alpn-server</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-continuation</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-deploy</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jaas</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -1633,12 +1553,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jndi</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -1648,92 +1568,87 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-rewrite</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-xml</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-alpn</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-client-impl</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-server-impl</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-client</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-common</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>9.4.12.v20180830</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-servlet</artifactId> - <version>9.4.12.v20180830</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>javax.persistence</artifactId> - <version>2.1.0</version> + <version>9.4.18.v20190429</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> @@ -1743,27 +1658,27 @@ <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.antlr</artifactId> - <version>2.7.3</version> + <version>2.7.4</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.asm</artifactId> - <version>2.7.3</version> + <version>2.7.4</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.core</artifactId> - <version>2.7.3</version> + <version>2.7.4</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.jpa.jpql</artifactId> - <version>2.7.3</version> + <version>2.7.4</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.jpa</artifactId> - <version>2.7.3</version> + <version>2.7.4</version> </dependency> <dependency> <groupId>org.eclipse.platform</groupId> @@ -1778,13 +1693,13 @@ <dependency> <groupId>org.fusesource.jansi</groupId> <artifactId>jansi</artifactId> - <version>1.17.1</version> - </dependency> - <dependency> - <groupId>org.fusesource.leveldbjni</groupId> - <artifactId>leveldbjni-all</artifactId> - <version>1.8-odl</version> + <version>1.18</version> </dependency> +<!-- <dependency> --> +<!-- <groupId>org.fusesource.leveldbjni</groupId> --> +<!-- <artifactId>leveldbjni-all</artifactId> --> +<!-- <version>1.8-odl</version> --> +<!-- </dependency> --> <dependency> <groupId>org.glassfish.hk2.external</groupId> <artifactId>aopalliance-repackaged</artifactId> @@ -1858,58 +1773,63 @@ <dependency> <groupId>org.hibernate.common</groupId> <artifactId>hibernate-commons-annotations</artifactId> - <version>5.0.1.Final</version> + <version>5.1.0.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>5.2.9.Final</version> + <version>5.4.2.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> - <version>5.2.9.Final</version> + <version>5.4.2.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-envers</artifactId> - <version>5.2.9.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-infinispan</artifactId> - <version>5.2.9.Final</version> + <version>5.4.2.Final</version> </dependency> +<!-- <dependency> --> +<!-- <groupId>org.hibernate</groupId> --> +<!-- <artifactId>hibernate-infinispan</artifactId> --> +<!-- <version>5.2.9.Final</version> --> +<!-- </dependency> --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-osgi</artifactId> - <version>5.2.9.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.1-api</artifactId> - <version>1.0.0.Final</version> + <version>5.4.2.Final</version> </dependency> +<!-- <dependency> --> +<!-- <groupId>org.hibernate.javax.persistence</groupId> --> +<!-- <artifactId>hibernate-jpa-2.1-api</artifactId> --> +<!-- <version>1.0.0.Final</version> --> +<!-- </dependency> --> <dependency> <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> - <version>6.0.13.Final</version> + <version>6.0.16.Final</version> + </dependency> + <dependency> + <groupId>org.hibernate.validator</groupId> + <artifactId>hibernate-validator-osgi-karaf-features</artifactId> + <version>6.0.16.Final</version> </dependency> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>2.3.4</version> </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-commons</artifactId> - <version>8.2.5.Final</version> - </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> - <version>8.2.5.Final</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>org.infinispan</groupId> --> +<!-- <artifactId>infinispan-commons</artifactId> --> +<!-- <version>8.2.5.Final</version> --> +<!-- </dependency> --> +<!-- <dependency> --> +<!-- <groupId>org.infinispan</groupId> --> +<!-- <artifactId>infinispan-core</artifactId> --> +<!-- <version>8.2.5.Final</version> --> +<!-- </dependency> --> <dependency> <groupId>org.iq80.leveldb</groupId> <artifactId>leveldb</artifactId> @@ -1923,12 +1843,7 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.20.0-GA</version> - </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.24.1-GA</version> + <version>3.26.0-GA</version> </dependency> <dependency> <groupId>org.jboss.classfilewriter</groupId> @@ -1938,42 +1853,32 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jandex</artifactId> - <version>2.0.3.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>3.3.0.Final</version> + <version>2.0.5.Final</version> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>3.3.2.Final</version> </dependency> - <dependency> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling-osgi</artifactId> - <version>1.4.10.Final</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>org.jboss.marshalling</groupId> --> +<!-- <artifactId>jboss-marshalling-osgi</artifactId> --> +<!-- <version>1.4.10.Final</version> --> +<!-- </dependency> --> <dependency> <groupId>org.jboss.narayana.osgi</groupId> <artifactId>narayana-osgi-jta</artifactId> - <version>5.2.8.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.narayana.osgi</groupId> - <artifactId>narayana-osgi-jta</artifactId> - <version>5.6.3.Final</version> + <version>5.8.2.Final</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.transaction</groupId> <artifactId>jboss-transaction-api_1.2_spec</artifactId> - <version>1.0.1.Final</version> + <version>1.1.1.Final</version> </dependency> <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-osgi-bundle</artifactId> - <version>2.4.5.Final</version> + <version>2.4.8.Final</version> </dependency> <dependency> <groupId>org.jboss.xnio</groupId> @@ -1985,35 +1890,35 @@ <artifactId>xnio-nio</artifactId> <version>3.3.8.Final</version> </dependency> - <dependency> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>3.6.7.Final</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>org.jgroups</groupId> --> +<!-- <artifactId>jgroups</artifactId> --> +<!-- <version>3.6.7.Final</version> --> +<!-- </dependency> --> <dependency> <groupId>org.jline</groupId> <artifactId>jline-builtins</artifactId> - <version>3.9.0</version> + <version>3.11.0</version> </dependency> <dependency> <groupId>org.jline</groupId> <artifactId>jline-reader</artifactId> - <version>3.9.0</version> + <version>3.11.0</version> </dependency> <dependency> <groupId>org.jline</groupId> <artifactId>jline-terminal-jansi</artifactId> - <version>3.9.0</version> + <version>3.11.0</version> </dependency> <dependency> <groupId>org.jline</groupId> <artifactId>jline-terminal</artifactId> - <version>3.9.0</version> + <version>3.11.0</version> </dependency> <dependency> <groupId>org.jline</groupId> <artifactId>jline</artifactId> - <version>3.9.0</version> + <version>3.11.0</version> </dependency> <dependency> <groupId>org.jolokia</groupId> @@ -2023,17 +1928,12 @@ <dependency> <groupId>org.jolokia</groupId> <artifactId>jolokia-jsr160</artifactId> - <version>1.6.0</version> + <version>1.6.2</version> </dependency> <dependency> <groupId>org.jolokia</groupId> <artifactId>jolokia-osgi</artifactId> - <version>1.5.0</version> - </dependency> - <dependency> - <groupId>org.jolokia</groupId> - <artifactId>jolokia-osgi</artifactId> - <version>1.6.0</version> + <version>1.6.2</version> </dependency> <dependency> <groupId>org.json</groupId> @@ -2053,7 +1953,7 @@ <dependency> <groupId>org.messaginghub</groupId> <artifactId>pooled-jms</artifactId> - <version>0.4.0</version> + <version>1.0.5</version> </dependency> <dependency> <groupId>org.objenesis</groupId> @@ -2063,907 +1963,907 @@ <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-authn-api</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-cert</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-cli</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-encrypt-service-impl</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-encrypt-service</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-filterchain</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-password-service-api</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-password-service-impl</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-shiro-api</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa</groupId> <artifactId>aaa-shiro</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>servlet-api</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>servlet-jersey2</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>web-api</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.aaa.web</groupId> <artifactId>web-osgi-impl</artifactId> - <version>0.9.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>benchmark-api</artifactId> - <version>1.7.1</version> + <version>1.8.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>blueprint</artifactId> - <version>0.10.1</version> + <version>0.11.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>cds-access-api</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>cds-access-client</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>cds-dom-api</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>dsbenchmark</artifactId> - <version>1.7.1</version> + <version>1.8.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-trace-api</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-trace-binding-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-trace-cli</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-trace-dom-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>messagebus-api</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>messagebus-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>messagebus-spi</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>messagebus-util</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller.model</groupId> <artifactId>model-inventory</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller.model</groupId> <artifactId>model-topology</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>netty-config-api</artifactId> - <version>0.10.1</version> + <version>0.11.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>netty-event-executor-config</artifactId> - <version>0.10.1</version> + <version>0.11.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>netty-threadgroup-config</artifactId> - <version>0.10.1</version> + <version>0.11.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>netty-timer-config</artifactId> - <version>0.10.1</version> + <version>0.11.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>ntfbenchmark</artifactId> - <version>1.7.1</version> + <version>1.8.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>rpcbenchmark</artifactId> - <version>1.7.1</version> + <version>1.8.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-akka-raft</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-akka-segmented-journal</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-api</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-broker-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-binding-util</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-broker-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-cluster-admin-api</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-cluster-admin-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-clustering-commons</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-api</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-impl</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-util</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-connector-api</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-core-api</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-core-compat</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-core-spi</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-distributed-datastore</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-inmemory-datastore</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-remoterpc-connector</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>clustering-it-model</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>clustering-it-provider</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>sample-toaster-consumer</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>sample-toaster-provider</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller.samples</groupId> <artifactId>sample-toaster</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>threadpool-config-api</artifactId> - <version>0.10.1</version> + <version>0.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>threadpool-config-impl</artifactId> - <version>0.10.1</version> + <version>0.11.3</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-akka-infoprovider-impl</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-impl</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-model</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.daexim</groupId> <artifactId>daexim-spi</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>infrautils-util</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>ready-api</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.infrautils</groupId> <artifactId>ready-impl</artifactId> - <version>1.5.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991-ietf-inet-types</artifactId> - <version>1.2.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991-ietf-yang-types</artifactId> - <version>1.2.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991</artifactId> - <version>1.2.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc7895</artifactId> - <version>1.2.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-api</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-adapter</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-codec-osgi</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-dom-codec</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-generator-api</artifactId> - <version>1.0.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-generator-impl</artifactId> - <version>1.0.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-generator-util</artifactId> - <version>1.0.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-spec-util</artifactId> - <version>1.0.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-spi</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-binding-util</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-common-api</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-common-util</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-api</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-broker</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-inmemory-datastore</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-schema-service-osgi</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-spi</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-binding-adapter</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-binding-api</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-common-api</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-common-spi</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-eos-dom-api</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-singleton-common-api</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-singleton-dom-impl</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>general-entity</artifactId> - <version>1.0.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-restconf</artifactId> - <version>2013.10.19.15.8</version> + <version>2013.10.19.16.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-ted</artifactId> - <version>2013.10.21.15.8</version> + <version>2013.10.21.16.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-topology-isis</artifactId> - <version>2013.10.21.15.8</version> + <version>2013.10.21.16.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-topology-l3-unicast-igp</artifactId> - <version>2013.10.21.15.8</version> + <version>2013.10.21.16.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-topology-ospf</artifactId> - <version>2013.10.21.15.8</version> + <version>2013.10.21.16.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-topology</artifactId> - <version>2013.10.21.15.8</version> + <version>2013.10.21.16.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-type-util</artifactId> - <version>2.3.8</version> + <version>3.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>yang-ext</artifactId> - <version>2013.09.07.15.8</version> + <version>2013.09.07.16.14</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>yang-binding</artifactId> - <version>1.0.8</version> + <version>2.0.14</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>aaa-authn-odl-plugin</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>callhome-model</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>callhome-protocol</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>callhome-provider</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-monitoring-extension</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-monitoring</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf-notifications</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-netconf</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-restconf-monitoring</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>ietf-restconf</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-connector</artifactId> - <version>1.6.1</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-impl</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-monitoring</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-notification</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-ssh</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-tcp</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>mdsal-netconf-yang-library</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>messagebus-netconf</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-api</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-auth</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-client</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-config</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-console</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-impl</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-mapping-api</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-netty-util</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-notifications-api</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-topology-config</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-topology-singleton</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-topology</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>netconf-util</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-common-models</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-common</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-nb-bierman02-auth</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-nb-bierman02-noauth</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-nb-bierman02</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>restconf-nb-rfc8040</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>sal-netconf-connector</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>sal-rest-docgen</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>shaded-exificient</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>yanglib</artifactId> - <version>1.6.1</version> + <version>1.7.3</version> </dependency> <dependency> <groupId>org.opendaylight.odlparent</groupId> <artifactId>bcpkix-framework-ext</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.odlparent</groupId> <artifactId>bcprov-framework-ext</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.odlparent</groupId> <artifactId>karaf.branding</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>concepts</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>odlext-model-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>odlext-parser-support</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>openconfig-model-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>openconfig-parser-support</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6536-model-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc6536-parser-support</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc7952-model-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc7952-parser-support</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8040-model-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8040-parser-support</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8528-model-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>rfc8528-parser-support</artifactId> - <version>2.1.10</version> - </dependency> - <dependency> - <groupId>org.opendaylight.yangtools</groupId> - <artifactId>triemap</artifactId> - <version>1.1.10</version> + <version>3.0.11</version> </dependency> +<!-- <dependency> --> +<!-- <groupId>org.opendaylight.yangtools</groupId> --> +<!-- <artifactId>triemap</artifactId> --> +<!-- <version>1.1.10</version> --> +<!-- </dependency> --> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>util</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-common</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-codec-gson</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-codec-xml</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-transform</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-util</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-model-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-model-export</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-model-util</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-api</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-impl</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-reactor</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-rfc7950</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-spi</artifactId> - <version>2.1.10</version> + <version>3.0.11</version> </dependency> <dependency> <groupId>org.ops4j.base</groupId> @@ -2973,202 +2873,197 @@ <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-api</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-extender</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-extension</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-jetty-openwebbeans</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-jetty-weld</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-openwebbeans</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-spi</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-undertow-openwebbeans</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-undertow-weld</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-web</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.cdi</groupId> <artifactId>pax-cdi-weld</artifactId> - <version>1.0.0</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-config</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-db2</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-derby</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-derbyclient</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-hsqldb</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-jtds</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-mariadb</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-mssql</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-oracle</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-pool-aries</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-pool-c3p0</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-pool-common</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-pool-dbcp2</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-pool-hikaricp</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-pool-narayana</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-pool-transx</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-sqlite</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc-teradata</artifactId> - <version>1.3.1</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.jdbc</groupId> - <artifactId>pax-jdbc</artifactId> - <version>0.5.0</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jdbc</groupId> <artifactId>pax-jdbc</artifactId> - <version>1.3.1</version> + <version>1.3.5</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-activemq</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-api</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-artemis</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-config</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-ibmmq</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-oracleaq</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-pool-narayana</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-pool-pooledjms</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jms</groupId> <artifactId>pax-jms-pool-transx</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.ops4j.pax.jpa</groupId> @@ -3203,157 +3098,122 @@ <dependency> <groupId>org.ops4j.pax.transx</groupId> <artifactId>pax-transx-connector</artifactId> - <version>0.3.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.transx</groupId> - <artifactId>pax-transx-connector</artifactId> - <version>0.4.0</version> + <version>0.4.3</version> </dependency> - <dependency> - <groupId>org.ops4j.pax.transx</groupId> - <artifactId>pax-transx-jdbc</artifactId> - <version>0.3.0</version> - </dependency> - <dependency> + <dependency> <groupId>org.ops4j.pax.transx</groupId> <artifactId>pax-transx-jdbc</artifactId> - <version>0.4.0</version> + <version>0.4.3</version> </dependency> <dependency> <groupId>org.ops4j.pax.transx</groupId> <artifactId>pax-transx-jms</artifactId> - <version>0.3.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.transx</groupId> - <artifactId>pax-transx-jms</artifactId> - <version>0.4.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.transx</groupId> - <artifactId>pax-transx-tm-api</artifactId> - <version>0.3.0</version> + <version>0.4.3</version> </dependency> <dependency> <groupId>org.ops4j.pax.transx</groupId> <artifactId>pax-transx-tm-api</artifactId> - <version>0.4.0</version> + <version>0.4.3</version> </dependency> <dependency> <groupId>org.ops4j.pax.transx</groupId> <artifactId>pax-transx-tm-atomikos</artifactId> - <version>0.3.0</version> + <version>0.4.3</version> </dependency> - <dependency> - <groupId>org.ops4j.pax.transx</groupId> - <artifactId>pax-transx-tm-atomikos</artifactId> - <version>0.4.0</version> - </dependency> - <dependency> + <dependency> <groupId>org.ops4j.pax.transx</groupId> <artifactId>pax-transx-tm-geronimo</artifactId> - <version>0.3.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.transx</groupId> - <artifactId>pax-transx-tm-geronimo</artifactId> - <version>0.4.0</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.transx</groupId> - <artifactId>pax-transx-tm-narayana</artifactId> - <version>0.3.0</version> + <version>0.4.3</version> </dependency> - <dependency> + <dependency> <groupId>org.ops4j.pax.transx</groupId> <artifactId>pax-transx-tm-narayana</artifactId> - <version>0.4.0</version> + <version>0.4.3</version> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>2.5.4</version> + <version>2.6.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-obr</artifactId> - <version>2.5.4</version> + <version>2.6.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-war</artifactId> - <version>2.5.2</version> + <version>2.6.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-wrap</artifactId> - <version>2.5.4</version> + <version>2.6.1</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-api</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-deployer</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-descriptor</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-extender-war</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-extender-whiteboard</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-jetty</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-jsp</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-resources-extender</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-resources-jsf</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-runtime</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-spi</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-tomcat</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-undertow</artifactId> - <version>7.2.5</version> + <version>7.2.10</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -3365,60 +3225,30 @@ <artifactId>org.osgi.service.jdbc</artifactId> <version>1.0.0</version> </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-analysis</artifactId> - <version>6.2</version> - </dependency> - <dependency> + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-analysis</artifactId> - <version>7.0</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - <version>6.2</version> + <version>7.1</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> - <version>7.0</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-tree</artifactId> - <version>6.2</version> + <version>7.1</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-tree</artifactId> - <version>7.0</version> + <version>7.1</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-util</artifactId> - <version>6.2</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-util</artifactId> - <version>7.0</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>5.2</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>6.2</version> + <version>7.1</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>7.0</version> + <version>7.1</version> </dependency> <dependency> <groupId>org.postgresql</groupId> @@ -3428,12 +3258,12 @@ <dependency> <groupId>org.reactivestreams</groupId> <artifactId>reactive-streams</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </dependency> <dependency> <groupId>org.scala-lang.modules</groupId> <artifactId>scala-java8-compat_2.12</artifactId> - <version>0.8.0</version> + <version>0.9.1</version> </dependency> <dependency> <groupId>org.scala-lang.modules</groupId> @@ -3443,17 +3273,12 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>2.12.8</version> + <version>2.12.11</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-reflect</artifactId> - <version>2.12.8</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.12</version> + <version>2.12.11</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -3461,20 +3286,15 @@ <version>1.7.25</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> - </dependency> - <dependency> <groupId>org.xerial</groupId> <artifactId>sqlite-jdbc</artifactId> <version>3.16.1</version> </dependency> - <dependency> - <groupId>tech.pantheon.triemap</groupId> - <artifactId>triemap</artifactId> - <version>1.0.4</version> - </dependency> +<!-- <dependency> --> +<!-- <groupId>tech.pantheon.triemap</groupId> --> +<!-- <artifactId>triemap</artifactId> --> +<!-- <version>1.0.4</version> --> +<!-- </dependency> --> </dependencies> </dependencyManagement> </project> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 3bc6b66b..96f6dc50 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.mdsal</groupId> <artifactId>binding-parent</artifactId> - <version>3.0.8</version> + <version>4.0.14</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 20c44cd6..0ad3f3a2 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>bundle-parent</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index c408eae9..6bf0e1cc 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 78c64ad7..438df81f 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>karaf4-parent</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 3ae78dbe..bf289727 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-it-parent</artifactId> - <version>1.9.1</version> + <version>1.10.3</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 3477381d..f65748d5 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>odlparent-lite</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 9a20a1c0..f2bcf94a 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>odlparent</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index e3e5e2ba..1ea53960 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -44,6 +44,7 @@ <filters> <filter>${basedir}/src/main/properties/binding-parent.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -67,6 +68,7 @@ <filters> <filter>${basedir}/src/main/properties/bundle-parent.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -90,6 +92,7 @@ <filters> <filter>${basedir}/src/main/properties/feature-repo-parent.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -113,6 +116,7 @@ <filters> <filter>${basedir}/src/main/properties/karaf4-parent.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -136,6 +140,7 @@ <filters> <filter>${basedir}/src/main/properties/mdsal-it-parent.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -159,6 +164,7 @@ <filters> <filter>${basedir}/src/main/properties/odlparent.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -182,6 +188,7 @@ <filters> <filter>${basedir}/src/main/properties/odlparent-lite.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -205,6 +212,7 @@ <filters> <filter>${basedir}/src/main/properties/single-feature-parent.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> </executions> @@ -223,6 +231,7 @@ <configuration> <sourceFile>../binding-parent/pom-template.xml</sourceFile> <destinationFile>../binding-parent/pom.xml</destinationFile> + </configuration> </execution> <execution> diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties index f6d52513..7cf6550d 100644 --- a/odlparent/setup/src/main/properties/binding-parent.properties +++ b/odlparent/setup/src/main/properties/binding-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=binding-parent odlparent.groupId=org.opendaylight.mdsal -odlparent.version=3.0.8
\ No newline at end of file +odlparent.version=4.0.14
\ No newline at end of file diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties index 8bba8066..3fe8c8c4 100644 --- a/odlparent/setup/src/main/properties/bundle-parent.properties +++ b/odlparent/setup/src/main/properties/bundle-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=bundle-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=4.0.10 +odlparent.version=5.0.7 diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties index 92c2fcfe..3896b1ba 100644 --- a/odlparent/setup/src/main/properties/feature-repo-parent.properties +++ b/odlparent/setup/src/main/properties/feature-repo-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=feature-repo-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=4.0.10 +odlparent.version=5.0.7 diff --git a/odlparent/setup/src/main/properties/karaf4-parent.properties b/odlparent/setup/src/main/properties/karaf4-parent.properties index 5be7cc17..7d772445 100644 --- a/odlparent/setup/src/main/properties/karaf4-parent.properties +++ b/odlparent/setup/src/main/properties/karaf4-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=karaf4-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=4.0.10 +odlparent.version=5.0.7 diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties index acb5ec77..5612720d 100644 --- a/odlparent/setup/src/main/properties/mdsal-it-parent.properties +++ b/odlparent/setup/src/main/properties/mdsal-it-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=mdsal-it-parent odlparent.groupId=org.opendaylight.controller -odlparent.version=1.9.1 +odlparent.version=1.10.3 diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties index e57359b6..1c175aad 100644 --- a/odlparent/setup/src/main/properties/odlparent-lite.properties +++ b/odlparent/setup/src/main/properties/odlparent-lite.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent-lite odlparent.groupId=org.opendaylight.odlparent -odlparent.version=4.0.10 +odlparent.version=5.0.7 diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties index 8341a6f9..36ebb668 100644 --- a/odlparent/setup/src/main/properties/odlparent.properties +++ b/odlparent/setup/src/main/properties/odlparent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=4.0.10 +odlparent.version=5.0.7 diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties index 70c1c4c8..7d91c003 100644 --- a/odlparent/setup/src/main/properties/single-feature-parent.properties +++ b/odlparent/setup/src/main/properties/single-feature-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=single-feature-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=4.0.10 +odlparent.version=5.0.7 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 81f4becc..71307564 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>\${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>\${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>\${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 9aec6ac8..4109af76 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.opendaylight.odlparent</groupId> <artifactId>single-feature-parent</artifactId> - <version>4.0.10</version> + <version>5.0.7</version> <relativePath/> </parent> @@ -53,8 +53,8 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -83,8 +83,8 @@ <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version.source>8</java.version.source> + <java.version.target>8</java.version.target> <bundle.plugin.version>2.5.0</bundle.plugin.version> <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> <features.file>features.xml</features.file> @@ -110,15 +110,15 @@ <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version> <!-- Support libraries used by OpenDaylight --> - <odl.controller.mdsal.version>1.9.1</odl.controller.mdsal.version> - <odl.mdsal.version>3.0.8</odl.mdsal.version> - <odl.mdsal.model.version>1.0.8</odl.mdsal.model.version> - <odl.netconf.restconf.version>1.9.1</odl.netconf.restconf.version> - <odl.netconf.netconf.version>1.6.1</odl.netconf.netconf.version> - <odl.netconf.sal.rest.docgen.version>1.9.1</odl.netconf.sal.rest.docgen.version> + <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version> + <odl.mdsal.version>4.0.14</odl.mdsal.version> + <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version> + <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version> + <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version> + <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version> <!-- Used by aaa, vtn --> - <commons.codec.version>1.12</commons.codec.version> + <commons.codec.version>1.13</commons.codec.version> <!-- Used by netconf, ovsdb --> <commons.lang3.version>3.8.1</commons.lang3.version> <!-- Used by sfc, snmp4sdn; see also affinity, toolkit --> @@ -126,7 +126,7 @@ <!-- Used by neutron; see also controller, vtn --> <commons.net.version>3.6</commons.net.version> <!-- Used by neutron --> - <eclipse.persistence.version>2.7.3</eclipse.persistence.version> + <eclipse.persistence.version>2.7.4</eclipse.persistence.version> <!-- Used by aaa --> <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version> <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn --> @@ -135,7 +135,7 @@ <guava.version>25.1-jre</guava.version> <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp --> - <jackson.version>2.9.8</jackson.version> + <jackson.version>2.9.10</jackson.version> <!-- Used by snmp4sdn, yangtools --> <javassist.version>3.24.1-GA</javassist.version> @@ -157,7 +157,7 @@ <!-- Used by nic, sfc, sxp, tsdr --> <mockito.version>1.10.19</mockito.version> <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit --> - <netty.version>4.1.34.Final</netty.version> + <netty.version>4.1.42.Final</netty.version> <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit --> <slf4j.version>1.7.25</slf4j.version> <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp --> @@ -418,6 +418,40 @@ </rules> </configuration> </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>8</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> + <!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> </executions> </plugin> <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin --> @@ -530,10 +564,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> <!-- end of plugins from oparent version (parent of oparent) --> <!-- Plugins from oparent --> @@ -713,6 +743,77 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M2</version> + <executions> + <execution> + <id>enforce-property</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>onap.nexus.url</property> + <message>You must set a onap.nexus.url property in your + ~/.m2/settings.xml. See oparent/settings.xml for an example.</message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> + </execution> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.5.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + <execution> + <id>enforce-banned-dependencies</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message> + <excludes> + <exclude>org.mockito:mockito-all</exclude> +<!-- <exclude>com.google.code.findbugs:annotations</exclude> --> + </excludes> + </bannedDependencies> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -726,19 +827,6 @@ <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.version}</version> - <reportSets> - <reportSet> - <reports> - <!-- select non-aggregate reports --> - <report>report</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> @@ -1024,13 +1112,14 @@ <plugin> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-maven-plugin</artifactId> - <version>2.1.8</version> + <version>3.0.11</version> <dependencies> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> <version>${odl.mdsal.model.version}</version> <type>jar</type> + <scope>compile</scope> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index 53a8a596..b1916b11 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -44,6 +44,7 @@ <filters> <filter>${basedir}/src/main/properties/springboot1.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> <execution> @@ -67,6 +68,7 @@ <filters> <filter>${basedir}/src/main/properties/springboot2.properties</filter> </filters> + <encoding>UTF-8</encoding> </configuration> </execution> </executions> diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml index bb107194..1924649c 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -613,10 +613,6 @@ </plugin> <!-- Jacoco / Sonar --> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 380654d0..02ca3ac7 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -613,10 +613,6 @@ </plugin> <!-- Jacoco / Sonar --> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 65b73cad..9c7f457c 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -613,10 +613,6 @@ </plugin> <!-- Jacoco / Sonar --> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> |