Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
move vpnservice and cleanup poms
[netvirt.git]
/
features
/
odl-netvirt-impl
/
pom.xml
diff --git
a/vpnservice/features/odl-netvirt-impl/pom.xml
b/features/odl-netvirt-impl/pom.xml
similarity index 97%
rename from
vpnservice/features/odl-netvirt-impl/pom.xml
rename to
features/odl-netvirt-impl/pom.xml
index 38540ba559f56a428b1b60b10f3d7942c6465efa..c89f5fb3dda1cddcee4a7967a9a918003b08807e 100644
(file)
--- a/
vpnservice/features/odl-netvirt-impl/pom.xml
+++ b/
features/odl-netvirt-impl/pom.xml
@@
-6,10
+6,8
@@
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
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>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
@@
-21,9
+19,9
@@
<groupId>org.opendaylight.netvirt</groupId>
<artifactId>odl-netvirt-impl</artifactId>
<version>0.6.0-SNAPSHOT</version>
<groupId>org.opendaylight.netvirt</groupId>
<artifactId>odl-netvirt-impl</artifactId>
<version>0.6.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
<name>OpenDaylight :: NetVirt :: impl</name>
<name>OpenDaylight :: NetVirt :: impl</name>
+ <packaging>feature</packaging>
+ <modelVersion>4.0.0</modelVersion>
<dependencies>
<dependency>
<dependencies>
<dependency>
@@
-34,37
+32,37
@@
<classifier>features</classifier>
</dependency>
<dependency>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.
neutron
</groupId>
- <artifactId>odl-
neutron-spi
</artifactId>
- <version>0.
10
.0-SNAPSHOT</version>
+ <groupId>org.opendaylight.
genius
</groupId>
+ <artifactId>odl-
genius
</artifactId>
+ <version>0.
4
.0-SNAPSHOT</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.
ovsdb
</groupId>
- <artifactId>odl-
ovsdb-southbound-impl
</artifactId>
- <version>1.
6
.0-SNAPSHOT</version>
+ <groupId>org.opendaylight.
infrautils
</groupId>
+ <artifactId>odl-
infrautils-inject
</artifactId>
+ <version>1.
3
.0-SNAPSHOT</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.
ovsdb
</groupId>
- <artifactId>odl-
ovsdb-hwvtepsouthbound
</artifactId>
- <version>1.
6
.0-SNAPSHOT</version>
+ <groupId>org.opendaylight.
infrautils
</groupId>
+ <artifactId>odl-
infrautils-diagstatus
</artifactId>
+ <version>1.
3
.0-SNAPSHOT</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>
org.opendaylight.ovsdb
</groupId>
- <artifactId>odl-
ovsdb-utils
</artifactId>
- <version>
1.6.0-SNAPSHOT
</version>
+ <groupId>
${project.groupId}
</groupId>
+ <artifactId>odl-
netvirt-api
</artifactId>
+ <version>
${project.version}
</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>
${project.groupId}
</groupId>
- <artifactId>odl-ne
tvirt-a
pi</artifactId>
- <version>
${project.version}
</version>
+ <groupId>
org.opendaylight.neutron
</groupId>
+ <artifactId>odl-ne
utron-s
pi</artifactId>
+ <version>
0.10.0-SNAPSHOT
</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
@@
-83,76
+81,76
@@
<classifier>features</classifier>
</dependency>
<dependency>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.
genius
</groupId>
- <artifactId>odl-
genius
</artifactId>
- <version>
0.4
.0-SNAPSHOT</version>
+ <groupId>org.opendaylight.
ovsdb
</groupId>
+ <artifactId>odl-
ovsdb-southbound-impl
</artifactId>
+ <version>
1.6
.0-SNAPSHOT</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.
infrautils
</groupId>
- <artifactId>odl-
infrautils-inject
</artifactId>
- <version>1.
3
.0-SNAPSHOT</version>
+ <groupId>org.opendaylight.
ovsdb
</groupId>
+ <artifactId>odl-
ovsdb-hwvtepsouthbound
</artifactId>
+ <version>1.
6
.0-SNAPSHOT</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.
infrautils
</groupId>
- <artifactId>odl-
infrautils-diagstatu
s</artifactId>
- <version>1.
3
.0-SNAPSHOT</version>
+ <groupId>org.opendaylight.
ovsdb
</groupId>
+ <artifactId>odl-
ovsdb-util
s</artifactId>
+ <version>1.
6
.0-SNAPSHOT</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
bgpmanager
-impl</artifactId>
+ <artifactId>
aclservice
-impl</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <!-- This needs to be wrapped, see feature.xml -->
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
vpnmanager-imp
l</artifactId>
+ <artifactId>
aclservice-shel
l</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
vpnmanager-shel
l</artifactId>
+ <artifactId>
bgpmanager-imp
l</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- This needs to be wrapped, see feature.xml -->
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
fibmanager
-impl</artifactId>
+ <artifactId>
cache
-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
fibmanager-shel
l</artifactId>
+ <artifactId>
cloud-servicechain-imp
l</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
neutronvpn
-impl</artifactId>
+ <artifactId>
coe
-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
neutronvpn-shel
l</artifactId>
+ <artifactId>
dhcpservice-imp
l</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
dhcpservice
-impl</artifactId>
+ <artifactId>
fibmanager
-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
cloud-servicechain-imp
l</artifactId>
+ <artifactId>
fibmanager-shel
l</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<version>${project.version}</version>
</dependency>
<dependency>
@@
-167,12
+165,12
@@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
aclservice
-impl</artifactId>
+ <artifactId>
neutronvpn
-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
aclservice
-shell</artifactId>
+ <artifactId>
neutronvpn
-shell</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<version>${project.version}</version>
</dependency>
<dependency>
@@
-180,11
+178,6
@@
<artifactId>qosservice-impl</artifactId>
<version>${project.version}</version>
</dependency>
<artifactId>qosservice-impl</artifactId>
<version>${project.version}</version>
</dependency>
- <!--<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>policyservice-impl</artifactId>
- <version>${project.version}</version>
- </dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ipv6service-impl</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ipv6service-impl</artifactId>
@@
-207,12
+200,12
@@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
coe
-impl</artifactId>
+ <artifactId>
vpnmanager
-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>
cache-imp
l</artifactId>
+ <artifactId>
vpnmanager-shel
l</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<version>${project.version}</version>
</dependency>
<dependency>