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 <pb071s@att.com>
Issue-id: APPC-91
Issue-id: APPC-158

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 7742c5c..4ebbb8d 100644 (file)
--- 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 @@
                         <Bundle-Activator>org.openecomp.appc.adapter.chef.ChefActivator</Bundle-Activator>
                         <Export-Package>org.openecomp.appc.adapter.chef</Export-Package>
                         <Import-Package>
-                            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.*
                         </Import-Package>
                         <Embed-Dependency>
                             *;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 6741f0d..b297abc 100644 (file)
--- 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 68cc2d6..47c33ca 100644 (file)
--- 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 2a90da7..e37cd04 100644 (file)
--- 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 fd14847..31f669a 100644 (file)
--- 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
                                                </Import-Package>
                                                <Embed-Dependency>
-                                                       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
                                                </Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>

diff --git a/pom.xml b/pom.xml
index 117229c..57d8753 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -489,7 +489,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             </plugins>
         </pluginManagement>
         <plugins>
-  
+            <!--maven staging plugin --> 
+            <plugin> 
+                <groupId>org.sonatype.plugins</groupId> 
+                <artifactId>nexus-staging-maven-plugin</artifactId> 
+                <version>1.6.7</version> 
+                <extensions>true</extensions> 
+                <configuration> 
+                    <nexusUrl>${onap.nexus.url}</nexusUrl> 
+                    <stagingProfileId>176c31dfe190a</stagingProfileId> 
+                    <serverId>ecomp-staging</serverId> 
+                </configuration> 
+            </plugin> 
             <!-- Javadocs Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>