Remove declarations of osgi.{annotation,cmpn,core}

[odlparent.git] / karaf-plugin / pom.xml

diff --git a/karaf-plugin/pom.xml b/karaf-plugin/pom.xml
index 79017cf8a98ebbcb1e5b4bcceb9c585f48d24ae7..b873154b7bb8ce51b7d115d735b26b10ae3197c2 100644 (file)
--- a/karaf-plugin/pom.xml
+++ b/karaf-plugin/pom.xml
@@ -9,9 +9,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>odlparent</artifactId>
     <groupId>org.opendaylight.odlparent</groupId>
-    <version>4.0.2-SNAPSHOT</version>
+    <artifactId>odlparent</artifactId>
+    <version>10.0.0-SNAPSHOT</version>
     <relativePath>../odlparent/</relativePath>
   </parent>
   <artifactId>karaf-plugin</artifactId>
@@ -29,6 +29,11 @@
       <artifactId>maven-plugin-api</artifactId>
       <version>3.5.4</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.5.2</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
@@ -40,14 +45,13 @@
       <version>3.5.4</version>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.url</groupId>
-        <artifactId>pax-url-aether</artifactId>
-        <scope>compile</scope>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>org.apache.karaf.features.core</artifactId>
-      <version>${karaf.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -55,16 +59,16 @@
       <artifactId>aether-api</artifactId>
       <version>1.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.url</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>karaf-util</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -74,23 +78,11 @@
         <executions>
           <execution>
             <id>check-license</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <phase>process-sources</phase>
             <configuration>
-              <configLocation>check-license.xml</configLocation>
-              <includeResources>false</includeResources>
-              <includeTestResources>false</includeTestResources>
-              <sourceDirectories>
-                <directory>${project.build.sourceDirectory}</directory>
-              </sourceDirectories>
               <excludes>
                 <!-- Skip Apache Licensed files -->
                 org/opendaylight/odlparent/PopulateLocalRepoMojo.java
               </excludes>
-              <failsOnError>false</failsOnError>
-              <consoleOutput>true</consoleOutput>
             </configuration>
           </execution>
         </executions>
@@ -116,6 +108,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <configuration>
+          <failOnError>true</failOnError>
+          <!-- This ensure we ignore HelpMojo which fails SpotBugs -->
+          <onlyAnalyze>org.opendaylight.odlparent</onlyAnalyze>
+        </configuration>
+      </plugin>
     </plugins>
   </build>