Charles Chan
Committed by Charles Chan

Bumping OpenFlowJ version to 0.9.6.onos

OFDPA_MPLS_TYPE experimenter OXM is introduced in 0.9.6.onos

Change-Id: I4acbc98d80cc418b12006059618dcad9311cd277
......@@ -20,7 +20,7 @@
<feature>onos-api</feature>
<bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
<bundle>mvn:org.onosproject/openflowj/0.9.5.onos</bundle>
<bundle>mvn:org.onosproject/openflowj/0.9.6.onos</bundle>
<bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
</feature>
......
# ***** This file was auto-generated at Tue Sep 13 16:22:03 PDT 2016. Do not edit this file manually. *****
# ***** This file was auto-generated at Wed Sep 21 16:16:41 PDT 2016. Do not edit this file manually. *****
osgi_feature_group(
name = 'COMPILE',
visibility = ['PUBLIC'],
......@@ -826,10 +826,10 @@ remote_jar (
remote_jar (
name = 'openflowj',
out = 'openflowj-0.9.5.onos.jar',
url = 'mvn:org.onosproject:openflowj:jar:0.9.5.onos',
sha1 = 'ac34ddca406771eae3736ebfdd1a7502abaebe14',
maven_coords = 'org.onosproject:openflowj:0.9.5.onos',
out = 'openflowj-0.9.6.onos.jar',
url = 'mvn:org.onosproject:openflowj:jar:0.9.6.onos',
sha1 = '3af3b529871775ba612f6689b2d6460057e17067',
maven_coords = 'org.onosproject:openflowj:0.9.6.onos',
visibility = [ 'PUBLIC' ],
)
......
......@@ -163,7 +163,7 @@
"catalyst-netty": "mvn:io.atomix.catalyst:catalyst-netty:1.1.1",
"catalyst-transport": "mvn:io.atomix.catalyst:catalyst-transport:1.1.1",
"objenesis": "mvn:org.objenesis:objenesis:2.2",
"openflowj": "mvn:org.onosproject:openflowj:0.9.5.onos",
"openflowj": "mvn:org.onosproject:openflowj:0.9.6.onos",
"org.apache.felix.scr": "mvn:org.apache.felix:org.apache.felix.scr:1.8.2",
"org.apache.felix.scr.annotations": "mvn:org.apache.felix:org.apache.felix.scr.annotations:1.9.12",
"org.apache.karaf.features.core": "mvn:org.apache.karaf.features:org.apache.karaf.features.core:3.0.5",
......
......@@ -42,7 +42,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos-build-conf.version>1.3</onos-build-conf.version>
<netty4.version>4.0.40.Final</netty4.version>
<openflowj.version>0.9.5.onos</openflowj.version>
<openflowj.version>0.9.6.onos</openflowj.version>
<onos-maven-plugin.version>1.10</onos-maven-plugin.version>
<osgi.version>5.0.0</osgi.version>
<karaf.version>3.0.5</karaf.version>
......
......@@ -18,7 +18,7 @@
<feature name="${project.artifactId}" version="${project.version}"
description="${project.description}">
<feature>onos-api</feature>
<bundle>mvn:org.onosproject/openflowj/0.9.5.onos</bundle>
<bundle>mvn:org.onosproject/openflowj/0.9.6.onos</bundle>
<bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle>
......