홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
d82c71a8 1 parent 37a5d8c3

General cleanup of pom files under protocols. 

Change-Id: I461f55665fc57057261bdd81f6bbe8258ee7b49b
Inline Side-by-side
Showing 11 changed files with 34 additions and 130 deletions
...@@ -44,11 +44,6 @@ ...@@ -44,11 +44,6 @@
44 <groupId>org.onosproject</groupId> 44 <groupId>org.onosproject</groupId>
45 <artifactId>onos-api</artifactId> 45 <artifactId>onos-api</artifactId>
46 </dependency> 46 </dependency>
47 - <dependency>
48 - <groupId>org.onosproject</groupId>
49 - <artifactId>onlab-misc</artifactId>
50 - </dependency>
51 -
52 </dependencies> 47 </dependencies>
53 48
54 <build> 49 <build>
......
...@@ -47,10 +47,6 @@ ...@@ -47,10 +47,6 @@
47 <groupId>org.osgi</groupId> 47 <groupId>org.osgi</groupId>
48 <artifactId>org.osgi.compendium</artifactId> 48 <artifactId>org.osgi.compendium</artifactId>
49 </dependency> 49 </dependency>
50 - <dependency>
51 - <groupId>org.onosproject</groupId>
52 - <artifactId>onlab-misc</artifactId>
53 - </dependency>
54 </dependencies> 50 </dependencies>
55 51
56 <build> 52 <build>
......
...@@ -37,24 +37,4 @@ ...@@ -37,24 +37,4 @@
37 <module>bgpio</module> 37 <module>bgpio</module>
38 </modules> 38 </modules>
39 39
40 - <dependencies>
41 - <dependency>
42 - <groupId>org.onosproject</groupId>
43 - <artifactId>onlab-misc</artifactId>
44 - </dependency>
45 - <dependency>
46 - <groupId>org.onosproject</groupId>
47 - <artifactId>onlab-junit</artifactId>
48 - </dependency>
49 - </dependencies>
50 -
51 - <build>
52 - <plugins>
53 - <plugin>
54 - <groupId>org.apache.felix</groupId>
55 - <artifactId>maven-bundle-plugin</artifactId>
56 - </plugin>
57 - </plugins>
58 - </build>
59 -
60 </project> 40 </project>
......
...@@ -14,18 +14,23 @@ ...@@ -14,18 +14,23 @@
14 ~ See the License for the specific language governing permissions and 14 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" 17 +<project
18 - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 18 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
19 + xmlns="http://maven.apache.org/POM/4.0.0"
20 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
19 <modelVersion>4.0.0</modelVersion> 21 <modelVersion>4.0.0</modelVersion>
20 <parent> 22 <parent>
21 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
22 <artifactId>onos-netconf</artifactId> 24 <artifactId>onos-netconf</artifactId>
23 <version>1.4.0-SNAPSHOT</version> 25 <version>1.4.0-SNAPSHOT</version>
26 + <relativePath>../pom.xml</relativePath>
24 </parent> 27 </parent>
28 +
25 <artifactId>onos-netconf-api</artifactId> 29 <artifactId>onos-netconf-api</artifactId>
26 <packaging>bundle</packaging> 30 <packaging>bundle</packaging>
27 31
28 <description>ONOS NETCONF plugin API</description> 32 <description>ONOS NETCONF plugin API</description>
33 +
29 <dependencies> 34 <dependencies>
30 <dependency> 35 <dependency>
31 <groupId>commons-pool</groupId> 36 <groupId>commons-pool</groupId>
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
28 <artifactId>onos-netconf-ctl</artifactId> 28 <artifactId>onos-netconf-ctl</artifactId>
29 <packaging>bundle</packaging> 29 <packaging>bundle</packaging>
30 30
31 + <description>ONOS NETCONF plugin controller</description>
32 +
31 <dependencies> 33 <dependencies>
32 <dependency> 34 <dependency>
33 <groupId>org.osgi</groupId> 35 <groupId>org.osgi</groupId>
......
...@@ -34,22 +34,10 @@ ...@@ -34,22 +34,10 @@
34 <module>ctl</module> 34 <module>ctl</module>
35 </modules> 35 </modules>
36 36
37 - <description>ONOS NETCONF southbound libraries</description> 37 + <description>ONOS NETCONF southbound plugin</description>
38 +
38 <dependencies> 39 <dependencies>
39 <dependency> 40 <dependency>
40 - <groupId>junit</groupId>
41 - <artifactId>junit</artifactId>
42 - <scope>test</scope>
43 - </dependency>
44 - <dependency>
45 - <groupId>org.onosproject</groupId>
46 - <artifactId>onlab-misc</artifactId>
47 - </dependency>
48 - <dependency>
49 - <groupId>org.onosproject</groupId>
50 - <artifactId>onlab-junit</artifactId>
51 - </dependency>
52 - <dependency>
53 <groupId>io.netty</groupId> 41 <groupId>io.netty</groupId>
54 <artifactId>netty-buffer</artifactId> 42 <artifactId>netty-buffer</artifactId>
55 </dependency> 43 </dependency>
...@@ -63,21 +51,9 @@ ...@@ -63,21 +51,9 @@
63 </dependency> 51 </dependency>
64 <dependency> 52 <dependency>
65 <groupId>org.onosproject</groupId> 53 <groupId>org.onosproject</groupId>
66 - <artifactId>onos-core-net</artifactId> 54 + <artifactId>onos-api</artifactId>
67 <version>${project.version}</version> 55 <version>${project.version}</version>
68 </dependency> 56 </dependency>
69 </dependencies> 57 </dependencies>
70 58
71 - <build>
72 - <plugins>
73 - <plugin>
74 - <groupId>org.apache.felix</groupId>
75 - <artifactId>maven-bundle-plugin</artifactId>
76 - </plugin>
77 - <plugin>
78 - <groupId>org.apache.felix</groupId>
79 - <artifactId>maven-scr-plugin</artifactId>
80 - </plugin>
81 - </plugins>
82 - </build>
83 </project> 59 </project>
......
...@@ -27,4 +27,5 @@ ...@@ -27,4 +27,5 @@
27 27
28 <artifactId>onos-netconf-rfc</artifactId> 28 <artifactId>onos-netconf-rfc</artifactId>
29 <packaging>bundle</packaging> 29 <packaging>bundle</packaging>
30 +
30 </project> 31 </project>
......
...@@ -38,20 +38,6 @@ ...@@ -38,20 +38,6 @@
38 38
39 <dependencies> 39 <dependencies>
40 <dependency> 40 <dependency>
41 - <groupId>org.onosproject</groupId>
42 - <artifactId>onlab-misc</artifactId>
43 - </dependency>
44 - <dependency>
45 - <groupId>org.onosproject</groupId>
46 - <artifactId>onlab-junit</artifactId>
47 - </dependency>
48 - <dependency>
49 - <groupId>junit</groupId>
50 - <artifactId>junit</artifactId>
51 - <version>4.11</version>
52 - <scope>test</scope>
53 - </dependency>
54 - <dependency>
55 <groupId>org.hamcrest</groupId> 41 <groupId>org.hamcrest</groupId>
56 <artifactId>hamcrest-core</artifactId> 42 <artifactId>hamcrest-core</artifactId>
57 <version>1.3</version> 43 <version>1.3</version>
...@@ -74,13 +60,4 @@ ...@@ -74,13 +60,4 @@
74 </dependency> 60 </dependency>
75 </dependencies> 61 </dependencies>
76 62
77 - <build>
78 - <plugins>
79 - <plugin>
80 - <groupId>org.apache.felix</groupId>
81 - <artifactId>maven-bundle-plugin</artifactId>
82 - </plugin>
83 - </plugins>
84 - </build>
85 -
86 </project> 63 </project>
......
...@@ -26,25 +26,18 @@ ...@@ -26,25 +26,18 @@
26 </parent> 26 </parent>
27 27
28 <artifactId>onos-ovsdb</artifactId> 28 <artifactId>onos-ovsdb</artifactId>
29 - <name>onos-ovsdb</name>
30 <packaging>pom</packaging> 29 <packaging>pom</packaging>
31 30
32 <description>ONOS OVSDB southbound plugin</description> 31 <description>ONOS OVSDB southbound plugin</description>
32 +
33 + <modules>
34 + <module>api</module>
35 + <module>rfc</module>
36 + <module>ctl</module>
37 + </modules>
38 +
33 <dependencies> 39 <dependencies>
34 <dependency> 40 <dependency>
35 - <groupId>junit</groupId>
36 - <artifactId>junit</artifactId>
37 - <scope>test</scope>
38 - </dependency>
39 - <dependency>
40 - <groupId>org.onosproject</groupId>
41 - <artifactId>onlab-misc</artifactId>
42 - </dependency>
43 - <dependency>
44 - <groupId>org.onosproject</groupId>
45 - <artifactId>onlab-junit</artifactId>
46 - </dependency>
47 - <dependency>
48 <groupId>io.netty</groupId> 41 <groupId>io.netty</groupId>
49 <artifactId>netty-buffer</artifactId> 42 <artifactId>netty-buffer</artifactId>
50 </dependency> 43 </dependency>
...@@ -54,18 +47,4 @@ ...@@ -54,18 +47,4 @@
54 </dependency> 47 </dependency>
55 </dependencies> 48 </dependencies>
56 49
57 - <build>
58 - <plugins>
59 - <plugin>
60 - <groupId>org.apache.felix</groupId>
61 - <artifactId>maven-bundle-plugin</artifactId>
62 - </plugin>
63 - </plugins>
64 - </build>
65 -
66 - <modules>
67 - <module>api</module>
68 - <module>rfc</module>
69 - <module>ctl</module>
70 - </modules>
71 </project> 50 </project>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -37,24 +37,4 @@ ...@@ -37,24 +37,4 @@
37 <module>pcepio</module> 37 <module>pcepio</module>
38 </modules> 38 </modules>
39 39
40 - <dependencies>
41 - <dependency>
42 - <groupId>org.onosproject</groupId>
43 - <artifactId>onlab-misc</artifactId>
44 - </dependency>
45 - <dependency>
46 - <groupId>org.onosproject</groupId>
47 - <artifactId>onlab-junit</artifactId>
48 - </dependency>
49 - </dependencies>
50 -
51 - <build>
52 - <plugins>
53 - <plugin>
54 - <groupId>org.apache.felix</groupId>
55 - <artifactId>maven-bundle-plugin</artifactId>
56 - </plugin>
57 - </plugins>
58 - </build>
59 -
60 </project> 40 </project>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 <artifactId>onos-protocols</artifactId> 29 <artifactId>onos-protocols</artifactId>
30 <packaging>pom</packaging> 30 <packaging>pom</packaging>
31 31
32 - <description>ONOS south-bound protocols</description> 32 + <description>ONOS southbound protocols</description>
33 33
34 <modules> 34 <modules>
35 <module>openflow</module> 35 <module>openflow</module>
...@@ -40,6 +40,19 @@ ...@@ -40,6 +40,19 @@
40 </modules> 40 </modules>
41 41
42 <dependencies> 42 <dependencies>
43 + <dependency>
44 + <groupId>org.onosproject</groupId>
45 + <artifactId>onlab-misc</artifactId>
46 + </dependency>
47 + <dependency>
48 + <groupId>org.onosproject</groupId>
49 + <artifactId>onlab-junit</artifactId>
50 + </dependency>
51 + <dependency>
52 + <groupId>junit</groupId>
53 + <artifactId>junit</artifactId>
54 + <scope>test</scope>
55 + </dependency>
43 </dependencies> 56 </dependencies>
44 57
45 <build> 58 <build>
......