Thomas Vachuska

Fixing pom.xml duplicate dependencies and tying in lib into the root pom.

Change-Id: I00a13c0e0acc0c4a99fde1cd1d4fe06dbf3fb2f9
...@@ -58,10 +58,6 @@ ...@@ -58,10 +58,6 @@
58 <artifactId>org.apache.karaf.shell.console</artifactId> 58 <artifactId>org.apache.karaf.shell.console</artifactId>
59 </dependency> 59 </dependency>
60 <dependency> 60 <dependency>
61 - <groupId>org.apache.felix</groupId>
62 - <artifactId>org.apache.felix.scr.annotations</artifactId>
63 - </dependency>
64 - <dependency>
65 <groupId>io.dropwizard.metrics</groupId> 61 <groupId>io.dropwizard.metrics</groupId>
66 <artifactId>metrics-core</artifactId> 62 <artifactId>metrics-core</artifactId>
67 <version>${metrics.version}</version> 63 <version>${metrics.version}</version>
...@@ -73,13 +69,6 @@ ...@@ -73,13 +69,6 @@
73 </dependency> 69 </dependency>
74 <dependency> 70 <dependency>
75 <groupId>org.onosproject</groupId> 71 <groupId>org.onosproject</groupId>
76 - <artifactId>onos-api</artifactId>
77 - <version>${project.version}</version>
78 - <classifier>tests</classifier>
79 - <scope>test</scope>
80 - </dependency>
81 - <dependency>
82 - <groupId>org.onosproject</groupId>
83 <artifactId>onlab-junit</artifactId> 72 <artifactId>onlab-junit</artifactId>
84 <scope>test</scope> 73 <scope>test</scope>
85 </dependency> 74 </dependency>
......
...@@ -130,14 +130,6 @@ ...@@ -130,14 +130,6 @@
130 <scope>test</scope> 130 <scope>test</scope>
131 <classifier>tests</classifier> 131 <classifier>tests</classifier>
132 </dependency> 132 </dependency>
133 - <dependency>
134 - <groupId>org.onosproject</groupId>
135 - <artifactId>onos-incubator-api</artifactId>
136 - <version>${project.version}</version>
137 - <scope>test</scope>
138 - <classifier>tests</classifier>
139 - </dependency>
140 -
141 </dependencies> 133 </dependencies>
142 134
143 </project> 135 </project>
......
...@@ -71,11 +71,6 @@ ...@@ -71,11 +71,6 @@
71 <version>${project.version}</version> 71 <version>${project.version}</version>
72 </dependency> 72 </dependency>
73 <dependency> 73 <dependency>
74 - <groupId>org.onosproject</groupId>
75 - <artifactId>onos-core-serializers</artifactId>
76 - <version>${project.version}</version>
77 - </dependency>
78 - <dependency>
79 <groupId>javax.ws.rs</groupId> 74 <groupId>javax.ws.rs</groupId>
80 <artifactId>javax.ws.rs-api</artifactId> 75 <artifactId>javax.ws.rs-api</artifactId>
81 <version>2.0.1</version> 76 <version>2.0.1</version>
......
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
53 </licenses> 53 </licenses>
54 54
55 <modules> 55 <modules>
56 + <module>lib</module>
57 +
56 <module>utils</module> 58 <module>utils</module>
57 <module>core</module> 59 <module>core</module>
58 <module>web</module> 60 <module>web</module>
......