Updating onos-of-api

We not longer shade openflowj in onos-of-api, instead we used an
OGSi-compatible version of it.

Change-Id: If083c355f441783de3790d3e87ca824f386cccd8

drivers/default/features.xml

@@ -20,6 +20,7 @@
         <feature>onos-api</feature>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
 
+        <bundle>mvn:org.onosproject/openflowj/0.9.3.onos-SNAPSHOT</bundle>
         <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
 
     </feature>

drivers/default/pom.xml

@@ -42,5 +42,9 @@
             <groupId>org.onosproject</groupId>
             <artifactId>onos-of-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>openflowj</artifactId>
+        </dependency>
     </dependencies>
 </project>

pom.xml

@@ -82,7 +82,7 @@
         <atomix.version>1.0.0-rc3</atomix.version>
         <atomix.copycat.version>1.0.0-rc6</atomix.copycat.version>
         <copycat.version>0.5.1.onos</copycat.version>
-        <openflowj.version>0.9.2.onos</openflowj.version>
+        <openflowj.version>0.9.3.onos-SNAPSHOT</openflowj.version>
         <onos-maven-plugin.version>1.9</onos-maven-plugin.version>
         <osgi.version>4.3.1</osgi.version>
         <karaf.version>3.0.5</karaf.version>
@@ -104,6 +104,10 @@
         </snapshotRepository>
     </distributionManagement>
 
+    <!-- FIXME remove before release; needed for the following
+         - openflowj
+         - snmp
+    -->
     <repositories>
         <repository>
             <id>snapshots</id>
@@ -520,6 +524,13 @@
                 <artifactId>jsr305</artifactId>
                 <version>3.0.1</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.onosproject</groupId>
+                <artifactId>openflowj</artifactId>
+                <version>${openflowj.version}</version>
+                <scope>provided</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

protocols/openflow/api/pom.xml

@@ -36,7 +36,6 @@
             <!-- FIXME once experimenter gets merged to upstream -->
             <groupId>org.onosproject</groupId>
             <artifactId>openflowj</artifactId>
-            <version>${openflowj.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -53,65 +52,13 @@
             <classifier>tests</classifier>
             <version>${project.version}</version>
         </dependency>
-
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.2</version>
-                <configuration>
-                    <artifactSet>
-                        <excludes>
-                            <exclude>org.onosproject:onlab-misc</exclude>
-                            <exclude>org.onosproject:onos-api</exclude>
-                            <exclude>org.onosproject:onlab-osgi</exclude>
-                            <exclude>org.onosproject:onlab-rest</exclude>
-                            <exclude>io.netty:netty</exclude>
-                            <exclude>joda-time:joda-time</exclude>
-                            <exclude>javax.ws.rs:javax.ws.rs-api</exclude>
-                            <exclude>com.google.guava:guava</exclude>
-                            <exclude>org.slf4j:slfj-api</exclude>
-                            <exclude>ch.qos.logback:logback-core</exclude>
-                            <exclude>ch.qos.logback:logback-classic</exclude>
-                            <exclude>com.google.code.findbugs:annotations</exclude>
-                            <exclude>commons-configuration:commons-configuration</exclude>
-                            <exclude>commons-lang:commons-lang</exclude>
-                            <exclude>commons-logging:commons-logging</exclude>
-                            <exclude>commons-collections:commons-collections</exclude>
-                            <exclude>org.apache.commons:commons-lang3</exclude>
-                            <exclude>io.dropwizard.metrics:metrics-core</exclude>
-                            <exclude>io.dropwizard.metrics:metrics-json</exclude>
-                            <exclude>org.ow2.asm:asm</exclude>
-                            <exclude>com.esotericsoftware:kryo</exclude>
-                            <exclude>com.esotericsoftware:reflectasm</exclude>
-                            <exclude>com.eclipsesource.minimal-json:minimal-json</exclude>
-                            <exclude>org.objenesis:objenesis</exclude>
-                            <exclude>com.esotericsoftware:minlog</exclude>
-                        </excludes>
-                    </artifactSet>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                            org.onosproject.openflow.*,org.projectfloodlight.openflow.*
-                        </Export-Package>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>

protocols/openflow/ctl/pom.xml

@@ -35,6 +35,10 @@
             <groupId>org.onosproject</groupId>
             <artifactId>onos-of-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>openflowj</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>

providers/openflow/base/features.xml

@@ -18,7 +18,7 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
+        <bundle>mvn:org.onosproject/openflowj/0.9.3.onos-SNAPSHOT</bundle>
         <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle>
 

providers/openflow/pom.xml

@@ -55,6 +55,10 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>openflowj</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>