From 226725a03a77f69880fdc589f088fce71acd5882 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Fri, 11 May 2018 09:06:09 -0700 Subject: Changes to fix artifact handler Change-Id: I49d6210898eb974401099ab73b2dd7f16e81229c Signed-off-by: Patrick Brady Issue-ID: APPC-891 --- appc-inbound/appc-artifact-handler/model/pom.xml | 107 +++++---------------- .../appc-artifact-handler/provider/pom.xml | 8 +- 2 files changed, 31 insertions(+), 84 deletions(-) (limited to 'appc-inbound') diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml index 40b3ada28..41101e21d 100755 --- a/appc-inbound/appc-artifact-handler/model/pom.xml +++ b/appc-inbound/appc-artifact-handler/model/pom.xml @@ -41,7 +41,7 @@ !com.google.common.collect,* - * + guava @@ -77,86 +77,27 @@ - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - python - - scripts/python/yang2props.py - src/main/yang/artifact-handler.yang - target/artifact-handler.properties - - - generation - generate-resources - - exec - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/artifact-handler.properties - properties - artifact-handler - - - - - - + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + + yang + initialize + + install-file + + + ${project.basedir}/src/main/yang/artifact-handler.yang + ${project.groupId} + ${project.artifactId} + ${project.version} + yang + + + + - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - exec-maven-plugin - - - [1.2.1,) - - - exec - - - - - - - - - - - - @@ -170,12 +111,14 @@ org.opendaylight.mdsal.model ietf-inet-types - ${odl.ietf-inet-types.version} org.opendaylight.mdsal.model ietf-yang-types - ${odl.ietf-yang-types.version} + + + com.google.guava + guava diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml index 6ac7f1bf5..b4b2f7c62 100755 --- a/appc-inbound/appc-artifact-handler/provider/pom.xml +++ b/appc-inbound/appc-artifact-handler/provider/pom.xml @@ -44,8 +44,7 @@ limitations under the License. org.onap.appc.artifact.handler.SdcArtifactHandlerActivator org.onap.appc.artifact.handler,org.opendaylight.controller.config.yang.config.artifact-handler_provider.impl !com.google,!org.apache.commons.configuration,*;resolution:=optional - *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis - * + commons-configuration,guava,jackson-databind,jackson-annotations,jackson-core,jackson-dataformat-yaml,snakeyaml ${project.basedir}/src/main/resources/META-INF @@ -121,6 +120,7 @@ limitations under the License. org.onap.appc appc-artifact-handler-model + ${project.version} org.opendaylight.controller @@ -140,6 +140,10 @@ limitations under the License. org.opendaylight.controller sal-binding-api + + org.opendaylight.mdsal + yang-binding + org.opendaylight.controller sal-common-util -- cgit 1.2.3-korg