Bumping openflowj-3.0.0 to openflow-3.2.0.onos
Change-Id: I866b815a1423adfe6e973d0a48c85da6b5321bdf
diff --git a/apps/ofagent/BUCK b/apps/ofagent/BUCK
index e16cb7e..d5829eb 100644
--- a/apps/ofagent/BUCK
+++ b/apps/ofagent/BUCK
@@ -9,7 +9,7 @@
'//lib:netty-buffer',
'//lib:netty-codec',
'//lib:netty-handler',
- '//lib:openflowj-3.0',
+ '//lib:openflowj',
'//lib:javax.ws.rs-api',
'//utils/rest:onlab-rest',
]
@@ -23,10 +23,6 @@
'//web/api:onos-rest-tests',
]
-EXCLUDED_BUNDLES = [
- '//lib:openflowj-3.0',
-]
-
osgi_jar_with_tests (
deps = COMPILE_DEPS,
test_deps = TEST_DEPS,
@@ -38,5 +34,4 @@
category = 'Traffic Steering',
url = 'http://onosproject.org',
description = 'OpenFlow agent application for virtualization subsystem.',
- excluded_bundles = EXCLUDED_BUNDLES
)
diff --git a/apps/ofagent/pom.xml b/apps/ofagent/pom.xml
index 6b222a6..cec1617 100644
--- a/apps/ofagent/pom.xml
+++ b/apps/ofagent/pom.xml
@@ -119,9 +119,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.projectfloodlight</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>openflowj</artifactId>
- <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -188,9 +187,6 @@
WEB-INF/classes/apidoc/swagger.json=target/swagger.json,
{maven-resources}
</Include-Resource>
- <Embed-Dependency>
- openflowj
- </Embed-Dependency>
<Import-Package>
*,org.glassfish.jersey.servlet
</Import-Package>
diff --git a/lib/BUCK b/lib/BUCK
index df51368..f08baa2 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed, 31 May 2017 18:05:22 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 9 Jun 2017 15:02:22 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -1257,15 +1257,6 @@
)
remote_jar (
- name = 'openflowj-3.0',
- out = 'openflowj-3.0.0-20161029.095322-40.jar',
- url = 'https://oss.sonatype.org/content/repositories/snapshots/org/projectfloodlight/openflowj/3.0.0-SNAPSHOT/openflowj-3.0.0-20161029.095322-40.jar',
- sha1 = 'dc84b9dc73f50c286f455b34a0f5ab3bcfe2fbc4',
- maven_coords = 'org.projectfloodlight:openflowj:3.0.0-SNAPSHOT',
- visibility = [ 'PUBLIC' ],
-)
-
-remote_jar (
name = 'plexus-utils',
out = 'plexus-utils-3.0.24.jar',
url = 'mvn:org.codehaus.plexus:plexus-utils:jar:3.0.24',
diff --git a/lib/deps.json b/lib/deps.json
index c51ef16..b0848c4 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -227,10 +227,6 @@
"onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.1",
"onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.1",
"org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
- "openflowj-3.0": {
- "uri": "mvn:org.projectfloodlight:openflowj:3.0.0-SNAPSHOT",
- "repo": "https://oss.sonatype.org/content/repositories/snapshots"
- },
"plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
"sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",
"grpc-core-1.3.0": "mvn:io.grpc:grpc-core:1.3.0",