Switched to basing the local distribution on controller

This reduces the number of steps for a change in controller
to be pulled into openflowplugin/distribution/base

Before you'd have to build controller, then integration,
the openflowplugin.  Now you just have to build controller
then openflowplugin.

Change-Id: I0dc70c94b38a2475773bd5fc40e2a43a1dcf0e0b
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/distribution/base/pom.xml b/distribution/base/pom.xml
index 53610be19a2d00703ddde30721d5039dc9c8752a..ba25d0fb6b1c2835d634d89b4349dd6eb24fcd3a 100644 (file)
--- a/distribution/base/pom.xml
+++ b/distribution/base/pom.xml
@@ -23,9 +23,9 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <!-- base distribution -->
 
     <dependency>
-      <groupId>org.opendaylight.integration</groupId>
-      <artifactId>distributions-base</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>distribution.opendaylight</artifactId>
+      <version>0.1.1-SNAPSHOT</version>
       <type>zip</type>
       <classifier>osgipackage</classifier>
       <!-- Make sure this isn't included on any classpath-->
@@ -77,8 +77,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
             <phase>generate-resources</phase>
             <configuration>
              <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-             <includeArtifacIds>distributions-base</includeArtifacIds>
-             <includeGroupIds>org.opendaylight.integration</includeGroupIds>
+             <includeArtifacIds>distribution.opendaylight</includeArtifacIds>
+             <includeGroupIds>org.opendaylight.controller</includeGroupIds>
              <excludeTransitive>true</excludeTransitive>
              <ignorePermissions>false</ignorePermissions>
             </configuration>