Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Do not allocate/commit transactions in tight loops"
[controller.git]
/
opendaylight
/
distribution
/
opendaylight
/
pom.xml
diff --git
a/opendaylight/distribution/opendaylight/pom.xml
b/opendaylight/distribution/opendaylight/pom.xml
index 1de9c4856c8c4a682cef53e954893954417ddaed..5aba5ca5cb72c4b7853c13a72610eeb32a92d95f 100644
(file)
--- a/
opendaylight/distribution/opendaylight/pom.xml
+++ b/
opendaylight/distribution/opendaylight/pom.xml
@@
-13,7
+13,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
@@
-145,7
+145,7
@@
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-topology</artifactId>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-topology</artifactId>
- <version>1.
0
-SNAPSHOT</version>
+ <version>1.
1
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
@@
-154,7
+154,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-util</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-util</artifactId>
- <version>1.
0
-SNAPSHOT</version>
+ <version>1.
1
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.md</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.md</groupId>
@@
-369,12
+369,12
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
- <version>
0.6.0-SNAPSHOT
</version>
+ <version>
${yangtools.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-type-provider</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-type-provider</artifactId>
- <version>
0.6.0-SNAPSHOT
</version>
+ <version>
${yangtools.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
@@
-556,7
+556,7
@@
</profiles>
<artifactId>distribution.opendaylight</artifactId>
</profiles>
<artifactId>distribution.opendaylight</artifactId>
- <version>0.1.
1
-SNAPSHOT</version>
+ <version>0.1.
2
-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
<packaging>pom</packaging>
<dependencies>
@@
-1248,6
+1248,10
@@
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ </dependency>
<!-- testing dependencies I'm pretty sure we should trim -->
<dependency>
<!-- testing dependencies I'm pretty sure we should trim -->
<dependency>