Prepare for release build

Prepare for release of early ODL-Oxygen based CCSDK Dublin

Change-Id: Ia1fb4b7211619be726857b0333c1f75985ff1a64
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/.gitignore b/.gitignore
index b45dfca..6a9d982 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,6 @@ blackDuckHubProjectVersionName.txt
 
 # Derby log
 derby.log
+
+# Generated file
+sliPluginUtils/provider/testFileName

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 213f627..b518958 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -1,154 +1,152 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>sli-core-artifacts</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>sli-core-artifacts</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>ccsdk-sli-core :: sli-core-artifacts</name>
-       <description>CCSDK core components Bill of Materials (BOM)</description>
-       <url>https://wiki.onap.org</url>
-       <organization>
-               <name>ONAP</name>
-       </organization>
+    <name>ccsdk-sli-core :: sli-core-artifacts</name>
+    <description>CCSDK core components Bill of Materials (BOM)</description>
+    <url>https://wiki.onap.org</url>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.2.0</version>
+    </parent>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>ccsdk-dblib</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>ccsdk-filters</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>ccsdk-sli</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>ccsdk-sli-core-all</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>ccsdk-sliapi</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>ccsdk-slicore-utils</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>ccsdk-sliPluginUtils</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>feature</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-installer</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>filters-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>filters-installer</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-common</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-model</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-provider-base</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sliapi-model</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sliapi-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sliapi-installer</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sliPluginUtils-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sliPluginUtils-installer</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>utils-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>utils-installer</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-dblib</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-filters</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sli</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sli-core-all</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sliapi</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-slicore-utils</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sliPluginUtils</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>feature</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>filters-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>filters-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-model</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-provider-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sliapi-model</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sliapi-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sliapi-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sliPluginUtils-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sliPluginUtils-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>utils-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>utils-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
 </project>

diff --git a/dblib/features/ccsdk-dblib/pom.xml b/dblib/features/ccsdk-dblib/pom.xml
index 23bf117..e4de0b4 100644 (file)
--- a/dblib/features/ccsdk-dblib/pom.xml
+++ b/dblib/features/ccsdk-dblib/pom.xml
@@ -1,67 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>ccsdk-dblib</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>ccsdk-dblib</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>
 
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencies>
+    <dependencies>
 
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>dblib-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dblib-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>${mariadb.connector.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-jdbc</artifactId>
-                       <version>${tomcat-jdbc.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>utils-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>${mariadb.connector.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>${tomcat-jdbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>utils-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derby</artifactId>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.karaf.tooling</groupId>
-                               <artifactId>karaf-maven-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <excludedArtifactIds>
-                                               <excludedArtifactId>slf4j-api</excludedArtifactId>
-                                               <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
-                                               <excludedArtifactId>tomcat-juli</excludedArtifactId>
-                                       </excludedArtifactIds>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <excludedArtifactIds>
+                        <excludedArtifactId>slf4j-api</excludedArtifactId>
+                        <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
+                        <excludedArtifactId>tomcat-juli</excludedArtifactId>
+                    </excludedArtifactIds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/dblib/features/features-dblib/pom.xml b/dblib/features/features-dblib/pom.xml
index 456822c..976fdfe 100644 (file)
--- a/dblib/features/features-dblib/pom.xml
+++ b/dblib/features/features-dblib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,10 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
     <dependencies>
         <dependency>

diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml
index 738fdb0..3e89746 100755 (executable)
--- a/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index 78099e7..f9d2e05 100755 (executable)
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/dblib/pom.xml b/dblib/pom.xml
index d71f35a..3e9d49f 100755 (executable)
--- a/dblib/pom.xml
+++ b/dblib/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 

diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index 55e5619..406b5b7 100755 (executable)
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -1,85 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>binding-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>dblib-provider</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>dblib-provider</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-       <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>
-       <url>http://maven.apache.org</url>
+    <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>
+    <url>http://maven.apache.org</url>
 
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>ch.vorburger.mariaDB4j</groupId>
-                       <artifactId>mariaDB4j</artifactId>
-                       <version>2.2.3</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.osgi</groupId>
-                       <artifactId>org.osgi.core</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>jcl-over-slf4j</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-simple</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>${mariadb.connector.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-jdbc</artifactId>
-                       <version>${tomcat-jdbc.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>utils-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.vorburger.mariaDB4j</groupId>
+            <artifactId>mariaDB4j</artifactId>
+            <version>2.2.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>${mariadb.connector.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>${tomcat-jdbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>utils-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <!-- Testing related dependencies -->
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.karaf.shell</groupId>
-                       <artifactId>org.apache.karaf.shell.console</artifactId>
-               </dependency>
-       </dependencies>
+        <!-- Testing related dependencies -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml
index 447b203..6e3480e 100644 (file)
--- a/features/ccsdk-sli-core-all/pom.xml
+++ b/features/ccsdk-sli-core-all/pom.xml
@@ -1,100 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>ccsdk-sli-core-all</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>ccsdk-sli-core-all</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>
 
-       
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-common</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${odl.mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-slicore-utils</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-dblib</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-filters</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-sli</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-sliapi</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-sliPluginUtils</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-slicore-utils</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-dblib</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-filters</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-sliapi</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-sliPluginUtils</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml
index 38d2715..29619f9 100644 (file)
--- a/features/features-sli-core/pom.xml
+++ b/features/features-sli-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,10 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
     <dependencies>
         <dependency>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 3eb2833..fba4084 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -1,138 +1,137 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>slicore-features-installer</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>slicore-features-installer</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>
 
-       <properties>
-               <application.name>ccsdk-sli-core-all</application.name>
-               <features.boot>${application.name}</features.boot>
-               <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories>
-               <include.transitive.dependencies>false</include.transitive.dependencies>
-       </properties>
+    <properties>
+        <application.name>ccsdk-sli-core-all</application.name>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-       <dependencies>
+    <dependencies>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>${application.name}</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>*</groupId>
-                                       <artifactId>*</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
 
-       </dependencies>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>maven-repo-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>stage/${application.name}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>true</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>installer-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>${application.name}-${project.version}-installer</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <phase>prepare-package</phase>
-                                               <configuration>
-                                                       <transitive>false</transitive>
-                                                       <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-                                                       <overWriteReleases>false</overWriteReleases>
-                                                       <overWriteSnapshots>true</overWriteSnapshots>
-                                                       <overWriteIfNewer>true</overWriteIfNewer>
-                                                       <useRepositoryLayout>true</useRepositoryLayout>
-                                                       <addParentPoms>false</addParentPoms>
-                                                       <copyPom>false</copyPom>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>installer-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>${application.name}-${project.version}-installer</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>false</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
                              <includeGroupIds>org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j</includeGroupIds>
-                                                       <excludeArtifactIds>utils-provider,slf4j-api</excludeArtifactIds>
-                                                       <scope>provided</scope>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-version</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/resources/scripts</directory>
-                                                                       <includes>
-                                                                               <include>install-feature.sh</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
+                            <excludeArtifactIds>utils-provider,slf4j-api</excludeArtifactIds>
+                            <scope>provided</scope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-version</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/scripts</directory>
+                                    <includes>
+                                        <include>install-feature.sh</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
 
-                               </executions>
-                       </plugin>
+                </executions>
+            </plugin>
 
-               </plugins>
-       </build>
+        </plugins>
+    </build>
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index 2c09843..529d242 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>slicore-feature-aggregator</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>slicore-feature-aggregator</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>ccsdk-sli-core :: features</name>
+    <name>ccsdk-sli-core :: features</name>
 
-       <modules>
+    <modules>
         <module>ccsdk-sli-core-all</module>
         <module>features-sli-core</module>
         <module>installer</module>

diff --git a/filters/features/ccsdk-filters/pom.xml b/filters/features/ccsdk-filters/pom.xml
index a56f273..0c883a3 100644 (file)
--- a/filters/features/ccsdk-filters/pom.xml
+++ b/filters/features/ccsdk-filters/pom.xml
@@ -1,58 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
-
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>ccsdk-filters</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
-
-       <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
-       <dependencyManagement>
-               <dependencies>
-               
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-common</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       
-
-       <dependencies>
-
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-sli</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>filters-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-       </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>ccsdk-filters</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+        
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>filters-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
 </project>

diff --git a/filters/features/features-filters/pom.xml b/filters/features/features-filters/pom.xml
index a8c0e75..76250ba 100644 (file)
--- a/filters/features/features-filters/pom.xml
+++ b/filters/features/features-filters/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,10 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
     <dependencies>
         <dependency>

diff --git a/filters/features/pom.xml b/filters/features/pom.xml
index d3f9ecd..622b6ab 100755 (executable)
--- a/filters/features/pom.xml
+++ b/filters/features/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index 7fe6422..0d35aed 100755 (executable)
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -1,165 +1,165 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>filters-installer</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>filters-installer</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
 
-       <properties>
-               <application.name>ccsdk-filters</application.name>
-               <features.boot>${application.name}</features.boot>
+    <properties>
+        <application.name>ccsdk-filters</application.name>
+        <features.boot>${application.name}</features.boot>
         <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories>
-               <include.transitive.dependencies>false</include.transitive.dependencies>
-       </properties>
+        <include.transitive.dependencies>false</include.transitive.dependencies>
+    </properties>
 
-       <dependencyManagement>
-               <dependencies>
-               
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-common</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       
+    <dependencyManagement>
+        <dependencies>
+        
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
 
-       <dependencies>
+    <dependencies>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>${application.name}</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>*</groupId>
-                                       <artifactId>*</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>${application.name}</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>filters-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>filters-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
 
-       </dependencies>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>maven-repo-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>stage/${application.name}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>true</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>installer-zip</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>${application.name}-${project.version}-installer</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <phase>prepare-package</phase>
-                                               <configuration>
-                                                       <transitive>false</transitive>
-                                                       <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-                                                       <overWriteReleases>false</overWriteReleases>
-                                                       <overWriteSnapshots>true</overWriteSnapshots>
-                                                       <overWriteIfNewer>true</overWriteIfNewer>
-                                                       <useRepositoryLayout>true</useRepositoryLayout>
-                                                       <addParentPoms>false</addParentPoms>
-                                                       <copyPom>false</copyPom>
-                                                       <includeGroupIds>org.onap.ccsdk.sli.core</includeGroupIds>
-                                                       <excludeArtifactIds>sli-common,sli-provider,utils-provider,dblib-provider</excludeArtifactIds>
-                                                       <scope>provided</scope>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-version</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/resources/scripts</directory>
-                                                                       <includes>
-                                                                               <include>install-feature.sh</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>maven-repo-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>installer-zip</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <attach>true</attach>
+                            <finalName>${application.name}-${project.version}-installer</finalName>
+                            <descriptors>
+                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <transitive>false</transitive>
+                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                            <addParentPoms>false</addParentPoms>
+                            <copyPom>false</copyPom>
+                            <includeGroupIds>org.onap.ccsdk.sli.core</includeGroupIds>
+                            <excludeArtifactIds>sli-common,sli-provider,utils-provider,dblib-provider</excludeArtifactIds>
+                            <scope>provided</scope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-version</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/scripts</directory>
+                                    <includes>
+                                        <include>install-feature.sh</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
 
-                               </executions>
-                       </plugin>
+                </executions>
+            </plugin>
 
-               </plugins>
-       </build>
+        </plugins>
+    </build>
 </project>

diff --git a/filters/pom.xml b/filters/pom.xml
index 1182f2b..150fee3 100644 (file)
--- a/filters/pom.xml
+++ b/filters/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,11 @@
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: filters</name>
+
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
    <description>Servlet filter to implement ONAP logging spec</description>
    <organization>
         <name>ONAP</name>

diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index 76898e2..d2df92e 100755 (executable)
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -19,8 +19,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       <!--  Ignore deprecated classes in coverage counts -->
-       <sonar.coverage.exclusions>**/RequestResponseDbLoggingFilter.java</sonar.coverage.exclusions>
+        <!--  Ignore deprecated classes in coverage counts -->
+        <sonar.coverage.exclusions>**/RequestResponseDbLoggingFilter.java</sonar.coverage.exclusions>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
     </properties>
 
        <dependencyManagement>

diff --git a/pom.xml b/pom.xml
index 3c9ea25..4504ece 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index a8bb2f6..17ee475 100755 (executable)
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath />
+        <version>1.2.0</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -19,9 +18,9 @@
     <description>The SLI Common package includes common classes used by the various SLI subcomponents, as well as classes used by clients to interface with the service logic interpreter</description>
 
     <properties>
-       <!--  Ignore deprecated classes in coverage counts -->
-       <sonar.coverage.exclusions>**/MessageWriter.java</sonar.coverage.exclusions>
-
+        <!--  Ignore deprecated classes in coverage counts -->
+        <sonar.coverage.exclusions>**/MessageWriter.java</sonar.coverage.exclusions>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
     </properties>
 
 

diff --git a/sli/features/features-sli/pom.xml b/sli/features/features-sli/pom.xml
index 2d29070..9bb3612 100644 (file)
--- a/sli/features/features-sli/pom.xml
+++ b/sli/features/features-sli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -16,6 +16,10 @@
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
 
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/sli/features/odl-sli/pom.xml b/sli/features/odl-sli/pom.xml
index 8d50d8b..9e88969 100644 (file)
--- a/sli/features/odl-sli/pom.xml
+++ b/sli/features/odl-sli/pom.xml
@@ -1,82 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>ccsdk-sli</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>ccsdk-sli</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.opendaylight.controller</groupId>
-                               <artifactId>mdsal-artifacts</artifactId>
-                               <version>${odl.mdsal.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.opendaylight.mdsal.model</groupId>
-                               <artifactId>mdsal-model-artifacts</artifactId>
-                               <version>${odl.mdsal.model.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${odl.mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
-               </dependencies>
-       </dependencyManagement>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-common</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-recording</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-recording</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>dblib-provider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>dblib-provider</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>${mariadb.connector.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>${mariadb.connector.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>ccsdk-dblib</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-dblib</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
 
 
-       </dependencies>
+    </dependencies>
 </project>

diff --git a/sli/features/pom.xml b/sli/features/pom.xml
index 445e917..9c0451d 100644 (file)
--- a/sli/features/pom.xml
+++ b/sli/features/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <relativePath/>
   </parent>
 

diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 99b4a40..77f4603 100755 (executable)
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/sli/model/pom.xml b/sli/model/pom.xml
index 5a60ce2..fab849e 100755 (executable)
--- a/sli/model/pom.xml
+++ b/sli/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,10 @@
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
     <dependencies>
        <dependency>

diff --git a/sli/pom.xml b/sli/pom.xml
index 7060541..54fd5cf 100755 (executable)
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 

diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml
index 63cba83..6680fce 100644 (file)
--- a/sli/provider-base/pom.xml
+++ b/sli/provider-base/pom.xml
@@ -1,61 +1,63 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>binding-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
-
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>sli-provider-base</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-common</artifactId>
-                       <version>${project.version}</version>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <scope>compile</scope>
-               </dependency>
-
-               <!-- Testing Dependencies -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-       </dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>sli-provider-base</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Testing Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
 
 </project>

diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index 0a09028..f3d3689 100755 (executable)
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -1,111 +1,110 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>binding-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>sli-provider</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>sli-provider</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-       <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
-       <description>SLI Provider is the OSGi bundle that exposes the service logic interpreter as a service.</description>
+    <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
+    <description>SLI Provider is the OSGi bundle that exposes the service logic interpreter as a service.</description>
 
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-model</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-common</artifactId>
-                       <version>${project.version}</version>
-                       <scope>compile</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-provider-base</artifactId>
-                       <version>${project.version}</version>
-                       <scope>compile</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <scope>compile</scope>
-               </dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-model</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider-base</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.osgi</groupId>
-                       <artifactId>org.osgi.core</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-api</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
 
-               <!-- Testing Dependencies -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
+        <!-- Testing Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derby</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <DynamicImport-Package>*</DynamicImport-Package>
-                                       </instructions>
-                               </configuration>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                    </instructions>
+                </configuration>
 
-                       </plugin>
-               </plugins>
+            </plugin>
+        </plugins>
 
-       </build>
+    </build>
 </project>

diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml
index 593db5b..27acbbc 100755 (executable)
--- a/sli/recording/pom.xml
+++ b/sli/recording/pom.xml
@@ -1,82 +1,81 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>binding-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>sli-recording</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>sli-recording</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-       <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
-       <description>SLI Recording is an OSGi bundle that implements recording service for the service logic record node.</description>
+    <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
+    <description>SLI Recording is an OSGi bundle that implements recording service for the service logic record node.</description>
 
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-common</artifactId>
-                       <version>${project.version}</version>
-                       <scope>compile</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.osgi</groupId>
-                       <artifactId>org.osgi.core</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>jcl-over-slf4j</artifactId>
-               </dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <scope>compile</scope>
-               </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-api</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
 
-               <!-- Testing Dependencies -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
+        <!-- Testing Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <scope>test</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-       </dependencies>
+    </dependencies>
 </project>

diff --git a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
index 18fd8c3..79042b4 100644 (file)
--- a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
+++ b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,10 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
     <dependencyManagement>
         <dependencies>

diff --git a/sliPluginUtils/features/features-sliPluginUtils/pom.xml b/sliPluginUtils/features/features-sliPluginUtils/pom.xml
index 7aaa53e..d38db86 100644 (file)
--- a/sliPluginUtils/features/features-sliPluginUtils/pom.xml
+++ b/sliPluginUtils/features/features-sliPluginUtils/pom.xml
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>features-sliPluginUtils</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>features-sliPluginUtils</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
+    
+    <properties>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-sliPluginUtils</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-sliPluginUtils</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
 
-       </dependencies>
+    </dependencies>
 </project>

diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml
index fb90b9e..991ac79 100755 (executable)
--- a/sliPluginUtils/features/pom.xml
+++ b/sliPluginUtils/features/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index 5d38c02..13ef49c 100755 (executable)
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index 244767d..bebc8a8 100755 (executable)
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index 5f7be76..7e00ef3 100755 (executable)
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -1,72 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>binding-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>sliPluginUtils-provider</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>sliPluginUtils-provider</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-       <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
-       <url>http://maven.apache.org</url>
+    <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
+    <url>http://maven.apache.org</url>
 
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>sli-common</artifactId>
-                       <version>${project.version}</version>
-                       <scope>compile</scope>
-               </dependency>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>jcl-over-slf4j</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-library</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-text</artifactId>
-                       <version>1.1</version>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.1</version>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/sliapi/features/ccsdk-sliapi/pom.xml b/sliapi/features/ccsdk-sliapi/pom.xml
index fe7625a..9c7e515 100644 (file)
--- a/sliapi/features/ccsdk-sliapi/pom.xml
+++ b/sliapi/features/ccsdk-sliapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,10 +15,14 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
+    
+    <properties>
+        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencyManagement>
-               <dependencies>
-                    <dependency>
+    <dependencyManagement>
+        <dependencies>
+             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
                 <version>${odl.mdsal.model.version}</version>
@@ -33,24 +37,24 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-common</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>sli-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             
-               </dependencies>
-       </dependencyManagement>
-       
+        </dependencies>
+    </dependencyManagement>
+    
     <dependencies>
 
         <dependency>

diff --git a/sliapi/features/features-sliapi/pom.xml b/sliapi/features/features-sliapi/pom.xml
index 2cf3844..fb1931d 100644 (file)
--- a/sliapi/features/features-sliapi/pom.xml
+++ b/sliapi/features/features-sliapi/pom.xml
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>features-sliapi</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>features-sliapi</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-       <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-sliapi</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-sliapi</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
 
-       </dependencies>
+    </dependencies>
 </project>

diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml
index fb26758..9ef65fc 100755 (executable)
--- a/sliapi/features/pom.xml
+++ b/sliapi/features/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index d8a56b8..48bfee6 100755 (executable)
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index bb84b87..913e8ec 100755 (executable)
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>binding-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>sliapi-model</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>sliapi-model</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-       <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
+    <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-yang-types</artifactId>
-               </dependency>
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-yang-types</artifactId>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index eb02ee8..5c8b68f 100755 (executable)
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 

diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index efcf321..0bcf7f7 100755 (executable)
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath />
+        <version>1.2.0</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -17,15 +16,19 @@
 
     <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
     
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.ccsdk.sli.core</groupId>
-                               <artifactId>dblib-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>dblib-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>

diff --git a/utils/features/ccsdk-slicore-utils/pom.xml b/utils/features/ccsdk-slicore-utils/pom.xml
index c019687..7ff4d76 100644 (file)
--- a/utils/features/ccsdk-slicore-utils/pom.xml
+++ b/utils/features/ccsdk-slicore-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,10 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
     <dependencyManagement>
         <dependencies>

diff --git a/utils/features/features-util/pom.xml b/utils/features/features-util/pom.xml
index 5b03869..9981b2c 100644 (file)
--- a/utils/features/features-util/pom.xml
+++ b/utils/features/features-util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,10 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
 
     <dependencies>
         <dependency>

diff --git a/utils/features/pom.xml b/utils/features/pom.xml
index 3011739..33277b8 100755 (executable)
--- a/utils/features/pom.xml
+++ b/utils/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 

diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml
index 902120a..b0c1d4a 100755 (executable)
--- a/utils/installer/pom.xml
+++ b/utils/installer/pom.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/utils/pom.xml b/utils/pom.xml
index 68f20cb..be130eb 100755 (executable)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -5,7 +5,7 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 

diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml
index e4c446b..88983bd 100644 (file)
--- a/utils/provider/pom.xml
+++ b/utils/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
@@ -15,6 +15,12 @@
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
+
+    
+    <properties>
+       <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
+    </properties>
+
     <description>
         The SLI Core Utilities Package provides common functionality for setting up SLI connectivity.
     </description>

diff --git a/version.properties b/version.properties
index aa6328e..ffee02f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -10,6 +10,6 @@ feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}-STAGING
+release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT