Merge "Add missing iteration synchronisation"

[openflowplugin.git] / openflowplugin-impl / pom.xml

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 5a4340fc3820f333f9c3b9c5888022f2d7f6fe2b..77cb55574267e4565a87b9553a92557ba5e2bc8c 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
@@ -126,26 +126,17 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
+            </plugin>
+            <!-- TODO Remove this when we upgrade to odlparent with a fix for ODLPARENT-146 -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <!-- This bundle works with Karaf 3 and 4.0 -->
-                        <Import-Package>
-                            org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
-                            org.apache.karaf.shell.console;version="[3.0.0,4.1)",
-                            *
-                        </Import-Package>
-                    </instructions>
+                    <failOnError>false</failOnError>
                 </configuration>
             </plugin>
         </plugins>