Moving snmp libs to released version; ejecing bti driver due to incompatibility
Change-Id: Ic148f2d486b949be61fe816467ae6c9df852a6a9
diff --git a/drivers/bti/BUCK b/drivers/bti/BUCK
index 273e24f..c7c713d 100644
--- a/drivers/bti/BUCK
+++ b/drivers/bti/BUCK
@@ -13,18 +13,19 @@
'//core/api:onos-api-tests',
]
-osgi_jar_with_tests (
- deps = COMPILE_DEPS,
- test_deps = TEST_DEPS,
- resources_root = 'src/main/resources',
- resources = glob(['src/main/resources/**']),
-)
-
-onos_app (
- app_name = 'org.onosproject.drivers.bti',
- title = 'Bti Device Drivers',
- category = 'Drivers',
- url = 'http://onosproject.org',
- description = 'ONOS Bti Device Drivers application.',
- required_apps = [ 'org.onosproject.snmp' ],
-)
+# TODO ONOS-5554 excluding from the build
+# osgi_jar_with_tests (
+# deps = COMPILE_DEPS,
+# test_deps = TEST_DEPS,
+# resources_root = 'src/main/resources',
+# resources = glob(['src/main/resources/**']),
+# )
+#
+# onos_app (
+# app_name = 'org.onosproject.drivers.bti',
+# title = 'Bti Device Drivers',
+# category = 'Drivers',
+# url = 'http://onosproject.org',
+# description = 'ONOS Bti Device Drivers application.',
+# required_apps = [ 'org.onosproject.snmp' ],
+# )
diff --git a/drivers/pom.xml b/drivers/pom.xml
index 199fd35..2902441 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -39,7 +39,8 @@
<module>ovsdb</module>
<module>utilities</module>
<module>lumentum</module>
- <module>bti</module>
+ <!-- TODO ONOS-5554 excluding from the build -->
+ <!--<module>bti</module>-->
<module>bmv2</module>
<module>corsa</module>
<module>optical</module>
diff --git a/lib/BUCK b/lib/BUCK
index 0186093..3f950cf 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon Oct 24 10:27:30 PDT 2016. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon Oct 24 14:55:13 PDT 2016. Do not edit this file manually. *****
osgi_feature_group(
name = 'COMPILE',
visibility = ['PUBLIC'],
@@ -1059,37 +1059,37 @@
remote_jar (
name = 'snmp-core',
- out = 'snmp-core-1.3-20161024.132710-9.jar',
- url = 'https://oss.sonatype.org/content/repositories/snapshots/com/btisystems/snmp-core/1.3-SNAPSHOT/snmp-core-1.3-20161024.132710-9.jar',
- sha1 = 'c8a4465290f762e296d606460f2ce8218139d1fb',
- maven_coords = 'com.btisystems:snmp-core:1.3-SNAPSHOT',
+ out = 'snmp-core-1.3-20161021.1.jar',
+ url = 'mvn:org.onosproject:snmp-core:jar:1.3-20161021.1',
+ sha1 = '65e1b71d9d0e2fc60c45f631decdb41da3253778',
+ maven_coords = 'org.onosproject:snmp-core:1.3-20161021.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'bti7000',
- out = 'bti7000-1.0-20151221.113001-4.jar',
- url = 'https://oss.sonatype.org/content/repositories/snapshots/com/btisystems/mibbler/mibs/bti7000/1.0-SNAPSHOT/bti7000-1.0-20151221.113001-4.jar',
- sha1 = '61de9a88dfb966d5dc825e0164d901992ad6c33b',
- maven_coords = 'com.btisystems.mibbler.mibs:bti7000:1.0-SNAPSHOT',
+ out = 'mibbler-mibs-bti7000-1.0-20151221.1.jar',
+ url = 'mvn:org.onosproject:mibbler-mibs-bti7000:jar:1.0-20151221.1',
+ sha1 = 'aebb218bd04e29d8a1ea9036de715919bb7a73e5',
+ maven_coords = 'org.onosproject:mibbler-mibs-bti7000:1.0-20151221.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'mibs-net-snmp',
- out = 'net-snmp-1.0-20151221.112958-4.jar',
- url = 'https://oss.sonatype.org/content/repositories/snapshots/com/btisystems/mibbler/mibs/net-snmp/1.0-SNAPSHOT/net-snmp-1.0-20151221.112958-4.jar',
- sha1 = 'efa58eeee87642dc800835f85dcbcc6be7eee4a1',
- maven_coords = 'com.btisystems.mibbler.mibs:net-snmp:1.0-SNAPSHOT',
+ out = 'mibbler-mibs-net-snmp-1.0-20151221.1.jar',
+ url = 'mvn:org.onosproject:mibbler-mibs-net-snmp:jar:1.0-20151221.1',
+ sha1 = 'd2cb918e46f06d4ee764d4a96b2b6fb0ba9bc60c',
+ maven_coords = 'org.onosproject:mibbler-mibs-net-snmp:1.0-20151221.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'mibs-rfc',
- out = 'rfc-1.0-20151221.113000-6.jar',
- url = 'https://oss.sonatype.org/content/repositories/snapshots/com/btisystems/mibbler/mibs/rfc/1.0-SNAPSHOT/rfc-1.0-20151221.113000-6.jar',
- sha1 = '54c6af6895084000ae75569d05df5d1866b926b7',
- maven_coords = 'com.btisystems.mibbler.mibs:rfc:1.0-SNAPSHOT',
+ out = 'mibbler-mibs-rfc-1.0-20151221.1.jar',
+ url = 'mvn:org.onosproject:mibbler-mibs-rfc:jar:1.0-20151221.1',
+ sha1 = '06ac2a3bf48c79ab444a9deede9d554ccd355a16',
+ maven_coords = 'org.onosproject:mibbler-mibs-rfc:1.0-20151221.1',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index eedbc52..fe24099 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -192,22 +192,10 @@
"uri": "mvn:org.onosproject:org.apache.felix.scr.bnd:1.4.1-SNAPSHOT",
"repo": "https://oss.sonatype.org/content/repositories/snapshots"
},
- "snmp-core": {
- "uri": "mvn:com.btisystems:snmp-core:1.3-SNAPSHOT",
- "repo": "https://oss.sonatype.org/content/repositories/snapshots"
- },
- "bti7000": {
- "uri": "mvn:com.btisystems.mibbler.mibs:bti7000:1.0-SNAPSHOT",
- "repo": "https://oss.sonatype.org/content/repositories/snapshots"
- },
- "mibs-net-snmp": {
- "uri": "mvn:com.btisystems.mibbler.mibs:net-snmp:1.0-SNAPSHOT",
- "repo": "https://oss.sonatype.org/content/repositories/snapshots"
- },
- "mibs-rfc": {
- "uri": "mvn:com.btisystems.mibbler.mibs:rfc:1.0-SNAPSHOT",
- "repo": "https://oss.sonatype.org/content/repositories/snapshots"
- },
+ "snmp-core": "mvn:org.onosproject:snmp-core:1.3-20161021.1",
+ "bti7000": "mvn:org.onosproject:mibbler-mibs-bti7000:1.0-20151221.1",
+ "mibs-net-snmp": "mvn:org.onosproject:mibbler-mibs-net-snmp:1.0-20151221.1",
+ "mibs-rfc": "mvn:org.onosproject:mibbler-mibs-rfc:1.0-20151221.1",
// Openstack4j related jars
"openstack4j-core": "mvn:org.pacesys:openstack4j-core:2.11",
"openstack4j-http-connector": "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:2.11",
diff --git a/modules.defs b/modules.defs
index 2208271..75b9768 100644
--- a/modules.defs
+++ b/modules.defs
@@ -73,7 +73,8 @@
# Drivers
'//drivers/default:onos-drivers-default-oar',
'//drivers/arista:onos-drivers-arista-oar',
- '//drivers/bti:onos-drivers-bti-oar',
+ # TODO ONOS-5554 excluding from the build
+ #'//drivers/bti:onos-drivers-bti-oar',
'//drivers/ciena:onos-drivers-ciena-oar',
'//drivers/cisco:onos-drivers-cisco-oar',
'//drivers/corsa:onos-drivers-corsa-oar',
diff --git a/protocols/snmp/pom.xml b/protocols/snmp/pom.xml
index a2fe0e4..2865b74 100644
--- a/protocols/snmp/pom.xml
+++ b/protocols/snmp/pom.xml
@@ -33,19 +33,19 @@
</modules>
<dependencies>
<dependency>
- <groupId>com.btisystems</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>snmp-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3-20161021.1</version>
</dependency>
<dependency>
- <groupId>com.btisystems.mibbler.mibs</groupId>
- <artifactId>bti7000</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.onosproject</groupId>
+ <artifactId>mibbler-mibs-bti7000</artifactId>
+ <version>1.0-20151221.1</version>
</dependency>
<dependency>
- <groupId>com.btisystems.mibbler.mibs</groupId>
- <artifactId>net-snmp</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.onosproject</groupId>
+ <artifactId>mibbler-mibs-net-snmp</artifactId>
+ <version>1.0-20151221.1</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/providers/snmp/device/pom.xml b/providers/snmp/device/pom.xml
index ce95e8a..993e939 100644
--- a/providers/snmp/device/pom.xml
+++ b/providers/snmp/device/pom.xml
@@ -57,21 +57,21 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.btisystems</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>snmp-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3-20161021.1</version>
</dependency>
<dependency>
- <groupId>com.btisystems.mibbler.mibs</groupId>
- <artifactId>bti7000</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.onosproject</groupId>
+ <artifactId>mibbler-mibs-bti7000</artifactId>
+ <version>1.0-20151221.1</version>
</dependency>
<dependency>
- <groupId>com.btisystems.mibbler.mibs</groupId>
- <artifactId>net-snmp</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.onosproject</groupId>
+ <artifactId>mibbler-mibs-net-snmp</artifactId>
+ <version>1.0-20151221.1</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/providers/snmp/pom.xml b/providers/snmp/pom.xml
index 0c27ca5..f68d3a8 100644
--- a/providers/snmp/pom.xml
+++ b/providers/snmp/pom.xml
@@ -34,17 +34,4 @@
<module>device</module>
<module>app</module>
</modules>
-
- <repositories>
- <repository>
- <!-- TODO move over to release snmp-core when it becomes available. ONOS-3646 -->
- <id>oss.sonatype.org-snapshot</id>
- <url>http://oss.sonatype.org/content/repositories/snapshots</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-
</project>