diff options
author | Ashlee Young <ashlee@wildernessvoice.com> | 2015-12-06 07:15:03 -0800 |
---|---|---|
committer | Ashlee Young <ashlee@wildernessvoice.com> | 2015-12-08 10:55:21 -0800 |
commit | 76dc892491948adae5e5e62cf94448967e8d865b (patch) | |
tree | 7a33ef05cc583946db21edad627060f280a53549 /framework/src/onos/protocols/netconf | |
parent | d333c63fdec8b064184b0a26f8d777f267577fde (diff) |
Fixes bad POM file with ONOS commit 8c68536972f63069c263635c9d9f4f31d7f3e9a2
Change-Id: I7adb5a2d3738d53dbc41db7577768b0e7ced5450
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/protocols/netconf')
-rw-r--r-- | framework/src/onos/protocols/netconf/api/pom.xml | 9 | ||||
-rw-r--r-- | framework/src/onos/protocols/netconf/ctl/pom.xml | 6 | ||||
-rw-r--r-- | framework/src/onos/protocols/netconf/pom.xml | 30 | ||||
-rw-r--r-- | framework/src/onos/protocols/netconf/rfc/pom.xml | 1 |
4 files changed, 17 insertions, 29 deletions
diff --git a/framework/src/onos/protocols/netconf/api/pom.xml b/framework/src/onos/protocols/netconf/api/pom.xml index ed8a5302..062ec932 100644 --- a/framework/src/onos/protocols/netconf/api/pom.xml +++ b/framework/src/onos/protocols/netconf/api/pom.xml @@ -14,18 +14,23 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onosproject</groupId> <artifactId>onos-netconf</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> + <artifactId>onos-netconf-api</artifactId> <packaging>bundle</packaging> <description>ONOS NETCONF plugin API</description> + <dependencies> <dependency> <groupId>commons-pool</groupId> diff --git a/framework/src/onos/protocols/netconf/ctl/pom.xml b/framework/src/onos/protocols/netconf/ctl/pom.xml index e022acba..bae59f07 100644 --- a/framework/src/onos/protocols/netconf/ctl/pom.xml +++ b/framework/src/onos/protocols/netconf/ctl/pom.xml @@ -28,6 +28,8 @@ <artifactId>onos-netconf-ctl</artifactId> <packaging>bundle</packaging> + <description>ONOS NETCONF plugin controller</description> + <dependencies> <dependency> <groupId>org.osgi</groupId> @@ -86,6 +88,10 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-scr-plugin</artifactId> + </plugin> </plugins> </build> </project> diff --git a/framework/src/onos/protocols/netconf/pom.xml b/framework/src/onos/protocols/netconf/pom.xml index d2f5c432..f0d6ca70 100644 --- a/framework/src/onos/protocols/netconf/pom.xml +++ b/framework/src/onos/protocols/netconf/pom.xml @@ -34,22 +34,10 @@ <module>ctl</module> </modules> - <description>ONOS NETCONF southbound libraries</description> + <description>ONOS NETCONF southbound plugin</description> + <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.onosproject</groupId> - <artifactId>onlab-misc</artifactId> - </dependency> - <dependency> - <groupId>org.onosproject</groupId> - <artifactId>onlab-junit</artifactId> - </dependency> - <dependency> <groupId>io.netty</groupId> <artifactId>netty-buffer</artifactId> </dependency> @@ -63,21 +51,9 @@ </dependency> <dependency> <groupId>org.onosproject</groupId> - <artifactId>onos-core-net</artifactId> + <artifactId>onos-api</artifactId> <version>${project.version}</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/framework/src/onos/protocols/netconf/rfc/pom.xml b/framework/src/onos/protocols/netconf/rfc/pom.xml index 832937bc..fa1e06e2 100644 --- a/framework/src/onos/protocols/netconf/rfc/pom.xml +++ b/framework/src/onos/protocols/netconf/rfc/pom.xml @@ -27,4 +27,5 @@ <artifactId>onos-netconf-rfc</artifactId> <packaging>bundle</packaging> + </project> |