diff options
| -rwxr-xr-x | appc-inbound/appc-artifact-handler/model/pom.xml | 107 | ||||
| -rwxr-xr-x | appc-inbound/appc-artifact-handler/provider/pom.xml | 8 |
2 files changed, 31 insertions, 84 deletions
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 @@ <configuration> <instructions> <Import-Package>!com.google.common.collect,*</Import-Package> - <Embed-Dependency>*</Embed-Dependency> + <Embed-Dependency>guava</Embed-Dependency> </instructions> </configuration> </plugin> @@ -77,86 +77,27 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <executions> - <execution> - <configuration> - <executable>python</executable> - <arguments> - <argument>scripts/python/yang2props.py</argument> - <argument>src/main/yang/artifact-handler.yang</argument> - <argument>target/artifact-handler.properties</argument> - </arguments> - </configuration> - <id>generation</id> - <phase>generate-resources</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <goals> - <goal>attach-artifact</goal> - </goals> - <phase>package</phase> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/artifact-handler.properties</file> - <type>properties</type> - <classifier>artifact-handler</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> + <executions> + <execution> + <id>yang</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.basedir}/src/main/yang/artifact-handler.yang</file> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>yang</packaging> + </configuration> + </execution> + </executions> + </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - exec-maven-plugin - </artifactId> - <versionRange> - [1.2.1,) - </versionRange> - <goals> - <goal>exec</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> <dependencies> <dependency> @@ -170,12 +111,14 @@ <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-inet-types</artifactId> - <version>${odl.ietf-inet-types.version}</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-yang-types</artifactId> - <version>${odl.ietf-yang-types.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> </dependencies> </project> 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. <Bundle-Activator>org.onap.appc.artifact.handler.SdcArtifactHandlerActivator</Bundle-Activator> <Export-Package>org.onap.appc.artifact.handler,org.opendaylight.controller.config.yang.config.artifact-handler_provider.impl</Export-Package> <Import-Package>!com.google,!org.apache.commons.configuration,*;resolution:=optional</Import-Package> - <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency> - <DynamicImport-Package>*</DynamicImport-Package> + <Embed-Dependency>commons-configuration,guava,jackson-databind,jackson-annotations,jackson-core,jackson-dataformat-yaml,snakeyaml</Embed-Dependency> </instructions> <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation> </configuration> @@ -121,6 +120,7 @@ limitations under the License. <dependency> <groupId>org.onap.appc</groupId> <artifactId>appc-artifact-handler-model</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> @@ -141,6 +141,10 @@ limitations under the License. <artifactId>sal-binding-api</artifactId> </dependency> <dependency> + <groupId>org.opendaylight.mdsal</groupId> + <artifactId>yang-binding</artifactId> + </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-common-util</artifactId> </dependency> |