Code Review
/
groupbasedpolicy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "remove redundant parent data with last child"
[groupbasedpolicy.git]
/
neutron-vpp-mapper
/
pom.xml
diff --git
a/neutron-vpp-mapper/pom.xml
b/neutron-vpp-mapper/pom.xml
index 3159e24302c8b412afa7778fc617ef982feadd4f..2c3d01c244ddcd8728d1997f7079db31458cd4d0 100644
(file)
--- a/
neutron-vpp-mapper/pom.xml
+++ b/
neutron-vpp-mapper/pom.xml
@@
-11,17
+11,17
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-parent</artifactId>
- <version>0.
5
.0-SNAPSHOT</version>
+ <version>0.
6
.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.groupbasedpolicy</groupId>
<artifactId>neutron-vpp-mapper</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.groupbasedpolicy</groupId>
<artifactId>neutron-vpp-mapper</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<properties>
<packaging>bundle</packaging>
<properties>
- <neutron.version>0.
7
.0-SNAPSHOT</neutron.version>
+ <neutron.version>0.
8
.0-SNAPSHOT</neutron.version>
</properties>
<dependencies>
</properties>
<dependencies>
@@
-36,11
+36,6
@@
<artifactId>neutron-mapper</artifactId>
<version>${project.version}</version>
</dependency>
<artifactId>neutron-mapper</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.neutron</groupId>
- <artifactId>neutron-spi</artifactId>
- <version>${neutron.version}</version>
- </dependency>
<dependency>
<groupId>org.opendaylight.groupbasedpolicy</groupId>
<artifactId>vpp-renderer</artifactId>
<dependency>
<groupId>org.opendaylight.groupbasedpolicy</groupId>
<artifactId>vpp-renderer</artifactId>
@@
-58,7
+53,7
@@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
all
</artifactId>
+ <artifactId>mockito-
core
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-88,4
+83,4
@@
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>