Dependency version updates for Beijing

Update so/libs version to 1.2.1

Update aai-common version to 1.2.1

Update sdc-distribution-client version to 1.3.0

Update sdc-tosca version to 1.3.3

Change-Id: I6c8f1c5476efc4dc866bf765c265736ab70c12c7
Issue-ID: SO-536
Signed-off-by: Rob Daugherty <rd472p@att.com>

8 files changed, 39 insertions, 40 deletions

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java
index 29144a9884..b6e130820a 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java
@@ -26,9 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IResourceInstance;
 import org.openecomp.mso.asdc.client.ASDCConfiguration;
 
 /**
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/IArtifactOrchestrator.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/IArtifactOrchestrator.java
index 6f70b1ae87..60519f226d 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/IArtifactOrchestrator.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/IArtifactOrchestrator.java
@@ -22,10 +22,10 @@ package org.openecomp.mso.asdc.installer;
 
 
 
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
 import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
 
 public interface IArtifactOrchestrator {
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java
index 98b6b6d539..941787efe4 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java
@@ -27,24 +27,24 @@ import java.io.IOException;
 

 import java.util.List;

 

-import org.openecomp.sdc.api.notification.IArtifactInfo;

-import org.openecomp.sdc.api.notification.INotificationData;

+import org.onap.sdc.api.notification.IArtifactInfo;

+import org.onap.sdc.api.notification.INotificationData;

 //import org.openecomp.generic.tosca.parser.model.Metadata;

-//import org.openecomp.sdc.tosca.parser.factory.SdcCsarHelperFactory;

-//import org.openecomp.sdc.tosca.parser.factory.SdcCsarHelperFactory;

+//import org.onap.sdc.tosca.parser.factory.SdcCsarHelperFactory;

+//import org.onap.sdc.tosca.parser.factory.SdcCsarHelperFactory;

 ///import org.openecomp.generic.tosca.parser.model.Metadata;

-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;

-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;

-import org.openecomp.sdc.tosca.parser.impl.SdcCsarHelperImpl;

-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;

+import org.onap.sdc.api.results.IDistributionClientDownloadResult;

+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;

+import org.onap.sdc.tosca.parser.impl.SdcCsarHelperImpl;

+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;

 

 

-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;

+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;

 

 

 

-import org.openecomp.sdc.toscaparser.api.NodeTemplate;

-import org.openecomp.sdc.toscaparser.api.elements.Metadata;

+import org.onap.sdc.toscaparser.api.NodeTemplate;

+import org.onap.sdc.toscaparser.api.elements.Metadata;

 import org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException;

 import org.openecomp.mso.db.catalog.beans.AllottedResource;

 import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleArtifact.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleArtifact.java
index 84b6c24841..c1f836904d 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleArtifact.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleArtifact.java
@@ -23,8 +23,8 @@ package org.openecomp.mso.asdc.installer;
 
 import java.io.UnsupportedEncodingException;
 
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
 
 /**
  * The structure that contains the artifactInfo and its associated DownloadedResult. 
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java
index c9bde98da8..2986a80b1f 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
 import org.openecomp.mso.asdc.client.ASDCConfiguration;
 import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
 import org.openecomp.mso.db.catalog.beans.VfModule;
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java
index fb4dcaff29..10e936060d 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java
@@ -37,11 +37,11 @@ import org.openecomp.mso.db.catalog.beans.ServiceToAllottedResources;
 import org.openecomp.mso.db.catalog.beans.ServiceToNetworks;
 import org.openecomp.mso.db.catalog.beans.VnfResource;
 import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
 import org.openecomp.mso.logger.MessageEnum;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
index 2817aad412..fc4e522877 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
@@ -38,20 +38,20 @@ import java.util.Comparator;
 

 import org.hibernate.exception.ConstraintViolationException;

 import org.hibernate.exception.LockAcquisitionException;

-import org.openecomp.sdc.api.consumer.IComponentDoneStatusMessage;

+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;

 //import org.openecomp.generic.tosca.parser.model.Metadata;

 //import org.openecomp.generic.tosca.parser.model.NodeTemplate;

-import org.openecomp.sdc.api.notification.IArtifactInfo;

-import org.openecomp.sdc.api.notification.IStatusData;

-import org.openecomp.sdc.api.notification.IVfModuleMetadata;

-import org.openecomp.sdc.api.results.IDistributionClientResult;

-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;

-import org.openecomp.sdc.toscaparser.api.Group;

-import org.openecomp.sdc.toscaparser.api.NodeTemplate;

-import org.openecomp.sdc.toscaparser.api.Property;

-import org.openecomp.sdc.toscaparser.api.elements.Metadata;

-import org.openecomp.sdc.toscaparser.api.parameters.Input;

-import org.openecomp.sdc.utils.DistributionStatusEnum;

+import org.onap.sdc.api.notification.IArtifactInfo;

+import org.onap.sdc.api.notification.IStatusData;

+import org.onap.sdc.api.notification.IVfModuleMetadata;

+import org.onap.sdc.api.results.IDistributionClientResult;

+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;

+import org.onap.sdc.toscaparser.api.Group;

+import org.onap.sdc.toscaparser.api.NodeTemplate;

+import org.onap.sdc.toscaparser.api.Property;

+import org.onap.sdc.toscaparser.api.elements.Metadata;

+import org.onap.sdc.toscaparser.api.parameters.Input;

+import org.onap.sdc.utils.DistributionStatusEnum;

 import org.openecomp.mso.asdc.client.ASDCConfiguration;

 import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;

 import org.openecomp.mso.asdc.installer.ASDCElementInfo;

@@ -496,7 +496,7 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
 					catalogDB.saveServiceToResourceCustomization(toscaResourceStruct.getCatalogVfServiceToResourceCustomization());

 

 

-						List<org.openecomp.sdc.toscaparser.api.Group> vfGroups = toscaResourceStruct.getSdcCsarHelper().getVfModulesByVf(vfCustomizationUUID);

+						List<org.onap.sdc.toscaparser.api.Group> vfGroups = toscaResourceStruct.getSdcCsarHelper().getVfModulesByVf(vfCustomizationUUID);

 						logger.debug("vfGroups:" + vfGroups.toString());

 						

 						vfGroups.sort((group1, group2) -> {

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
index 0ae58dad41..d227961664 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
@@ -31,7 +31,7 @@ import java.util.Set;
 
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.exception.LockAcquisitionException;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
 
 import org.openecomp.mso.asdc.client.ASDCConfiguration;
 import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;