Update default branch to oslo for oslo branch

Update default branch in .gitreview to oslo in oslo branch
and use released version of parent pom

Issue-ID: CCSDK-4069
Change-Id: I8be19e1fee0675cb0a540b45c640707793635577
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/.gitreview b/.gitreview
index 81c40b0..936e97c 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
 [gerrit]
 host=gerrit.onap.org
 port=29418
-project=sdnc/apps.git
+project=sdnc/apps
+defaultbranch=oslo

diff --git a/ms/gra/gra-app/pom.xml b/ms/gra/gra-app/pom.xml
index 24d5b20..f3f558b 100644 (file)
--- a/ms/gra/gra-app/pom.xml
+++ b/ms/gra/gra-app/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>gra</artifactId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>gra-app</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-apps :: ms :: gra :: ${project.artifactId}</name>

diff --git a/ms/gra/gra-docker/pom.xml b/ms/gra/gra-docker/pom.xml
index b241d42..0022b54 100644 (file)
--- a/ms/gra/gra-docker/pom.xml
+++ b/ms/gra/gra-docker/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>gra</artifactId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>gra-docker</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-apps :: ms :: gra :: ${project.artifactId}</name>

diff --git a/ms/gra/pom.xml b/ms/gra/pom.xml
index 37140f8..394ccc3 100644 (file)
--- a/ms/gra/pom.xml
+++ b/ms/gra/pom.xml
@@ -18,17 +18,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
+
 <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.sdnc.apps</groupId>
         <artifactId>sdnc-apps-ms</artifactId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>gra</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-apps :: ms :: ${project.artifactId}</name>

diff --git a/ms/pom.xml b/ms/pom.xml
index b0dcfeb..0fe42d1 100644 (file)
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -18,18 +18,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
+
 <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.sdnc.apps</groupId>
         <artifactId>sdnc-apps</artifactId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <!-- Unnecessary comment to test generated jobs from PR -->
     <artifactId>sdnc-apps-ms</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Micro-services Root</name>

diff --git a/ms/sanity-test/pom.xml b/ms/sanity-test/pom.xml
index f623827..d1e6fd8 100644 (file)
--- a/ms/sanity-test/pom.xml
+++ b/ms/sanity-test/pom.xml
@@ -18,17 +18,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
+
 <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.sdnc.apps</groupId>
         <artifactId>sdnc-apps-ms</artifactId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sanity-test</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-apps :: ms :: ${project.artifactId}</name>

diff --git a/ms/sanity-test/sanity-test-app/pom.xml b/ms/sanity-test/sanity-test-app/pom.xml
index 690e06b..97ab115 100644 (file)
--- a/ms/sanity-test/sanity-test-app/pom.xml
+++ b/ms/sanity-test/sanity-test-app/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>sanity-test</artifactId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>sanity-test-app</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-apps :: ms :: sanity-test :: ${project.artifactId}</name>

diff --git a/pom.xml b/pom.xml
index d93d471..62cd441 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-30-starter-parent</artifactId>
-        <version>2.8.0-SNAPSHOT</version>
+        <version>3.0.1</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>sdnc-apps</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-apps</name>

diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml
index 002daf4..176e71a 100644 (file)
--- a/pomba/network-discovery-api/pom.xml
+++ b/pomba/network-discovery-api/pom.xml
@@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
+
 <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>
 

diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index f7c8333..8805c5e 100644 (file)
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
+
 <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>
 

diff --git a/pomba/pom.xml b/pomba/pom.xml
index 0753544..dcf7643 100644 (file)
--- a/pomba/pom.xml
+++ b/pomba/pom.xml
@@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
+
 <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>
 

diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml
index 8b871fb..d480119 100644 (file)
--- a/pomba/service-decomposition/pom.xml
+++ b/pomba/service-decomposition/pom.xml
@@ -16,6 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=====================================================
 -->
+
 <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>
 

diff --git a/version.properties b/version.properties
index 793efa5..a9d5fa7 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-release_name=2
-sprint_number=8
+release_name=3
+sprint_number=0
 feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}