Clean up pom file - part 2

- remove jaccoco plugin definition to use the one from odlparent

Change-Id: Iadfa794589aa96411b416799b7ba0983c2ea24fe
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>

diff --git a/groupbasedpolicy/pom.xml b/groupbasedpolicy/pom.xml
index 4d16a74bf50f4325e5e8772e4d8736955c59d0ad..bdb7d6fbad04ea543d2b69fff48c1c98000915ab 100644 (file)
--- a/groupbasedpolicy/pom.xml
+++ b/groupbasedpolicy/pom.xml
@@ -30,23 +30,6 @@
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
     </dependency>
-
-    <!-- controller dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-
-    <!-- project specific dependencies -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
     <!-- testing dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -58,16 +41,9 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- Sonar -->
-    <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
-      <artifactId>sonar-jacoco-listeners</artifactId>
-      <version>${sonar-jacoco-listeners.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
-  <!-- project build -->
+<!-- project build -->
   <build>
     <plugins>
       <plugin>
@@ -84,49 +60,8 @@
               org.opendaylight.groupbasedpolicy.util,
             </Export-Package>
           </instructions>
-          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <versionRange>[0.6,)</versionRange>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-             </pluginExecutions>
-            </lifecycleMappingMetadata>
-         </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 </project>
-

diff --git a/neutron-mapper/pom.xml b/neutron-mapper/pom.xml
index 0f76a2a07eda2fb5bb4d569c14d2a7178acc6103..e563cb0dcc587348e2bd9236b4d8ffb2b461ef80 100644 (file)
--- a/neutron-mapper/pom.xml
+++ b/neutron-mapper/pom.xml
@@ -25,6 +25,7 @@
   </properties>
 
   <dependencies>
+    <!-- project specific dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>groupbasedpolicy</artifactId>
@@ -40,22 +41,6 @@
       <artifactId>neutron-spi</artifactId>
       <version>${neutron.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
     <!-- testing dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -73,16 +58,9 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <!-- Sonar -->
-    <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
-      <artifactId>sonar-jacoco-listeners</artifactId>
-      <version>${sonar-jacoco-listeners.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
-  <build>
+ <build>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -97,38 +75,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <versionRange>[0.6,)</versionRange>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-             </pluginExecutions>
-            </lifecycleMappingMetadata>
-         </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
-</project>
+</project>
\ No newline at end of file

diff --git a/neutron-ovsdb/pom.xml b/neutron-ovsdb/pom.xml
index 8311b9c888c5f83ac0688b3e033e1d0849d35836..9accd0b81161cfd41f6a82689949bf4535f60f78 100644 (file)
--- a/neutron-ovsdb/pom.xml
+++ b/neutron-ovsdb/pom.xml
@@ -19,12 +19,13 @@
   <artifactId>neutron-ovsdb</artifactId>
   <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-
+  
   <properties>
     <ovsdb.version>1.2.1-SNAPSHOT</ovsdb.version>
   </properties>
 
   <dependencies>
+    <!-- project specific dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>groupbasedpolicy</artifactId>
@@ -40,18 +41,7 @@
       <artifactId>neutron-mapper</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
+    <!-- OVSDB dependencies -->
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>southbound-api</artifactId>
@@ -62,10 +52,7 @@
       <artifactId>southbound-impl</artifactId>
       <version>${ovsdb.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
+    <!-- testing dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -76,13 +63,6 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- Sonar -->
-    <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
-      <artifactId>sonar-jacoco-listeners</artifactId>
-      <version>${sonar-jacoco-listeners.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -97,38 +77,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <versionRange>[0.6,)</versionRange>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-             </pluginExecutions>
-            </lifecycleMappingMetadata>
-         </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
-</project>
+</project>
\ No newline at end of file

diff --git a/renderers/faas/pom.xml b/renderers/faas/pom.xml
index 8cea0bcadde348ecb50ef74a8573a219084add5b..a99a73b861d0dcc00a6ea55bd39abeb08d134eea 100644 (file)
--- a/renderers/faas/pom.xml
+++ b/renderers/faas/pom.xml
@@ -22,10 +22,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-nicira</artifactId>
@@ -44,7 +40,7 @@
     </dependency>
   </dependencies>
 
-  <!-- project build -->
+ <!-- project build -->
   <build>
     <plugins>
       <plugin>
@@ -57,13 +53,8 @@
               org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.faas.rev151009.*
             </Export-Package>
           </instructions>
-          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file

diff --git a/renderers/ofoverlay/pom.xml b/renderers/ofoverlay/pom.xml
index 80f58720ef8dc7870e8499529f57ab3cd5fbf341..f9d4b39494e44e9b4407dab2500cce779b3f547e 100644 (file)
--- a/renderers/ofoverlay/pom.xml
+++ b/renderers/ofoverlay/pom.xml
@@ -27,14 +27,10 @@
   <dependencies>
     <!-- model dependencies -->
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>southbound-api</artifactId>
+      <version>${ovsdb.version}</version>
     </dependency>
-  <dependency>
-    <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>southbound-api</artifactId>
-    <version>${ovsdb.version}</version>
-  </dependency>
     <!-- project specific dependencies -->
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
@@ -67,13 +63,6 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- Sonar -->
-    <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
-      <artifactId>sonar-jacoco-listeners</artifactId>
-      <version>${sonar-jacoco-listeners.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <!-- project build -->
@@ -116,49 +105,8 @@
               org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.*
             </Export-Package>
           </instructions>
-          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <versionRange>[0.6,)</versionRange>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-             </pluginExecutions>
-            </lifecycleMappingMetadata>
-         </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/ui-backend/pom.xml b/ui-backend/pom.xml
index db8586013b5e8c747debe3feb97c43477879f4e0..c1750c8651c170837ebb3fa6c4bea9b2b150b1da 100644 (file)
--- a/ui-backend/pom.xml
+++ b/ui-backend/pom.xml
@@ -16,6 +16,14 @@
   <version>0.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>groupbasedpolicy</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
   <!-- project build -->
   <build>
     <plugins>
@@ -31,25 +39,6 @@
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>groupbasedpolicy</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>
+</project>
\ No newline at end of file