Code Review
/
vpnservice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix for broken vpnserice-merge-beryllium
[vpnservice.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 0db9c69ddd00b94c4dfe6c3bcbf843723c2b1780..19bcaaa344747c009ffb0d60ee1309ef0cce9920 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-1,6
+1,6
@@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others. All rights reserved.
+Copyright (c) 2015
- 2016
Ericsson India Global Services Pvt Ltd. 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
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
@@
-8,7
+8,7
@@
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">
<groupId>org.opendaylight.vpnservice</groupId>
<artifactId>vpnservice</artifactId>
<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">
<groupId>org.opendaylight.vpnservice</groupId>
<artifactId>vpnservice</artifactId>
- <version>0.
0.1
-SNAPSHOT</version>
+ <version>0.
2.0
-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
@@
-16,17
+16,23
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<maven>3.1.1</maven>
</prerequisites>
<modules>
<maven>3.1.1</maven>
</prerequisites>
<modules>
- <module>model-bgp</module>
+ <module>commons/binding-parent</module>
+ <module>commons/config-parent</module>
+ <module>model-bgp</module>
+ <module>mdsalutil</module>
+ <module>lockmanager</module>
+ <module>idmanager</module>
+ <module>arputil</module>
<module>vpnmanager</module>
<module>vpnmanager</module>
- <module>distribution/karaf</module>
- <module>features</module>
- <module>vpnservice-artifacts</module>
<module>interfacemgr</module>
<module>interfacemgr</module>
- <module>nexthopmgr</module>
- <module>idmanager</module>
+ <module>alivenessmonitor</module>
<module>fibmanager</module>
<module>fibmanager</module>
- <module>mdsalutil</module>
<module>bgpmanager</module>
<module>bgpmanager</module>
+ <module>dhcpservice</module>
+ <module>itm</module>
+ <module>distribution/karaf</module>
+ <module>features</module>
+ <module>vpnservice-artifacts</module>
</modules>
<!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
</modules>
<!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->