X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Fkaraf4-parent%2Fpom.xml;h=5bc977c15ad00679b6816e604780c879444f402c;hb=a123072c2982d2e8dc598fe3902e893bbce3fb68;hp=750118d7d846664c7d6ab7c031f192ade055e342;hpb=929ce1d5faf1facb2e291bc971c035f9ab148f4e;p=ccsdk%2Fparent.git

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 750118d7..5bc977c1 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.1.5</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -55,7 +55,6 @@
         <!-- properties from oparent -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <!-- sitePath may be overridden in the inheriting POM if desired -->
         <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 
@@ -66,6 +65,7 @@
         <!-- end of properties from oparent -->
 
         <!-- ONAP repositories -->
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <onap.nexus.host>nexus.onap.org</onap.nexus.host>
         <onap.nexus.port>443</onap.nexus.port>
         <onap.nexus.protocol>https</onap.nexus.protocol>
@@ -94,13 +94,13 @@
         <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
 
         <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.6</logging-analytics.version>
+        <logging-analytics.version>1.6.9</logging-analytics.version>
 
         <!-- CCSDK component versions -->
         <ccsdk.cds.version>1.1.4</ccsdk.cds.version>
-        <ccsdk.features.version>1.1.5-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.distribution.version>1.1.6-SNAPSHOT</ccsdk.distribution.version>
-        <ccsdk.sli.version>1.2.3-SNAPSHOT</ccsdk.sli.version>
+        <ccsdk.features.version>1.1.5</ccsdk.features.version>
+        <ccsdk.distribution.version>1.1.6</ccsdk.distribution.version>
+        <ccsdk.sli.version>1.2.3</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
@@ -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>
@@ -193,14 +193,14 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.1.5-SNAPSHOT</version>
+                <version>2.1.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.1.5-SNAPSHOT</version>
+                <version>2.1.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -301,8 +301,8 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>onap-public</id>
@@ -363,7 +363,6 @@
             <name>JCenter Repository</name>
             <url>http://jcenter.bintray.com</url>
         </pluginRepository>
-
         <pluginRepository>
             <id>Restlet</id>
             <name>Restlet Repository</name>
@@ -461,7 +460,7 @@
                                         <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
                                         <excludes>
                                             <exclude>org.mockito:mockito-all</exclude>
-                                            <!--                     <exclude>com.google.code.findbugs:annotations</exclude> -->
+                                            <!-- <exclude>com.google.code.findbugs:annotations</exclude> -->
                                         </excludes>
                                     </bannedDependencies>
                                 </rules>
@@ -587,21 +586,6 @@
                         <failOnError>false</failOnError>
                     </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>
@@ -669,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 +664,16 @@
                         </dependency>
                     </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>
@@ -751,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>