From: Dan Timoney <dtimoney@att.com>
Date: Fri, 22 Mar 2019 21:02:17 +0000 (+0000)
Subject: Merge "Add bbs action-enum in GR-API.yang"
X-Git-Tag: 1.5.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=commitdiff_plain;h=1fe92cd216f1dd074d54cb1fd75a2ceaf013780e;hp=8e1d45becd2846910805fed633bd49f2fc90a917

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 a0639a5f..2873de4e 100644
--- 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 2d11711f..77affd29 100755
--- 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 bb0811be..8165d847 100755
--- 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 78c68f4b..5f4bdf1e 100644
--- 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 bc10eba4..6e23d15e 100644
--- 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 42cb99a2..52636d40 100644
--- 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 d972997c..dd6afd2c 100644
--- 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 868d9fb4..ed0309ec 100644
--- 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 43fcb74a..f7969000 100755
--- 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 f2172feb..28f0af00 100644
--- 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 feb70d67..cb8831ab 100644
--- 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 bf6801ec..1c5d8023 100644
--- 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 5dd30d05..b5155433 100644
--- 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 5fe3f1ad..12e91aaf 100644
--- 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 71ff6436..73902cfd 100644
--- 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 2a81d349..330a1b63 100644
--- 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 a1380940..1ab12cf4 100755
--- 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 b7d200fb..dbca92ed 100644
--- 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 00469a65..3957da33 100644
--- 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 7d799eb3..cd715c67 100644
--- 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 3353caf3..267125bc 100644
--- 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 e4a9ba5d..3ca6662c 100644
--- 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 34b8e60c..2cb92c88 100644
--- 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 1ad019b0..594024b8 100755
--- 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 263bf973..cc649b9e 100644
--- 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 19d8c4fc..0382099a 100644
--- 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>