From b692bc3615f276b58c08f3891d0543718d5398d8 Mon Sep 17 00:00:00 2001 From: mojahidi Date: Tue, 12 Sep 2017 17:49:10 +0530 Subject: [PATCH] Removed TOSCA_CSAR and upgrade sdc version removed TOSCA_CSAR from ArtifactfactProcessorFactory to stop listening tosca_csar artifacts upgrade the sdc client version compatible for 1710 release Change-Id: Id6db5831a1f625fd8fc040bfd50c6662486730f4 Issue-ID:APPC-203 Signed-off-by: mojahidi --- .../openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java | 3 --- .../src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java | 5 +++++ pom.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java index 3ad88b4b9..7dbd191ca 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java +++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java @@ -76,9 +76,6 @@ public class ArtifactProcessorFactory { artifactProcessor = new LicenseArtifactProcessor(client,eventSender,notification,resource, artifact,storeUri); break; - case TOSCA_CSAR: - artifactProcessor = new ToscaCsarArtifactProcessor(client,eventSender,notification,resource, - artifact,storeUri); default: break; } diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java index 9c14d6756..17d2eb74b 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java +++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java @@ -176,6 +176,11 @@ public class SdcConfig implements IConfiguration { return user; } + @Override + public Boolean isUseHttpsWithDmaap(){ + return true; + } + URI getStoreOpURI() { return storeOp; } diff --git a/pom.xml b/pom.xml index 4cb12721b..94797afb7 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.5.1 1.1.1 1.1.0 - 1.1.13-SNAPSHOT + 1.1.32-SNAPSHOT 2.3.2 -- 2.16.6