Merge "Remove sonar.profile since it's deprecated in Sonar 4.5"

diff --git a/features/neutron/pom.xml b/features/neutron/pom.xml
index 59a0af2f893215582342b67fc0c0852eb16148df..642ce983516b33cc15628aa5c35e8a9aa99ec09c 100644 (file)
--- a/features/neutron/pom.xml
+++ b/features/neutron/pom.xml
@@ -16,10 +16,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>networkconfig.neutron</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
@@ -57,11 +53,6 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-test</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-test</artifactId>
-      <version>0.7.0-SNAPSHOT</version>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/pom.xml b/pom.xml
index 87a69e00c983bd5da9a232b7a2ace8327bfea792..3bfffaa5d468f30444fa88482ac4b63a2a2787f1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,16 @@
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>opendaylight/commons/parent</relativePath>
   </parent>
+
   <artifactId>releasepom</artifactId>
   <version>0.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+  <name>controller</name> <!-- Used by Sonar to set project name -->
+
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
+
   <modules>
 
     <!-- md-sal -->