tom

Moved net to core

Showing 139 changed files with 8 additions and 35 deletions
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.onlab.onos</groupId>
<artifactId>onos-net</artifactId>
<artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -11,14 +11,14 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-net</artifactId>
<artifactId>onos-core</artifactId>
<packaging>pom</packaging>
<description>ONOS Core root project</description>
<modules>
<module>api</module>
<module>core</module>
<module>trivial</module>
</modules>
<dependencies>
......
......@@ -6,19 +6,15 @@
<parent>
<groupId>org.onlab.onos</groupId>
<artifactId>onos-net</artifactId>
<artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-core</artifactId>
<packaging>pom</packaging>
<artifactId>onos-core-trivial</artifactId>
<packaging>bundle</packaging>
<description>ONOS network control core subsystems</description>
<modules>
<module>trivial</module>
</modules>
<description>ONOS network control trivial implementations of core subsystems</description>
<dependencies>
<dependency>
......@@ -26,10 +22,6 @@
<artifactId>onos-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onlab.onos</groupId>
<artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-core-trivial</artifactId>
<packaging>bundle</packaging>
<description>ONOS network control trivial implementations of core subsystems</description>
</project>
......@@ -14,7 +14,7 @@
<modules>
<module>tools/build/conf</module>
<module>utils</module>
<module>net</module>
<module>core</module>
<module>web</module>
<module>cli</module>
<module>providers</module>
......