From 66384fab722a35403c8510f25b30f9b9c9ad9a0b Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Sun, 10 Sep 2017 20:12:40 -0700 Subject: Correcting problems related to ccsdk,new odl Some imports and dependencies needed to be updated which no longer exist in the new ODl version Change-Id: I57c52b73810d3f9770b764a2afe4147d3120a87b Signed-off-by: Patrick Brady Issue-id: APPC-91 Issue-id: APPC-158 --- .../appc-chef-adapter/appc-chef-adapter-bundle/pom.xml | 2 +- .../appc/dg/common/impl/IntermediateMessageSenderImpl.java | 2 +- .../org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java | 2 +- .../openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java | 2 +- appc-event-listener/appc-event-listener-bundle/pom.xml | 2 +- pom.xml | 13 ++++++++++++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index 7742c5cb7..4ebbb8dbe 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -224,7 +224,7 @@ org.openecomp.appc.adapter.chef.ChefActivator org.openecomp.appc.adapter.chef - org.onap.ccsdk.sli.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* + org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java index 6741f0d8e..b297abc06 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/IntermediateMessageSenderImpl.java @@ -29,7 +29,7 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openecomp.appc.adapter.message.MessageAdapterFactory; import org.openecomp.appc.adapter.message.Producer; import org.openecomp.appc.configuration.Configuration; diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java index 68cc2d645..47c33ca0b 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/JsonDgUtilImpl.java @@ -29,7 +29,7 @@ import java.text.SimpleDateFormat; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.openecomp.appc.dg.common.JsonDgUtil; import org.openecomp.appc.exceptions.APPCException; diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java index 2a90da749..e37cd047d 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/openecomp/appc/dg/common/impl/VNFConfiguratorImpl.java @@ -34,7 +34,7 @@ import org.openecomp.appc.mdsal.objects.BundleInfo; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/appc-event-listener/appc-event-listener-bundle/pom.xml b/appc-event-listener/appc-event-listener-bundle/pom.xml index fd14847be..31f669a32 100644 --- a/appc-event-listener/appc-event-listener-bundle/pom.xml +++ b/appc-event-listener/appc-event-listener-bundle/pom.xml @@ -114,7 +114,7 @@ *;resolution:=optional - jasypt,commons-lang,commons-lang3,appc-common, + httpclient,httpcore,jasypt,commons-lang,commons-lang3,appc-common, logback-core,logback-classic,eelf-core,commons-logging;scope=compile|runtime;inline=false true diff --git a/pom.xml b/pom.xml index 117229c3e..57d875319 100644 --- a/pom.xml +++ b/pom.xml @@ -489,7 +489,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. - + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${onap.nexus.url} + 176c31dfe190a + ecomp-staging + + org.apache.maven.plugins -- cgit 1.2.3-korg