[AAI-50 Amsterdam] Add support for v11 version API

Update rest controller paths to include v11
update version in app props to v11
Update default api version for dmaap to v11
Update oxms in the test dir to v11
Update version of schema and core for resources

Change-Id: Ic1604f75a00fdafbda3de30ce5421efecdc128d9
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@att.com>

7 files changed, 7 insertions, 7 deletions

diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java
index f8c34c24..7f93b919 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkAddConsumer.java
@@ -24,7 +24,7 @@ import javax.ws.rs.Path;
 
 import org.openecomp.aai.restcore.HttpMethod;
 
-@Path("{version: v[8-9]|v1[0]}/bulkadd")
+@Path("{version: v[8-9]|v1[01]}/bulkadd")
 public class BulkAddConsumer extends BulkConsumer {
 
 	@Override
diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java
index 91867ef2..f48b4638 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/rest/BulkProcessConsumer.java
@@ -24,7 +24,7 @@ import javax.ws.rs.Path;
 
 import org.openecomp.aai.restcore.HttpMethod;
 
-@Path("{version: v[2789]|v1[0]}/bulkprocess")
+@Path("{version: v[2789]|v1[01]}/bulkprocess")
 public class BulkProcessConsumer extends BulkConsumer {
 
 	@Override
diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java
index de59955d..3084abc2 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/rest/ExampleConsumer.java
@@ -46,7 +46,7 @@ import org.openecomp.aai.restcore.RESTAPI;
 /**
  * The Class ExampleConsumer.
  */
-@Path("/{version: v[2789]|v1[0]}/examples")
+@Path("/{version: v[2789]|v1[01]}/examples")
 public class ExampleConsumer extends RESTAPI {
 
 	
diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java
index 27a082ee..70b8c923 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/rest/LegacyMoxyConsumer.java
@@ -74,7 +74,7 @@ import com.thinkaurelius.titan.core.TitanTransaction;
 /**
  * The Class LegacyMoxyConsumer.
  */
-@Path("{version: v[2789]|v1[0]}")
+@Path("{version: v[2789]|v1[01]}")
 public class LegacyMoxyConsumer extends RESTAPI {
 	
 	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(LegacyMoxyConsumer.class.getName());
diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java
index d67a0089..c3183d74 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/rest/URLFromVertexIdConsumer.java
@@ -54,7 +54,7 @@ import org.openecomp.aai.workarounds.LegacyURITransformer;
 /**
  * The Class URLFromVertexIdConsumer.
  */
-@Path("{version: v[2789]|v1[0]}/generateurl")
+@Path("{version: v[2789]|v1[01]}/generateurl")
 public class URLFromVertexIdConsumer extends RESTAPI {
 	private ModelType introspectorFactoryType = ModelType.MOXY;
 	private QueryStyle queryStyle = QueryStyle.TRAVERSAL;
diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java b/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java
index 9e1dcfc6..f0de3f0a 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/rest/VertexIdConsumer.java
@@ -63,7 +63,7 @@ import org.openecomp.aai.serialization.engines.TransactionalGraphEngine;
 /**
  * The Class VertexIdConsumer.
  */
-@Path("{version: v[2789]|v1[0]}/resources")
+@Path("{version: v[2789]|v1[01]}/resources")
 public class VertexIdConsumer extends RESTAPI {
 	
 	private ModelType introspectorFactoryType = ModelType.MOXY;
diff --git a/aai-resources/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java b/aai-resources/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java
index 8cb16e1c..fdba3081 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/rest/ueb/UEBNotification.java
@@ -60,7 +60,7 @@ public class UEBNotification {
 	public UEBNotification(Loader loader) {
 		events = new ArrayList<>();
 		currentVersionLoader = LoaderFactory.createLoaderForVersion(loader.getModelType(), AAIProperties.LATEST);
-		notificationVersion = Version.valueOf(AAIConfig.get("aai.notification.current.version","v10"));
+		notificationVersion = Version.valueOf(AAIConfig.get("aai.notification.current.version","v11"));
 	}