summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2021-06-08 12:00:17 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-06-08 18:45:12 +0000
commit930d8da958c43f9c33b41926143ad06858b5aa68 (patch)
treea937716ad3a88ff07c07123fa2ea5d6cf2b91d69
parent84de142aba1b450beeec04ad85f9739fb721697f (diff)
Updating parent poms as per ODL Aluminum 0.13.3 (SR3)
Issue-ID: CCSDK-3329 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: If9ac73ec5f0ad8a2bd0b09ed4a17731cb357d900
Diffstat
-rw-r--r--dependencies-bom/pom.xml28
-rw-r--r--dependencies-odl-bom/pom.xml35
-rw-r--r--installed-odl-bom/pom.xml441
-rw-r--r--odlparent/binding-parent/pom.xml119
-rw-r--r--odlparent/bundle-parent/pom.xml119
-rw-r--r--odlparent/feature-repo-parent/pom.xml119
-rw-r--r--odlparent/karaf4-parent/pom.xml119
-rw-r--r--odlparent/mdsal-it-parent/pom.xml119
-rw-r--r--odlparent/odlparent-lite/pom.xml119
-rw-r--r--odlparent/odlparent/pom.xml119
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml119
-rw-r--r--odlparent/single-feature-parent/pom.xml119
-rwxr-xr-xoparent/pom.xml6
-rw-r--r--springboot/spring-boot-setup/src/main/resources/pom-template.xml2
-rw-r--r--springboot/springboot1/pom.xml2
-rw-r--r--springboot/springboot2/pom.xml2
-rwxr-xr-xstandalone/pom.xml9
17 files changed, 481 insertions, 1115 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index bc84c2f6..0c4a79e3 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -44,6 +44,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
+ <!-- ODL has 2.10.5 -->
<version>2.11.4</version>
<type>pom</type>
<scope>import</scope>
@@ -120,10 +121,16 @@
<artifactId>javaee-api</artifactId>
<version>7.0</version>
</dependency>
+ <!-- Below provides javax.annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>3.0.1</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -134,7 +141,14 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
+ </dependency>
+ <!-- Below provides javax.jws -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>2.3.4</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -156,7 +170,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.7.2</version>
+ <version>4.8-1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -166,12 +180,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.11</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.6</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -227,6 +241,7 @@
<dependency>
<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
+ <!-- ODL has 2.27 -->
<version>2.29.1</version>
<type>pom</type>
<scope>import</scope>
@@ -244,11 +259,13 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
+ <!-- ODL has 20131018 -->
<version>20201115</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
+ <!-- ODL has 1.8.3 -->
<version>1.12.1</version>
</dependency>
<dependency>
@@ -286,6 +303,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <!-- ODL has 1.7.28 -->
<version>1.7.30</version>
</dependency>
<dependency>
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 0cede3da..703f58c8 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -44,40 +44,40 @@
<dependency>
<groupId>org.opendaylight.bgpcep</groupId>
<artifactId>bgp-artifacts</artifactId>
- <version>0.14.1</version>
+ <version>0.14.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>2.0.6</version>
+ <version>2.0.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>6.0.7</version>
+ <version>6.0.8</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>1.9.1</version>
+ <version>1.9.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
- <version>1.12.1</version>
+ <version>1.12.3</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
- <version>1.12.1</version>
+ <version>1.12.3</version>
<type>test-jar</type>
<classifier>tests</classifier>
<scope>test</scope>
@@ -98,16 +98,31 @@
<artifactId>elasticsearch-rest-client</artifactId>
<version>6.4.3</version>
</dependency>
+ <!-- Using dmaapClient 1.1.5 as SLI needs java package as com.att.nsa.mr and dmaapClient 1.1.12 has org.onap.dmaap.mr -->
<dependency>
<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
<artifactId>dmaapClient</artifactId>
- <version>1.1.12</version>
+ <version>1.1.5</version>
</dependency>
+ <!-- Below provides javax.annotations -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>3.0.1</version>
</dependency>
+ <!-- Below provides javax.xml.bind and javax.xml.bind.annotations -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ <!-- Below provides javax.jws -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>2.3.4</version>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
@@ -120,6 +135,12 @@
<artifactId>commons-cli</artifactId>
<version>1.3.1</version>
</dependency>
+ <!-- Below is required by com.google.guava : guava : jar : 28.2-jre -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ <version>9999.0-empty-to-avoid-conflict-with-guava</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml
index a622e820..39ba6212 100644
--- a/installed-odl-bom/pom.xml
+++ b/installed-odl-bom/pom.xml
@@ -41,16 +41,6 @@
<version>1.11.8</version>
</dependency>
<dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>classmate</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>classmate</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.10.5</version>
@@ -91,6 +81,11 @@
<version>6.2.3</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml</groupId>
+ <artifactId>classmate</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
<groupId>com.github.mifmif</groupId>
<artifactId>generex</artifactId>
<version>1.0.2</version>
@@ -123,11 +118,6 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.199</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
<version>1.4.200</version>
</dependency>
<dependency>
@@ -361,11 +351,6 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>3.0.0</version>
@@ -651,11 +636,6 @@
<version>2.7.2</version>
</dependency>
<dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<version>1.1.8</version>
@@ -683,11 +663,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>
@@ -696,14 +671,14 @@
<version>1.3.3</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.3</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>2.1.1</version>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -718,16 +693,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.6.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
@@ -787,12 +752,12 @@
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <artifactId>derbyclient</artifactId>
<version>10.14.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
+ <artifactId>derby</artifactId>
<version>10.14.2.0</version>
</dependency>
<dependency>
@@ -1121,11 +1086,6 @@
<version>4.2.10</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>manual</artifactId>
- <version>4.2.10</version>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.maven</groupId>
<artifactId>org.apache.karaf.maven.core</artifactId>
<version>4.2.10</version>
@@ -1136,16 +1096,6 @@
<version>4.2.10</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.client</artifactId>
- <version>4.2.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.event</artifactId>
- <version>4.2.10</version>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.package</groupId>
<artifactId>org.apache.karaf.package.core</artifactId>
<version>4.2.10</version>
@@ -1171,23 +1121,23 @@
<version>4.2.10</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.service</groupId>
- <artifactId>org.apache.karaf.service.core</artifactId>
+ <groupId>org.apache.karaf.services</groupId>
+ <artifactId>org.apache.karaf.services.coordinator</artifactId>
<version>4.2.10</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.service</groupId>
- <artifactId>org.apache.karaf.service.guard</artifactId>
+ <groupId>org.apache.karaf.services</groupId>
+ <artifactId>org.apache.karaf.services.eventadmin</artifactId>
<version>4.2.10</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.services</groupId>
- <artifactId>org.apache.karaf.services.coordinator</artifactId>
+ <groupId>org.apache.karaf.service</groupId>
+ <artifactId>org.apache.karaf.service.core</artifactId>
<version>4.2.10</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.services</groupId>
- <artifactId>org.apache.karaf.services.eventadmin</artifactId>
+ <groupId>org.apache.karaf.service</groupId>
+ <artifactId>org.apache.karaf.service.guard</artifactId>
<version>4.2.10</version>
</dependency>
<dependency>
@@ -1231,11 +1181,6 @@
<version>4.2.10</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.web</groupId>
- <artifactId>org.apache.karaf.web.core</artifactId>
- <version>4.2.10</version>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>org.apache.karaf.webconsole.console</artifactId>
<version>4.2.10</version>
@@ -1261,11 +1206,31 @@
<version>4.2.10</version>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.web</groupId>
+ <artifactId>org.apache.karaf.web.core</artifactId>
+ <version>4.2.10</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.wrapper</groupId>
<artifactId>org.apache.karaf.wrapper.core</artifactId>
<version>4.2.10</version>
</dependency>
<dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <version>4.2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ <version>4.2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.event</artifactId>
+ <version>4.2.10</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.2.12</version>
@@ -1403,11 +1368,6 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-osgi</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
@@ -1433,11 +1393,6 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
- <version>4.12</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
<version>4.17</version>
</dependency>
<dependency>
@@ -1526,6 +1481,46 @@
<version>9.4.31.v20200723</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty.osgi</groupId>
+ <artifactId>jetty-osgi-alpn</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>javax-websocket-client-impl</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>javax-websocket-server-impl</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-api</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-client</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-common</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-servlet</artifactId>
+ <version>9.4.31.v20200723</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<version>9.4.31.v20200723</version>
@@ -1602,12 +1597,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <artifactId>jetty-servlets</artifactId>
<version>9.4.31.v20200723</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
+ <artifactId>jetty-servlet</artifactId>
<version>9.4.31.v20200723</version>
</dependency>
<dependency>
@@ -1631,51 +1626,6 @@
<version>9.4.31.v20200723</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.osgi</groupId>
- <artifactId>jetty-osgi-alpn</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>javax-websocket-client-impl</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>javax-websocket-server-impl</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-api</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-common</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- <version>9.4.31.v20200723</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>javax.persistence</artifactId>
<version>2.2.0</version>
@@ -1751,11 +1701,6 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.el</artifactId>
- <version>3.0.3</version>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>2.27</version>
@@ -1796,11 +1741,21 @@
<version>2.27</version>
</dependency>
<dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
<groupId>org.hibernate.common</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
<version>5.1.0.Final</version>
</dependency>
<dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>6.1.5.Final</version>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.4.17.Final</version>
@@ -1816,11 +1771,6 @@
<version>5.4.17.Final</version>
</dependency>
<dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>6.1.5.Final</version>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.5.0</version>
@@ -1833,11 +1783,6 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.24.0-GA</version>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
<version>3.27.0-GA</version>
</dependency>
<dependency>
@@ -1846,11 +1791,6 @@
<version>1.1.2.Final</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jandex</artifactId>
- <version>2.1.3.Final</version>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.3.2.Final</version>
@@ -1881,6 +1821,11 @@
<version>3.3.8.Final</version>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ <version>2.1.3.Final</version>
+ </dependency>
+ <dependency>
<groupId>org.jline</groupId>
<artifactId>jline-builtins</artifactId>
<version>3.16.0</version>
@@ -1941,9 +1886,24 @@
<version>2.6</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-authn-api</artifactId>
- <version>0.12.1</version>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>0.12.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>servlet-jersey2</artifactId>
+ <version>0.12.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>web-api</artifactId>
+ <version>0.12.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>web-osgi-impl</artifactId>
+ <version>0.12.3</version>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
@@ -1993,32 +1953,32 @@
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
- <version>0.12.1</version>
+ <version>0.12.3</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-shiro</artifactId>
- <version>0.12.3</version>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-inventory</artifactId>
+ <version>2.0.7</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>servlet-api</artifactId>
- <version>0.12.3</version>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-topology</artifactId>
+ <version>2.0.7</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>servlet-jersey2</artifactId>
- <version>0.12.3</version>
+ <groupId>org.opendaylight.controller.samples</groupId>
+ <artifactId>sample-toaster-consumer</artifactId>
+ <version>2.0.7</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>web-api</artifactId>
- <version>0.12.3</version>
+ <groupId>org.opendaylight.controller.samples</groupId>
+ <artifactId>sample-toaster-provider</artifactId>
+ <version>2.0.7</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>web-osgi-impl</artifactId>
- <version>0.12.3</version>
+ <groupId>org.opendaylight.controller.samples</groupId>
+ <artifactId>sample-toaster</artifactId>
+ <version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@ -2061,16 +2021,6 @@
<version>2.0.7</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller.model</groupId>
- <artifactId>model-inventory</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller.model</groupId>
- <artifactId>model-topology</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netty-event-executor-config</artifactId>
<version>0.13.7</version>
@@ -2131,21 +2081,6 @@
<version>2.0.7</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller.samples</groupId>
- <artifactId>sample-toaster-consumer</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller.samples</groupId>
- <artifactId>sample-toaster-provider</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller.samples</groupId>
- <artifactId>sample-toaster</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>threadpool-config-api</artifactId>
<version>0.13.7</version>
@@ -2406,6 +2341,56 @@
<version>6.0.8</version>
</dependency>
<dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>general-entity</artifactId>
+ <version>6.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-ted</artifactId>
+ <version>2013.10.21.18.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology-isis</artifactId>
+ <version>2013.10.21.18.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology-l3-unicast-igp</artifactId>
+ <version>2013.10.21.18.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology-ospf</artifactId>
+ <version>2013.10.21.18.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
+ <version>2013.10.21.18.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-type-util</artifactId>
+ <version>6.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>odl-uint24</artifactId>
+ <version>6.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>opendaylight-l2-types</artifactId>
+ <version>2013.08.27.18.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>yang-ext</artifactId>
+ <version>2013.09.07.18.8</version>
+ </dependency>
+ <dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-api</artifactId>
<version>6.0.8</version>
@@ -2576,56 +2561,6 @@
<version>6.0.8</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>general-entity</artifactId>
- <version>6.0.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-ted</artifactId>
- <version>2013.10.21.18.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-topology-isis</artifactId>
- <version>2013.10.21.18.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-topology-l3-unicast-igp</artifactId>
- <version>2013.10.21.18.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-topology-ospf</artifactId>
- <version>2013.10.21.18.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-topology</artifactId>
- <version>2013.10.21.18.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-type-util</artifactId>
- <version>6.0.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>odl-uint24</artifactId>
- <version>6.0.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>opendaylight-l2-types</artifactId>
- <version>2013.08.27.18.8</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>yang-ext</artifactId>
- <version>2013.09.07.18.8</version>
- </dependency>
- <dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>yang-binding</artifactId>
<version>6.0.8</version>
@@ -3152,12 +3087,12 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.jdbc</groupId>
- <artifactId>pax-jdbc-derby</artifactId>
+ <artifactId>pax-jdbc-derbyclient</artifactId>
<version>1.4.4</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.jdbc</groupId>
- <artifactId>pax-jdbc-derbyclient</artifactId>
+ <artifactId>pax-jdbc-derby</artifactId>
<version>1.4.4</version>
</dependency>
<dependency>
@@ -3233,11 +3168,6 @@
<dependency>
<groupId>org.ops4j.pax.jdbc</groupId>
<artifactId>pax-jdbc</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.jdbc</groupId>
- <artifactId>pax-jdbc</artifactId>
<version>1.4.4</version>
</dependency>
<dependency>
@@ -3478,11 +3408,6 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>5.2</version>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
<version>8.0.1</version>
</dependency>
<dependency>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 642b28c4..1b2c0508 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index ac69b6db..76ff6284 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 6eb8f2d7..941ced19 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 7b93b0fd..90422c97 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index ea7872ef..32c3dc14 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 5f8e5298..5dec9f8e 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 597fd678..20ff8b8a 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index abf820c1..87854a70 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>\${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>\${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>\${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 018d0255..73784493 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -111,21 +111,21 @@
<sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
- <odl.controller.mdsal.version>1.12.1</odl.controller.mdsal.version>
- <odl.mdsal.version>6.0.7</odl.mdsal.version>
- <odl.mdsal.model.version>6.0.7</odl.mdsal.model.version>
- <odl.netconf.restconf.version>1.12.1</odl.netconf.restconf.version>
- <odl.netconf.netconf.version>1.9.1</odl.netconf.netconf.version>
- <odl.netconf.sal.rest.docgen.version>1.12.1</odl.netconf.sal.rest.docgen.version>
+ <odl.controller.mdsal.version>1.12.3</odl.controller.mdsal.version>
+ <odl.mdsal.version>6.0.8</odl.mdsal.version>
+ <odl.mdsal.model.version>6.0.8</odl.mdsal.model.version>
+ <odl.netconf.restconf.version>1.12.3</odl.netconf.restconf.version>
+ <odl.netconf.netconf.version>1.9.3</odl.netconf.netconf.version>
+ <odl.netconf.sal.rest.docgen.version>1.12.3</odl.netconf.sal.rest.docgen.version>
<!-- Used by aaa, vtn -->
<commons.codec.version>1.15</commons.codec.version>
<!-- Used by netconf, ovsdb -->
- <commons.lang3.version>3.8.1</commons.lang3.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
<!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
<commons.lang.version>2.6</commons.lang.version>
<!-- Used by neutron; see also controller, vtn -->
- <commons.net.version>3.7</commons.net.version>
+ <commons.net.version>3.7.2</commons.net.version>
<!-- Used by neutron -->
<eclipse.persistence.version>2.7.7</eclipse.persistence.version>
<!-- Used by aaa -->
@@ -136,7 +136,7 @@
<guava.version>28.2-jre</guava.version>
<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
integration/distribution, snmp4sdn, toolkit, ttp -->
- <jackson.version>2.10.4</jackson.version>
+ <jackson.version>2.10.5</jackson.version>
<!-- Used by snmp4sdn, yangtools -->
<javassist.version>3.27.0-GA</javassist.version>
@@ -154,19 +154,19 @@
<!-- Used everywhere -->
<junit.version>4.13</junit.version>
<!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <logback.version>1.11.6</logback.version>
+ <logback.version>1.11.7</logback.version>
<!-- Used by nic, sfc, sxp, tsdr -->
<mockito.version>3.3.3</mockito.version>
<!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
- <netty.version>4.1.51.Final</netty.version>
+ <netty.version>4.1.56.Final</netty.version>
<!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
- <slf4j.version>1.7.29</slf4j.version>
+ <slf4j.version>1.7.28</slf4j.version>
<!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
<spring.version>4.3.25.RELEASE</spring.version>
<!-- Extra support libraries used by SDN-C -->
<jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
- <antlr.version>4.8.1</antlr.version>
+ <antlr.version>4.8-1</antlr.version>
<eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
@@ -180,7 +180,7 @@
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
- <jetty.version>9.4.28.v20200408</jetty.version>
+ <jetty.version>9.4.31.v20200723</jetty.version>
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
@@ -587,21 +587,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.12.2</version>
@@ -668,6 +653,7 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
@@ -679,6 +665,16 @@
</dependencies>
<executions>
<execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <failOnViolation>false</failOnViolation>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
<id>check-license</id>
<goals>
<goal>check</goal>
@@ -750,71 +746,8 @@
<!-- Plugins from oparent -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>checkstyle</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <!-- overwrite odl default to supress spotbugs code check execution -->
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <skip>true</skip>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>onap-checkstyle/check-license.xml</configLocation>
- <includeResources>false</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>false</includeTestResources>
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}</directory>
- </sourceDirectories>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- <execution>
- <id>onap-java-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
- with minor changes -->
- <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
- <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
- <sourceDirectories>
- <directory>${project.build.sourceDirectory}/src/main/java</directory>
- </sourceDirectories>
- <includeResources>true</includeResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <includeTestResources>true</includeTestResources>
- <excludes>
- </excludes>
- <consoleOutput>true</consoleOutput>
- <failOnViolation>false</failOnViolation>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index a5acdcdd..b4fc8650 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -67,10 +67,10 @@
<ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
<ccsdk.distribution.version>1.1.6-SNAPSHOT</ccsdk.distribution.version>
- <mariadb.connector.version>2.1.1</mariadb.connector.version>
- <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
+ <mariadb.connector.version>2.4.4</mariadb.connector.version>
+ <fasterxml.jackson.version>2.10.5</fasterxml.jackson.version>
<velocity.version>2.0</velocity.version>
-
+ <!-- Using dmaapClient 1.1.5 as SLI needs java package as com.att.nsa.mr and dmaapClient 1.1.12 has org.onap.dmaap.mr -->
<dmaap.listener.version>1.1.5</dmaap.listener.version>
<sdc.client.version>1.4.1</sdc.client.version>
<sdc.tosca.version>1.6.5</sdc.tosca.version>
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 6bfaa9cf..c7ae7d88 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -335,6 +335,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<dependencies>
@@ -612,6 +613,7 @@
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index bf1dcbfe..8852feda 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -335,6 +335,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<dependencies>
@@ -612,6 +613,7 @@
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 9620486a..bb84b79e 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -335,6 +335,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<dependencies>
@@ -612,6 +613,7 @@
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
diff --git a/standalone/pom.xml b/standalone/pom.xml
index f4e479bb..10b0b8ac 100755
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -55,16 +55,15 @@
<bundle.plugin.version>2.5.0</bundle.plugin.version>
<checkstyle.skip>true</checkstyle.skip>
- <mariadb.connector.version>2.1.1</mariadb.connector.version>
- <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
+ <mariadb.connector.version>2.4.4</mariadb.connector.version>
+ <fasterxml.jackson.version>2.10.5</fasterxml.jackson.version>
<velocity.version>2.0</velocity.version>
-
+ <!-- Using dmaapClient 1.1.5 as SLI needs java package as com.att.nsa.mr and dmaapClient 1.1.12 has org.onap.dmaap.mr -->
<dmaap.listener.version>1.1.5</dmaap.listener.version>
<sdc.client.version>1.4.1</sdc.client.version>
<sdc.tosca.version>1.6.5</sdc.tosca.version>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
-
</properties>
<dependencyManagement>
@@ -89,7 +88,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
+ <version>1.7.28</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>