Several more properties changes

Needed to support transition away from sdnc root pom.

Change-Id: I9cc410d32afbe17d8060e4ed2353a3a3e0c1628d
Signed-off-by: Patrick Brady <pb071s@att.com>

diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
index 75610fd..6d60058 100644 (file)
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml
@@ -27,6 +27,7 @@
                                        <instructions>
                                                <Export-Package>org.openecomp.appc.adapter.ssh</Export-Package>
                                                <Embed-Dependency>!dblib-provider</Embed-Dependency>
+                        <Import-Package>!org.slf4j.impl</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
index 36cabf9..35bb0cf 100644 (file)
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml
@@ -51,7 +51,7 @@
                                        <instructions>
                                                <Export-Service>org.openecomp.appc.adapter.ssh.SshAdapter</Export-Service>
                                                <Private-Package>org.openecomp.appc.adapter.ssh.impl.*</Private-Package>
-                                               <Import-Package>!org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*</Import-Package>
+                                               <Import-Package>!org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*;resolution:=optional</Import-Package>
                                                <Embed-Dependency>!dblib-provider,appc-common,jasypt,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>
                                        </instructions>

diff --git a/pom.xml b/pom.xml
index 9d76e91..e75e1f3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
                <odl.yangtools.version>1.0.1-Boron-SR1</odl.yangtools.version>
                <odl.mdsal.version>1.4.1-Boron-SR1</odl.mdsal.version>
                <odl.mdsal.features.version>2.1.1-Boron-SR1</odl.mdsal.features.version>
-                <odl.controller.mdsal.features.version>1.4.1-Boron-SR1</odl.controller.mdsal.features.version>
+        <odl.controller.mdsal.features.version>1.4.1-Boron-SR1</odl.controller.mdsal.features.version>
                <odl.mdsal.model.version>0.9.1-Boron-SR1</odl.mdsal.model.version>
                <odl.mdsal.yang.binding.version>0.9.1-Boron-SR1</odl.mdsal.yang.binding.version>
                <odl.restconf.version>1.4.1-Boron-SR1</odl.restconf.version>
@@ -46,6 +46,7 @@
                <odl.yang.jmx.generator.version>0.5.1-Boron-SR1</odl.yang.jmx.generator.version>
                <odl.yangtools.yang.maven.plugin.version>${odl.yangtools.version}</odl.yangtools.yang.maven.plugin.version>
                <odl.sal.api.gen.plugin.version>0.9.1-Boron-SR1</odl.sal.api.gen.plugin.version>
+        <broker-mdsal.version>1.4.1-Boron-SR1</broker-mdsal.version>
 
         <!-- OPENECOMP SDNC versions -->
         <sdnctl.sli.version>1.1.0-SNAPSHOT</sdnctl.sli.version>