Roll to version 0.2.4

[ccsdk/parent.git] / odlparent / single-feature-parent / pom.xml

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 66a49f9..5658778 100755 (executable)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -7,7 +7,7 @@
     <packaging>pom</packaging>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
@@ -27,7 +27,7 @@
         <url>https://jira.onap.org/</url>
     </issueManagement>
 
-    <properties>
+   <properties>
 
         <!--- properties from oparent -->
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -41,8 +41,7 @@
         <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
         <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
         <!-- Default Sonar configuration -->
-        <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-        <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec</sonar.jacoco.reportPaths>
         <!-- Note: This list should match jacoco-maven-plugin's exclusion
             list below -->
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
@@ -84,7 +83,6 @@
         <sonar.language>java</sonar.language>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-        <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
         <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
 
@@ -92,17 +90,20 @@
 
 
         <!-- CCSDK component versions -->
-        <ccsdk.sli.core.version>0.2.1-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>0.2.1-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>0.2.1-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdk.sli.core.version>0.2.4-SNAPSHOT</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>0.2.4-SNAPSHOT</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>0.2.4-SNAPSHOT</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>0.2.4-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdk.distribution.version>0.2.4-SNAPSHOT</ccsdk.distribution.version>
         <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
         <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
         <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
         <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
         <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
+
         <!-- Support libraries used by OpenDaylight -->
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
         <!-- Used by aaa, vtn -->
         <commons.codec.version>1.10</commons.codec.version>
         <!-- Used by netconf, ovsdb -->
@@ -170,12 +171,19 @@
         <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
         <apache.httpcomponents.core.version>4.4.4</apache.httpcomponents.core.version>
         <apache.httpcomponents.client.version>4.5.2</apache.httpcomponents.client.version>
-        <antlr.version>4.5.1</antlr.version>
+        <antlr.version>4.7</antlr.version>
         <mysql.connector.version>5.1.39</mysql.connector.version>
         <mariadb.connector.version>2.1.1</mariadb.connector.version>
         <h2database.version>1.4.186</h2database.version>
 
+        <eelf.version>1.0.0</eelf.version>
+        <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
+
         <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
+
+
+       <!-- Disable SingleFeatureTest, since it will fail if any dependencies are released ONAP artifacts -->
+       <skip.karaf.featureTest>true</skip.karaf.featureTest>
     </properties>
 
 
@@ -454,28 +462,60 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-common</artifactId>
-                <version>${sdnctl.sli.version}</version>
+                <version>${ccsdk.sli.core.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-provider</artifactId>
-                <version>${sdnctl.sli.version}</version>
+                <version>${ccsdk.sli.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sli</artifactId>
+                <version>${ccsdk.sli.core.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
-
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
                 <version>${sdnctl.aai.service.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>6.11</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.att.eelf</groupId>
+                <artifactId>eelf-core</artifactId>
+                <version>${eelf.version}</version>
+            </dependency>
         </dependencies>
 
     </dependencyManagement>
@@ -629,6 +669,16 @@
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>onap-staging</id>
+            <url>${onap.nexus.staging-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
         <pluginRepository>
             <id>onap-snapshot</id>
             <url>${onap.nexus.snapshot-url}</url>
@@ -819,7 +869,7 @@
                         <dependency>
                             <groupId>org.onap.oparent</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>1.1.0-SNAPSHOT</version>
+                            <version>1.1.1</version>
                         </dependency>
                     </dependencies>
                     <executions>