BUG-4259: fix config artifact references

This got broken in the migration where netconf moved from
org.opendaylight.controller namespace.

Also fixes netconf-it module being configured to build twice. The root
pom as well as the netconf parent both had a profile to build netconf-it
only one is needed.

Change-Id: I5dce4e9802f08efdcc866c9992b3bae9f49190ac
Also-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml
index e0bd3de31a9d0dc5b9b15dcce9cda6bbafe2eda0..f26e91d57191608473bfcf89a37d6bea3c32bf9d 100644 (file)
--- a/opendaylight/netconf/netconf-it/pom.xml
+++ b/opendaylight/netconf/netconf-it/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <!-- compile dependencies -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
       <scope>test</scope>
     </dependency>
@@ -146,7 +146,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.controller</groupId>
       <artifactId>netty-config-api</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index b2d5e2a77373f1eb5a39cc24e10ecdb9343533da..cf719572ac52705c9ca18280f7364f9b6131084a 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -171,16 +171,4 @@
 
     </dependencies>
   </dependencyManagement>
-
-  <profiles>
-    <profile>
-      <id>integrationtests</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <modules>
-        <module>netconf-it</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>