From be72a3cd156210d0e3f8fe3a0cd16993b32c248f Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 15 Jun 2018 18:25:23 -0400 Subject: Update sli/adaptors to ODL Oxygen Update sli/adaptors to compile against ODL Oxygen parent poms. Change-Id: I112c5aa56dd985ad0e7e361d3839ec7069e5641c Issue-ID: CCSDK-281 Signed-off-by: Timoney, Dan (dt5972) --- ansible-adapter/ansible-adapter-bundle/pom.xml | 229 +++++++++++---------- .../ccsdk-ansible-adapter/pom.xml | 31 +-- 2 files changed, 134 insertions(+), 126 deletions(-) (limited to 'ansible-adapter') diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml index 497a35f09..cac2b98fa 100644 --- a/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -1,118 +1,119 @@ - - - 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.1.0-SNAPSHOT - - - - org.onap.ccsdk.sli.adaptors - ansible-adapter-bundle - 0.3.0-SNAPSHOT - bundle - ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} - - - - com.att.eelf - eelf-core - - - commons-codec - commons-codec - - - commons-logging - commons-logging - 1.2 - - - - org.apache.httpcomponents - httpclient - ${apache.httpcomponents.client.version} - - - - - - org.glassfish.jersey.core - jersey-common - 2.9.1 - test - - - - org.codehaus.jackson - jackson-jaxrs - 1.9.13 - test - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.onap.ccsdk.sli.core - sli-common - - - - org.onap.ccsdk.sli.core - sli-provider - - - - equinoxSDK381 - org.eclipse.osgi - - - - org.slf4j - slf4j-api - - - - org.slf4j - jcl-over-slf4j - - - - org.json - json - - - - - com.google.guava - guava - - - - + + + 4.0.0 + + org.onap.ccsdk.parent + binding-parent + 1.1.0-SNAPSHOT + + + + org.onap.ccsdk.sli.adaptors + ansible-adapter-bundle + 0.3.0-SNAPSHOT + bundle + ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} + + + + com.att.eelf + eelf-core + + + commons-codec + commons-codec + + + commons-logging + commons-logging + 1.2 + + + + org.apache.httpcomponents + httpclient + ${apache.httpcomponents.client.version} + + + + + + org.glassfish.jersey.core + jersey-common + 2.9.1 + test + + + + org.codehaus.jackson + jackson-jaxrs + 1.9.13 + test + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.onap.ccsdk.sli.core + sli-common + + + + org.onap.ccsdk.sli.core + sli-provider + + + + org.osgi + org.osgi.core + provided + + + org.slf4j + slf4j-api + + + + org.slf4j + jcl-over-slf4j + + + + org.json + json + + + + + com.google.guava + guava + + + + diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml index 232616c8b..5c6748025 100644 --- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml +++ b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml @@ -15,14 +15,25 @@ feature ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId} - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.mdsal.version} + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${odl.mdsal.model.version} + pom + import + + + - - org.opendaylight.controller - odl-mdsal-broker - xml - features - org.onap.ccsdk.sli.core @@ -37,10 +48,6 @@ ${project.version} - - equinoxSDK381 - org.eclipse.osgi - provided - + -- cgit 1.2.3-korg