홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
bcc14969 2 parents 9290eeaf 66a7eb22

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Inline Side-by-side
Showing 3 changed files with 32 additions and 11 deletions
...@@ -6,10 +6,13 @@ ...@@ -6,10 +6,13 @@
6 <feature name="onos-thirdparty-base" version="1.0.0" 6 <feature name="onos-thirdparty-base" version="1.0.0"
7 description="ONOS 3rd party dependencies"> 7 description="ONOS 3rd party dependencies">
8 <bundle>mvn:commons-lang/commons-lang/2.6</bundle> 8 <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
9 + <bundle>mvn:org.apache.commons/commons-lang3/3.3.2</bundle>
9 <bundle>mvn:com.google.guava/guava/18.0</bundle> 10 <bundle>mvn:com.google.guava/guava/18.0</bundle>
10 <bundle>mvn:io.netty/netty/3.9.2.Final</bundle> 11 <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
12 +
11 <bundle>mvn:com.esotericsoftware.kryo/kryo/2.24.0</bundle> 13 <bundle>mvn:com.esotericsoftware.kryo/kryo/2.24.0</bundle>
12 - <bundle>mvn:com.esotericsoftware.minlog/minlog/1.3</bundle> 14 + <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle>
15 + <bundle>mvn:org.objenesis/objenesis/2.1</bundle>
13 </feature> 16 </feature>
14 17
15 <feature name="onos-thirdparty-web" version="1.0.0" 18 <feature name="onos-thirdparty-web" version="1.0.0"
......
...@@ -73,8 +73,6 @@ ...@@ -73,8 +73,6 @@
73 <version>3.9.0.Final</version> 73 <version>3.9.0.Final</version>
74 </dependency> 74 </dependency>
75 75
76 -
77 -
78 <dependency> 76 <dependency>
79 <groupId>com.google.guava</groupId> 77 <groupId>com.google.guava</groupId>
80 <artifactId>guava-testlib</artifactId> 78 <artifactId>guava-testlib</artifactId>
...@@ -88,6 +86,13 @@ ...@@ -88,6 +86,13 @@
88 <version>2.6</version> 86 <version>2.6</version>
89 </dependency> 87 </dependency>
90 88
89 + <dependency>
90 + <groupId>org.apache.commons</groupId>
91 + <artifactId>commons-lang3</artifactId>
92 + <version>3.3.2</version>
93 + </dependency>
94 +
95 +
91 <!-- Web related --> 96 <!-- Web related -->
92 <dependency> 97 <dependency>
93 <groupId>com.sun.jersey</groupId> 98 <groupId>com.sun.jersey</groupId>
...@@ -139,17 +144,21 @@ ...@@ -139,17 +144,21 @@
139 <version>2.24.0</version> 144 <version>2.24.0</version>
140 </dependency> 145 </dependency>
141 <dependency> 146 <dependency>
147 + <groupId>com.esotericsoftware</groupId>
148 + <artifactId>minlog</artifactId>
149 + <version>1.3.0</version>
150 + </dependency>
151 + <dependency>
152 + <groupId>org.objenesis</groupId>
153 + <artifactId>objenesis</artifactId>
154 + <version>2.1</version>
155 + </dependency>
156 + <dependency>
142 <groupId>de.javakaffee</groupId> 157 <groupId>de.javakaffee</groupId>
143 <artifactId>kryo-serializers</artifactId> 158 <artifactId>kryo-serializers</artifactId>
144 <version>0.27</version> 159 <version>0.27</version>
145 </dependency> 160 </dependency>
146 161
147 - <dependency>
148 - <groupId>org.apache.commons</groupId>
149 - <artifactId>commons-lang3</artifactId>
150 - <version>3.3.2</version>
151 - </dependency>
152 -
153 <!-- ONOS related --> 162 <!-- ONOS related -->
154 <dependency> 163 <dependency>
155 <groupId>org.onlab.onos</groupId> 164 <groupId>org.onlab.onos</groupId>
......
...@@ -31,12 +31,21 @@ ...@@ -31,12 +31,21 @@
31 <artifactId>commons-lang</artifactId> 31 <artifactId>commons-lang</artifactId>
32 </dependency> 32 </dependency>
33 <dependency> 33 <dependency>
34 + <groupId>org.apache.commons</groupId>
35 + <artifactId>commons-lang3</artifactId>
36 + </dependency>
37 +
38 + <dependency>
34 <groupId>com.esotericsoftware.kryo</groupId> 39 <groupId>com.esotericsoftware.kryo</groupId>
35 <artifactId>kryo</artifactId> 40 <artifactId>kryo</artifactId>
36 </dependency> 41 </dependency>
37 <dependency> 42 <dependency>
38 - <groupId>org.apache.commons</groupId> 43 + <groupId>com.esotericsoftware</groupId>
39 - <artifactId>commons-lang3</artifactId> 44 + <artifactId>minlog</artifactId>
45 + </dependency>
46 + <dependency>
47 + <groupId>org.objenesis</groupId>
48 + <artifactId>objenesis</artifactId>
40 </dependency> 49 </dependency>
41 </dependencies> 50 </dependencies>
42 51
......