Changes for Fluorine

Updated ccsdk/features to run in OpenDaylight Fluorine release.

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

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index 1899632..3b77553 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -13,33 +13,42 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <artifactId>blueprints-data-adaptor-provider</artifactId>
        <packaging>bundle</packaging>
        <name>Blueprints Data Adaptor - Provider</name>
        <url>http://maven.apache.org</url>
+       
+    <dependencyManagement>
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
+                       <artifactId>sli-core-artifacts</artifactId>
+                       <version>${ccsdk.sli.core.version}</version>
+                       <type>pom</type>
+                       <scope>import</scope>
+               </dependency>
+       </dependencies>
+    </dependencyManagement>
 
        <dependencies>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
-                       <version>${commons.lang3.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>sli-provider</artifactId>
-                       <version>${project.version}</version>
                        <scope>compile</scope>
                </dependency>
                <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>
-                       <version>2.5</version>
                </dependency>
                <dependency>
                        <groupId>org.mariadb.jdbc</groupId>

diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml
index 9d5ddc4..8eed36d 100644 (file)
--- a/blueprints-processor/adaptors/pom.xml
+++ b/blueprints-processor/adaptors/pom.xml
@@ -20,12 +20,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <artifactId>blueprints-processor-adaptors</artifactId>

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 8ecf615..af272f6 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -21,12 +21,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <artifactId>blueprints-rest-adaptor-provider</artifactId>
        <packaging>bundle</packaging>
        <name>Blueprints Rest Adaptor - Provider</name>

diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
index c598319..eddda7c 100644 (file)
--- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -20,13 +20,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>ccsdk-blueprints-processor</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>Blueprints Processor :: Features :: ${project.artifactId}</name>
@@ -44,6 +44,7 @@
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>ccsdk-sli</artifactId>
+                       <version>${ccsdk.sli.core.version}</version>
                        <type>xml</type>
                        <classifier>features</classifier>
                </dependency>
@@ -77,22 +78,18 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
-                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
                        <artifactId>jackson-module-jsonSchema</artifactId>
-                       <version>${jackson.version}</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml
index 52b716e..c08a1bb 100755 (executable)
--- a/blueprints-processor/features/features-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/features-blueprints-processor/pom.xml
@@ -20,13 +20,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>features-blueprints-processor</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>Blueprints Processor :: CCSDK Features :: ${project.artifactId}</name>

diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml
index adbb04e..9ed22ef 100755 (executable)
--- a/blueprints-processor/features/pom.xml
+++ b/blueprints-processor/features/pom.xml
@@ -20,13 +20,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>blueprints-processor-features</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name>

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index 932f757..46928b2 100644 (file)
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -20,13 +20,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>blueprints-processor-installer</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>Blueprints Processor :: ${project.artifactId}</name>
 

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 7fbce45..953d640 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -21,12 +21,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <artifactId>blueprints-assignment-provider</artifactId>
        <packaging>bundle</packaging>
        <name>Blueprints Assignment - Provider</name>

diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index 17daad8..7bcd820 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -21,12 +21,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <artifactId>blueprints-generator-provider</artifactId>
        <packaging>bundle</packaging>
        <name>Blueprints Generator - Provider</name>

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 2fbb0f0..b0f2a3a 100644 (file)
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -16,119 +16,124 @@
   limitations under the License.
 -->
 <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</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.2.1-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.features</groupId>
-       <version>0.4.0-SNAPSHOT</version>
-       <artifactId>blueprints-model-provider</artifactId>
-       <packaging>bundle</packaging>
-       <name>Blueprints Model - Provider</name>
-       <url>http://maven.apache.org</url>
+    <groupId>org.onap.ccsdk.features</groupId>
+    <version>0.4.1-SNAPSHOT</version>
+    <artifactId>blueprints-model-provider</artifactId>
+    <packaging>bundle</packaging>
+    <name>Blueprints Model - Provider</name>
+    <url>http://maven.apache.org</url>
 
-       <dependencies>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>${jackson.version}</version>
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features</groupId>
+            <artifactId>blueprints-rest-adaptor-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features</groupId>
+            <artifactId>blueprints-data-adaptor-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.6.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.6.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+            <version>2.3.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+                       <groupId>org.osgi</groupId>
+                       <artifactId>org.osgi.core</artifactId>
+                       <scope>provided</scope>
                </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jsonSchema</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.jayway.jsonpath</groupId>
-                       <artifactId>json-path</artifactId>
-                       <version>2.3.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>blueprints-rest-adaptor-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>blueprints-data-adaptor-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <version>1.6.6</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <version>1.6.6</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.sling</groupId>
-                       <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-                       <version>2.3.2</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>commons-collections</groupId>
-                       <artifactId>commons-collections</artifactId>
-                       <version>3.2.2</version>
-               </dependency>
-       </dependencies>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <configuration>
-                                       <additionalparam>-Xdoclint:none</additionalparam>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${maven.bundle.version}</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-Name>${project.artifactId}</Bundle-Name>
-                                               <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                                               <Export-Package>org.onap.ccsdk.features.model,
-                                                       org.onap.ccsdk.features.model.data,
-                                                       org.onap.ccsdk.features.model.data.api,
-                                                       org.onap.ccsdk.features.model.data.dict,
-                                                       org.onap.ccsdk.features.model.domain,
-                                                       org.onap.ccsdk.features.model.service,
-                                                       org.onap.ccsdk.features.model.utils,
-                                                       org.onap.ccsdk.features.model.validator
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${maven.bundle.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.onap.ccsdk.features.model,
+                            org.onap.ccsdk.features.model.data,
+                            org.onap.ccsdk.features.model.data.api,
+                            org.onap.ccsdk.features.model.data.dict,
+                            org.onap.ccsdk.features.model.domain,
+                            org.onap.ccsdk.features.model.service,
+                            org.onap.ccsdk.features.model.utils,
+                            org.onap.ccsdk.features.model.validator
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml
index 58b3fe3..edfcbd0 100644 (file)
--- a/blueprints-processor/plugin/pom.xml
+++ b/blueprints-processor/plugin/pom.xml
@@ -21,11 +21,11 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <artifactId>blueprints-processor-plugin</artifactId>
        <groupId>org.onap.ccsdk.features</groupId>
        <packaging>pom</packaging>

diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml
index ea3fb29..5db00f1 100644 (file)
--- a/blueprints-processor/pom.xml
+++ b/blueprints-processor/pom.xml
@@ -21,13 +21,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>blueprints-processor</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>Blueprints Processor Module</name>

diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml
index 63c066d..9369ec6 100644 (file)
--- a/features/ccsdk-features-all/pom.xml
+++ b/features/ccsdk-features-all/pom.xml
@@ -20,37 +20,18 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>ccsdk-features-all</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-features :: 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>
-               </dependencies>
-       </dependencyManagement>
-
        <dependencies>
                <dependency>
                        <groupId>org.onap.ccsdk.features</groupId>

diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml
index ca2fb69..72a26e9 100644 (file)
--- a/features/features-features/pom.xml
+++ b/features/features-features/pom.xml
@@ -20,13 +20,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>features-features</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>Blueprints Processor :: features :: ${project.artifactId}</name>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 52e5faf..4d1aaa1 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -20,13 +20,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>features-installer</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>Blueprints Processor :: features :: ${project.artifactId}</name>

diff --git a/features/pom.xml b/features/pom.xml
index a905586..b4bada8 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -20,13 +20,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>ccsdk-feature-aggregator</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>Blueprints Processor :: features</name>

diff --git a/pom.xml b/pom.xml
index e38d20f..b77cf3c 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
        <artifactId>ccsdk-features</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-features</name>

diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml
index 4cbb459..368787b 100644 (file)
--- a/sdnr/northbound/energysavings/features/pom.xml
+++ b/sdnr/northbound/energysavings/features/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml
index ad57083..3a3524e 100755 (executable)
--- a/sdnr/northbound/energysavings/installer/pom.xml
+++ b/sdnr/northbound/energysavings/installer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml
index 78f9e5c..e30bd98 100644 (file)
--- a/sdnr/northbound/energysavings/model/pom.xml
+++ b/sdnr/northbound/energysavings/model/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml
index 3e049f3..28b046d 100644 (file)
--- a/sdnr/northbound/energysavings/pom.xml
+++ b/sdnr/northbound/energysavings/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml
index 5201466..0794a30 100644 (file)
--- a/sdnr/northbound/energysavings/provider/pom.xml
+++ b/sdnr/northbound/energysavings/provider/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/version.properties b/version.properties
index ffee02f..b1967d0 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
 
 release_name=0
 sprint_number=4
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}