Move to oparent and upversion to 1.5.0

Issue-ID: AAI-2467
Change-Id: I3de6e7efea8adc60ec6b5539ceb488680f1121fc
Signed-off-by: Jimmy Forsyth <jf2512@att.com>

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 7b520bb..8a87b23 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-annotations</artifactId>
     <name>aai-annotations</name>
     <packaging>jar</packaging>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     </properties>

diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index 064e10e..d257f7b 100644 (file)
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-queries</artifactId>
     <name>aai-queries</name>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <!-- Start of Default ONAP Schema Properties -->
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml
index 8d860ff..109ad57 100644 (file)
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-schema-gen</artifactId>
     <name>aai-schema-gen</name>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <!-- Start of Default ONAP Schema Properties -->

diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index aff7082..0f00b3a 100644 (file)
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -25,17 +25,17 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>aai-schema-service</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <properties>
         <java.version>1.8</java.version>
         <start-class>org.onap.aai.schemaservice.SchemaServiceApp</start-class>
 
-        <aai.core.version>1.4.0</aai.core.version>
+        <aai.core.version>1.5.1</aai.core.version>
 
         <spring.boot.version>1.5.20.RELEASE</spring.boot.version>
 

diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 4c8797f..bdc457f 100644 (file)
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>schema-service</artifactId>
-        <version>1.0.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-schema</artifactId>
     <name>aai-schema</name>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <!-- Start of Default ONAP Schema Properties -->

diff --git a/pom.xml b/pom.xml
index 3513f3b..4bf84a0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>schema-service</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <name>aai-schema-service</name>
     <packaging>pom</packaging>
     <modules>

diff --git a/version.properties b/version.properties
index faeb864..95479a0 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,9 @@
 # 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
 major_version=1
-minor_version=0
-patch_version=7
+minor_version=5
+patch_version=0
+
 base_version=${major_version}.${minor_version}.${patch_version}
 # Release must be completed with GIT information # in Jenkins
 release_version=${base_version}