Mod aaa-12 保证feature-huawei-driver能独立于驱动适配层卸载。
RCA： SOL： 修改人：dongxiancun 检视人：dongxiancun
This commit is contained in:
dongxiancun
parent
15fc6d20bf
commit
9218f99166
|
|
@ -44,6 +44,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
|
|||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>adaptation-layer</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
Copyright © 2019 CMCC Corporation and others. All rights reserved.
|
||||
|
||||
This program and the accompanying materials are made available under the
|
||||
terms of the Eclipse Public License v1.0 which accompanies this distribution,
|
||||
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.opendaylight.odlparent</groupId>
|
||||
<artifactId>single-feature-parent</artifactId>
|
||||
<version>3.1.4</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<groupId>com.cmcc.cmhi</groupId>
|
||||
<artifactId>feature-adaptation-layer</artifactId>
|
||||
<version>0.1.0</version>
|
||||
<packaging>feature</packaging>
|
||||
|
||||
<name>CMCC :: CMHI :: AdaptationLayer</name>
|
||||
|
||||
<properties>
|
||||
<controller.mdsal.version>1.7.4</controller.mdsal.version>
|
||||
<mdsal.version>2.4.4</mdsal.version>
|
||||
<mdsal.model.version>0.12.4</mdsal.model.version>
|
||||
<restconf.version>1.7.4</restconf.version>
|
||||
<yangtools.version>2.0.6.5</yangtools.version>
|
||||
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>restconf-artifacts</artifactId>
|
||||
<version>${restconf.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>sal-rest-docgen</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.yangtools</groupId>
|
||||
<artifactId>features-yangtools</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${yangtools.version}</version>
|
||||
<type>xml</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.controller</groupId>
|
||||
<artifactId>features-mdsal</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${controller.mdsal.version}</version>
|
||||
<type>xml</type>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>features-restconf</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<type>xml</type>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.cmcc.cmhi</groupId>
|
||||
<artifactId>adaptation-layer</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -26,6 +26,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
|
|||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>feature-adaptation-layer</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>xml</type>
|
||||
<classifier>features</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>feature-huawei-driver</artifactId>
|
||||
|
|
|
|||
|
|
@ -1,161 +1,127 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
Copyright © 2019 CMCC Corporation and others. All rights reserved.
|
||||
<!-- Copyright © 2019 CMCC Corporation and others. All rights reserved. This
|
||||
program and the accompanying materials are made available under the terms
|
||||
of the Eclipse Public License v1.0 which accompanies this distribution, and
|
||||
is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
|
||||
This program and the accompanying materials are made available under the
|
||||
terms of the Eclipse Public License v1.0 which accompanies this distribution,
|
||||
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.opendaylight.odlparent</groupId>
|
||||
<artifactId>single-feature-parent</artifactId>
|
||||
<version>3.1.4</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
<parent>
|
||||
<groupId>org.opendaylight.odlparent</groupId>
|
||||
<artifactId>single-feature-parent</artifactId>
|
||||
<version>3.1.4</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
<groupId>com.cmcc.cmhi</groupId>
|
||||
<artifactId>feature-huawei-driver</artifactId>
|
||||
<version>0.1.0</version>
|
||||
<packaging>feature</packaging>
|
||||
|
||||
<groupId>com.cmcc.cmhi</groupId>
|
||||
<artifactId>feature-huawei-driver</artifactId>
|
||||
<version>0.1.0</version>
|
||||
<packaging>feature</packaging>
|
||||
<name>CMCC :: CMHI :: HuaweiDriver</name>
|
||||
|
||||
<name>CMCC :: CMHI :: HuaweiDriver</name>
|
||||
<properties>
|
||||
<controller.mdsal.version>1.7.4</controller.mdsal.version>
|
||||
<mdsal.version>2.4.4</mdsal.version>
|
||||
<mdsal.model.version>0.12.4</mdsal.model.version>
|
||||
<netconf.version>1.4.4</netconf.version>
|
||||
<restconf.version>1.7.4</restconf.version>
|
||||
<yangtools.version>2.0.6.5</yangtools.version>
|
||||
<dlux.version>0.7.4</dlux.version>
|
||||
<dluxapps.version>0.7.4</dluxapps.version>
|
||||
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
|
||||
</properties>
|
||||
|
||||
<properties>
|
||||
<controller.mdsal.version>1.7.4</controller.mdsal.version>
|
||||
<mdsal.version>2.4.4</mdsal.version>
|
||||
<mdsal.model.version>0.12.4</mdsal.model.version>
|
||||
<netconf.version>1.4.4</netconf.version>
|
||||
<restconf.version>1.7.4</restconf.version>
|
||||
<yangtools.version>2.0.6.5</yangtools.version>
|
||||
<dlux.version>0.7.4</dlux.version>
|
||||
<dluxapps.version>0.7.4</dluxapps.version>
|
||||
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>netconf-artifacts</artifactId>
|
||||
<version>${netconf.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>restconf-artifacts</artifactId>
|
||||
<version>${restconf.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>netconf-artifacts</artifactId>
|
||||
<version>${netconf.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>restconf-artifacts</artifactId>
|
||||
<version>${restconf.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>sal-rest-docgen</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.yangtools</groupId>
|
||||
<artifactId>features-yangtools</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${yangtools.version}</version>
|
||||
<type>xml</type>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.controller</groupId>
|
||||
<artifactId>features-mdsal</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${controller.mdsal.version}</version>
|
||||
<type>xml</type>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>features-restconf</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<type>xml</type>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>sal-rest-docgen</artifactId>
|
||||
<version>${restconf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.yangtools</groupId>
|
||||
<artifactId>features-yangtools</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${yangtools.version}</version>
|
||||
<type>xml</type>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>features-netconf-connector</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<type>xml</type>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>features-netconf</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<type>xml</type>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<!-- <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>odl-config-netconf-connector</artifactId>
|
||||
<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier>
|
||||
</dependency> -->
|
||||
<!-- Netconf will not provide schemas without monitoring -->
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.controller</groupId>
|
||||
<artifactId>config-manager-facade-xml</artifactId>
|
||||
<version>0.8.4</version>
|
||||
</dependency>
|
||||
<!-- <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>odl-netconf-monitoring</artifactId>
|
||||
<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier>
|
||||
</dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>odl-netconf-console</artifactId>
|
||||
<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier>
|
||||
</dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>odl-netconf-topology</artifactId>
|
||||
<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier>
|
||||
</dependency> -->
|
||||
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.controller</groupId>
|
||||
<artifactId>features-mdsal</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${controller.mdsal.version}</version>
|
||||
<type>xml</type>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>features-restconf</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${restconf.version}</version>
|
||||
<type>xml</type>
|
||||
<!-- 在karaf中打包 <dependency> <groupId>org.opendaylight.dluxapps</groupId>
|
||||
<artifactId>features-dluxapps</artifactId> <version>${dlux.version}</version>
|
||||
<classifier>features</classifier> <type>xml</type> </dependency> -->
|
||||
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>features-netconf-connector</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${netconf.version}</version>
|
||||
<type>xml</type>
|
||||
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>features-netconf</artifactId>
|
||||
<classifier>features</classifier>
|
||||
<version>${netconf.version}</version>
|
||||
<type>xml</type>
|
||||
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>odl-config-netconf-connector</artifactId>
|
||||
<version>${netconf.version}</version>
|
||||
<type>xml</type>
|
||||
<classifier>features</classifier>
|
||||
</dependency>
|
||||
-->
|
||||
<!-- Netconf will not provide schemas without monitoring -->
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.controller</groupId>
|
||||
<artifactId>config-manager-facade-xml</artifactId>
|
||||
<version>0.8.4</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.netconf</groupId>
|
||||
<artifactId>odl-netconf-monitoring</artifactId>
|
||||
<version>${netconf.version}</version>
|
||||
<type>xml</type>
|
||||
<classifier>features</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>odl-netconf-console</artifactId>
|
||||
<version>${netconf.version}</version>
|
||||
<type>xml</type>
|
||||
<classifier>features</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>odl-netconf-topology</artifactId>
|
||||
<version>${netconf.version}</version>
|
||||
<type>xml</type>
|
||||
<classifier>features</classifier>
|
||||
</dependency>
|
||||
-->
|
||||
|
||||
<!-- 在karaf中打包
|
||||
<dependency>
|
||||
<groupId>org.opendaylight.dluxapps</groupId>
|
||||
<artifactId>features-dluxapps</artifactId>
|
||||
<version>${dlux.version}</version>
|
||||
<classifier>features</classifier>
|
||||
<type>xml</type>
|
||||
</dependency>
|
||||
-->
|
||||
|
||||
<dependency>
|
||||
<groupId>com.cmcc.cmhi</groupId>
|
||||
<artifactId>huawei-driver</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<dependency>
|
||||
<groupId>com.cmcc.cmhi</groupId>
|
||||
<artifactId>huawei-driver</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
|
|||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>huawei-driver</module>
|
||||
<module>features-driver-all</module>
|
||||
<module>feature-adaptation-layer</module>
|
||||
<module>huawei-driver</module>
|
||||
</modules>
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue