홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
e6f8400f 1 parent d2c7ad20

Cleaned up dependencies after routing code shuffle. 

Change-Id: I1388749f77ef9b3b327df2ee745fdb7cec510708
Inline Side-by-side
Showing 4 changed files with 42 additions and 30 deletions
...@@ -39,23 +39,12 @@ ...@@ -39,23 +39,12 @@
39 39
40 <dependency> 40 <dependency>
41 <groupId>org.onosproject</groupId> 41 <groupId>org.onosproject</groupId>
42 - <artifactId>onos-cli</artifactId> 42 + <artifactId>onlab-misc</artifactId>
43 - <version>${project.version}</version>
44 </dependency> 43 </dependency>
45 44
46 <dependency> 45 <dependency>
47 <groupId>com.google.guava</groupId> 46 <groupId>com.google.guava</groupId>
48 <artifactId>guava</artifactId> 47 <artifactId>guava</artifactId>
49 </dependency> 48 </dependency>
50 -
51 - <dependency>
52 - <groupId>org.osgi</groupId>
53 - <artifactId>org.osgi.compendium</artifactId>
54 - </dependency>
55 -
56 - <dependency>
57 - <groupId>org.osgi</groupId>
58 - <artifactId>org.osgi.core</artifactId>
59 - </dependency>
60 </dependencies> 49 </dependencies>
61 </project> 50 </project>
......
...@@ -33,6 +33,21 @@ ...@@ -33,6 +33,21 @@
33 <dependencies> 33 <dependencies>
34 <dependency> 34 <dependency>
35 <groupId>org.onosproject</groupId> 35 <groupId>org.onosproject</groupId>
36 + <artifactId>onlab-misc</artifactId>
37 + </dependency>
38 +
39 + <dependency>
40 + <groupId>com.fasterxml.jackson.core</groupId>
41 + <artifactId>jackson-annotations</artifactId>
42 + </dependency>
43 +
44 + <dependency>
45 + <groupId>com.google.guava</groupId>
46 + <artifactId>guava</artifactId>
47 + </dependency>
48 +
49 + <dependency>
50 + <groupId>org.onosproject</groupId>
36 <artifactId>onlab-junit</artifactId> 51 <artifactId>onlab-junit</artifactId>
37 <scope>test</scope> 52 <scope>test</scope>
38 </dependency> 53 </dependency>
......
...@@ -46,7 +46,21 @@ ...@@ -46,7 +46,21 @@
46 <dependency> 46 <dependency>
47 <groupId>org.onosproject</groupId> 47 <groupId>org.onosproject</groupId>
48 <artifactId>onlab-thirdparty</artifactId> 48 <artifactId>onlab-thirdparty</artifactId>
49 - <version>${project.version}</version> 49 + </dependency>
50 +
51 + <dependency>
52 + <groupId>org.onosproject</groupId>
53 + <artifactId>onlab-misc</artifactId>
54 + </dependency>
55 +
56 + <dependency>
57 + <groupId>com.fasterxml.jackson.core</groupId>
58 + <artifactId>jackson-annotations</artifactId>
59 + </dependency>
60 +
61 + <dependency>
62 + <groupId>com.fasterxml.jackson.core</groupId>
63 + <artifactId>jackson-databind</artifactId>
50 </dependency> 64 </dependency>
51 65
52 <dependency> 66 <dependency>
...@@ -55,6 +69,17 @@ ...@@ -55,6 +69,17 @@
55 </dependency> 69 </dependency>
56 70
57 <dependency> 71 <dependency>
72 + <groupId>org.apache.commons</groupId>
73 + <artifactId>commons-lang3</artifactId>
74 + </dependency>
75 +
76 + <dependency>
77 + <groupId>io.netty</groupId>
78 + <artifactId>netty</artifactId>
79 + <version>3.9.0.Final</version>
80 + </dependency>
81 +
82 + <dependency>
58 <groupId>org.osgi</groupId> 83 <groupId>org.osgi</groupId>
59 <artifactId>org.osgi.compendium</artifactId> 84 <artifactId>org.osgi.compendium</artifactId>
60 </dependency> 85 </dependency>
......
...@@ -33,28 +33,11 @@ ...@@ -33,28 +33,11 @@
33 33
34 <dependencies> 34 <dependencies>
35 <dependency> 35 <dependency>
36 - <groupId>com.fasterxml.jackson.core</groupId>
37 - <artifactId>jackson-databind</artifactId>
38 - </dependency>
39 - <dependency>
40 - <groupId>com.fasterxml.jackson.core</groupId>
41 - <artifactId>jackson-annotations</artifactId>
42 - <version>2.4.2</version>
43 - <scope>provided</scope>
44 - </dependency>
45 -
46 - <dependency>
47 <groupId>com.google.guava</groupId> 36 <groupId>com.google.guava</groupId>
48 <artifactId>guava</artifactId> 37 <artifactId>guava</artifactId>
49 </dependency> 38 </dependency>
50 39
51 <dependency> 40 <dependency>
52 - <groupId>org.apache.commons</groupId>
53 - <artifactId>commons-collections4</artifactId>
54 - <version>4.0</version>
55 - </dependency>
56 -
57 - <dependency>
58 <groupId>org.onosproject</groupId> 41 <groupId>org.onosproject</groupId>
59 <artifactId>onlab-misc</artifactId> 42 <artifactId>onlab-misc</artifactId>
60 </dependency> 43 </dependency>
......