Add v12 api changes for the new release code

Issue-ID: AAI-514
Change-Id: I5216e1d929d9fb2547e47c285dfcd94dfe4fde48
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties b/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties
index 217463d..3943d08 100644 (file)
--- a/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties
+++ b/aai-traversal/bundleconfig-local/etc/appprops/aaiconfig.properties
@@ -48,7 +48,7 @@ aai.tools.username=AAI
 aai.tools.password=AAI
 
 aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v11/
+aai.server.url=https://localhost:8443/aai/v12/
 aai.global.callback.url=https://localhost:8443/aai/
 
 aai.auth.cspcookies_on=false
@@ -80,18 +80,18 @@ aai.rsync.options.list=-v|-t
 aai.rsync.remote.user=aaiadmin
 aai.rsync.enabled=y
 
-aai.notification.current.version=v11
+aai.notification.current.version=v12
 aai.notificationEvent.default.status=UNPROCESSED
 aai.notificationEvent.default.eventType=AAI-EVENT
 aai.notificationEvent.default.domain=devINT1
 aai.notificationEvent.default.sourceName=aai
 aai.notificationEvent.default.sequenceNumber=0
 aai.notificationEvent.default.severity=NORMAL
-aai.notificationEvent.default.version=v11
+aai.notificationEvent.default.version=v12
 # This one lets us enable/disable resource-version checking on updates/deletes
 aai.resourceversion.enableflag=true
 aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v11
+aai.default.api.version=v12
 
 # Used by Model-processing code
 aai.model.delete.sleep.per.vtx.msec=500

diff --git a/aai-traversal/bundleconfig-local/etc/sysprops/sys-props.properties b/aai-traversal/bundleconfig-local/etc/sysprops/sys-props.properties
index 13c97a9..44d58d5 100644 (file)
--- a/aai-traversal/bundleconfig-local/etc/sysprops/sys-props.properties
+++ b/aai-traversal/bundleconfig-local/etc/sysprops/sys-props.properties
@@ -137,4 +137,4 @@ RESTLET_COMPONENT_REUSE_ADDRESS=true
 #Service System Properties. Please, place any Service related System Properties below.
 KEY_STORE_PASSWORD=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
 KEY_MANAGER_PASSWORD=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-AAI_CORE_VERSION=1.1.0-SNAPSHOT
+AAI_CORE_VERSION=1.2.0-SNAPSHOT

diff --git a/aai-traversal/bundleconfig-local/etc/sysprops/template.sys-props.properties b/aai-traversal/bundleconfig-local/etc/sysprops/template.sys-props.properties
index 778ac62..c9060f9 100644 (file)
--- a/aai-traversal/bundleconfig-local/etc/sysprops/template.sys-props.properties
+++ b/aai-traversal/bundleconfig-local/etc/sysprops/template.sys-props.properties
@@ -112,4 +112,4 @@ AJSC_EXTERNAL_PROPERTIES_FOLDERS=__AJSC_SHARED_CONFIG__|__AJSC_EXTERNAL_PROPERTI
 
 KEY_STORE_PASSWORD=__KEY_STORE_PASSWORD__
 KEY_MANAGER_PASSWORD=__KEY_MANAGER_PASSWORD__
-AAI_CORE_VERSION=1.1.0-SNAPSHOT
+AAI_CORE_VERSION=1.2.0-SNAPSHOT

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index d79e1e7..4daaa3d 100644 (file)
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.onap.aai.traversal</groupId>
         <artifactId>traversal</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-traversal</artifactId>
     <name>aai-traversal</name>
     <url>http://maven.apache.org</url>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <properties>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>

diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java b/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java
index 8109f7e..b5f2658 100644 (file)
--- a/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java
+++ b/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java
@@ -68,7 +68,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-@Path("{version: v9|v1[01]}/query")
+@Path("{version: v9|v1[012]}/query")
 public class QueryConsumer extends RESTAPI {
        
        /** The introspector factory type. */

diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java
index 23bdaf0..dbc618e 100644 (file)
--- a/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java
+++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java
@@ -60,7 +60,7 @@ import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
  *
  */
 
-@Path("/{version: v2|v[789]|v1[01]|latest}/search")
+@Path("/{version: v2|v[789]|v1[012]|latest}/search")
 public class SearchProvider extends RESTAPI {
        
        protected static String authPolicyFunctionName = "search";

diff --git a/aai-traversal/src/test/resources/test_aaiconfig.properties b/aai-traversal/src/test/resources/test_aaiconfig.properties
index f984761..4f130da 100644 (file)
--- a/aai-traversal/src/test/resources/test_aaiconfig.properties
+++ b/aai-traversal/src/test/resources/test_aaiconfig.properties
@@ -43,7 +43,7 @@ aai.auth.cspcookies_on=false
 aai.dbmodel.filename=ex5.json
 
 aai.server.url.base=https://localhost:8446/aai/
-aai.server.url=https://localhost:8446/aai/v11/
+aai.server.url=https://localhost:8446/aai/v12/
 
 aai.truststore.filename=aai_keystore
 aai.truststore.passwd.x=
@@ -83,7 +83,7 @@ aai.rsync.options.list=-v|-t
 aai.rsync.remote.user=aaiadmin
 aai.rsync.enabled=y
 
-aai.notification.current.version=v11
+aai.notification.current.version=v12
 aai.notificationEvent.default.status=UNPROCESSED
 aai.notificationEvent.default.eventType=AAI-EVENT
 aai.notificationEvent.default.domain=devINT1
@@ -94,6 +94,6 @@ aai.notificationEvent.default.version=v9
 # This one lets us enable/disable resource-version checking on updates/deletes
 aai.resourceversion.enableflag=true
 aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v11
+aai.default.api.version=v12
 
 

diff --git a/pom.xml b/pom.xml
index 41799e6..d078281 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.onap.aai.traversal</groupId>
     <artifactId>traversal</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <name>aai-traversal</name>
     <packaging>pom</packaging>
     <modules>
@@ -26,8 +26,8 @@
         <module.ajsc.namespace.name>ActiveAndAvailableInventory-Traversal</module.ajsc.namespace.name>
         <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
         <ajscRuntimeVersion>2.1.0</ajscRuntimeVersion>
-        <aai.project.version>1.1.0</aai.project.version>
-        <aai.docker.version>1.1</aai.docker.version>
+        <aai.project.version>1.2.0</aai.project.version>
+        <aai.docker.version>1.2</aai.docker.version>
 
         <!-- This will be the Absolute Root of the Project and should contain NO
             Versioning -->

diff --git a/version.properties b/version.properties
index abe15cf..9c95207 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,11 +4,11 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=1
-minor_version=1
+minor_version=2
 patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}
 
 # Release must be completed with GIT information # in Jenkins
 release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file
+snapshot_version=${base_version}-SNAPSHOT