Merge "Add bbs action-enum in GR-API.yang"

diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml
index a0639a5..2873de4 100644 (file)
--- a/features/features-sdnc-northbound/pom.xml
+++ b/features/features-sdnc-northbound/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 2d11711..77affd2 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index bb0811b..8165d84 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml
index 78c68f4..5f4bdf1 100644 (file)
--- a/features/sdnc-northbound-all/pom.xml
+++ b/features/sdnc-northbound-all/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml
index bc10eba..6e23d15 100644 (file)
--- a/generic-resource-api/client/pom.xml
+++ b/generic-resource-api/client/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>client-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
     </parent>
 
     <dependencies>

diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml
index 42cb99a..52636d4 100644 (file)
--- a/generic-resource-api/features/features-generic-resource-api/pom.xml
+++ b/generic-resource-api/features/features-generic-resource-api/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml
index d972997..dd6afd2 100644 (file)
--- a/generic-resource-api/features/pom.xml
+++ b/generic-resource-api/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
index 868d9fb..ed0309e 100644 (file)
--- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
+++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml
index 43fcb74..f796900 100755 (executable)
--- a/generic-resource-api/installer/pom.xml
+++ b/generic-resource-api/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml
index f2172fe..28f0af0 100644 (file)
--- a/generic-resource-api/model/pom.xml
+++ b/generic-resource-api/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml
index feb70d6..cb8831a 100644 (file)
--- a/generic-resource-api/pom.xml
+++ b/generic-resource-api/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml
index bf6801e..1c5d802 100644 (file)
--- a/generic-resource-api/provider/pom.xml
+++ b/generic-resource-api/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 5dd30d0..b515543 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 
@@ -59,17 +59,6 @@
                                        <skipTests>false</skipTests>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>https://${onap.nexus.host}</nexusUrl>
-                                       <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
-                                       <serverId>${onap.nexus.staging.server-id}</serverId>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
 

diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml
index 5fe3f1a..12e91aa 100644 (file)
--- a/vnfapi/features/features-vnfapi/pom.xml
+++ b/vnfapi/features/features-vnfapi/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml
index 71ff643..73902cf 100644 (file)
--- a/vnfapi/features/pom.xml
+++ b/vnfapi/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnfapi/features/sdnc-vnfapi/pom.xml b/vnfapi/features/sdnc-vnfapi/pom.xml
index 2a81d34..330a1b6 100644 (file)
--- a/vnfapi/features/sdnc-vnfapi/pom.xml
+++ b/vnfapi/features/sdnc-vnfapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml
index a138094..1ab12cf 100755 (executable)
--- a/vnfapi/installer/pom.xml
+++ b/vnfapi/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml
index b7d200f..dbca92e 100644 (file)
--- a/vnfapi/model/pom.xml
+++ b/vnfapi/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml
index 00469a6..3957da3 100644 (file)
--- a/vnfapi/pom.xml
+++ b/vnfapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml
index 7d799eb..cd715c6 100644 (file)
--- a/vnfapi/provider/pom.xml
+++ b/vnfapi/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml
index 3353caf..267125b 100644 (file)
--- a/vnftools/features/features-vnftools/pom.xml
+++ b/vnftools/features/features-vnftools/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
 

diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml
index e4a9ba5..3ca6662 100644 (file)
--- a/vnftools/features/pom.xml
+++ b/vnftools/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml
index 34b8e60..2cb92c8 100644 (file)
--- a/vnftools/features/sdnc-vnftools/pom.xml
+++ b/vnftools/features/sdnc-vnftools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>
 

diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml
index 1ad019b..594024b 100755 (executable)
--- a/vnftools/installer/pom.xml
+++ b/vnftools/installer/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
        </parent>
 
        <groupId>org.onap.sdnc.northbound</groupId>

diff --git a/vnftools/pom.xml b/vnftools/pom.xml
index 263bf97..cc649b9 100644 (file)
--- a/vnftools/pom.xml
+++ b/vnftools/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1-SNAPSHOT</version>
+               <version>1.2.1</version>
        </parent>
 
        <groupId>org.onap.sdnc.northbound</groupId>

diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml
index 19d8c4f..0382099 100644 (file)
--- a/vnftools/provider/pom.xml
+++ b/vnftools/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.1</version>
         <relativePath/>
     </parent>