Karaf integration for plugin2oc - removing white spaces

Change-Id: I4508a7771613ad6eeebddd4eec9728e0b240ee0d
Signed-off-by: pchopra <pchopra@juniper.net>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
new file mode 100755 (executable)
index 0000000..5a3dd71
--- /dev/null
+++ b/distribution-karaf/pom.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<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">\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <parent>\r
+    <artifactId>commons.plugin2oc</artifactId>\r
+    <groupId>org.opendaylight.plugin2oc</groupId>\r
+    <version>0.1</version>\r
+    <relativePath>../commons/parent</relativePath>\r
+</parent>\r
+  <artifactId>distribution-karaf</artifactId>\r
+  <groupId>org.opendaylight.plugin2oc</groupId>\r
+  <packaging>pom</packaging>\r
+  <prerequisites>\r
+    <maven>3.0</maven>\r
+  </prerequisites>\r
+  <properties>\r
+    <branding.version>1.0.0-SNAPSHOT</branding.version>\r
+    <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>\r
+    <karaf.version>3.0.1</karaf.version>\r
+  </properties>\r
+  <dependencies>\r
+    <!-- Basic Karaf dependencies -->\r
+    <dependency>\r
+      <groupId>org.apache.karaf.features</groupId>\r
+      <artifactId>framework</artifactId>\r
+      <version>${karaf.version}</version>\r
+      <type>kar</type>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.karaf.features</groupId>\r
+      <artifactId>standard</artifactId>\r
+      <version>${karaf.version}</version>\r
+      <classifier>features</classifier>\r
+      <type>xml</type>\r
+      <scope>runtime</scope>\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>org.opendaylight.plugin2oc</groupId>\r
+        <artifactId>features-plugin2oc</artifactId>\r
+        <version>0.1</version>\r
+        <classifier>features</classifier>\r
+        <type>xml</type>\r
+        <scope>runtime</scope>\r
+      </dependency>\r
+\r
+    <!-- ODL Branding -->\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>karaf.branding</artifactId>\r
+      <version>${branding.version}</version>\r
+      <scope>compile</scope>\r
+    </dependency>\r
+\r
+    <!-- ODL Resources needed for karaf -->\r
+    <dependency>\r
+      <groupId>org.opendaylight.controller</groupId>\r
+      <artifactId>opendaylight-karaf-resources</artifactId>\r
+      <version>${karaf.resources.version}</version>\r
+    </dependency>\r
+\r
+    <!-- Project local feautures -->\r
+  </dependencies>\r
+  <build>\r
+    <pluginManagement>\r
+      <plugins>\r
+        <plugin>\r
+          <groupId>org.eclipse.m2e</groupId>\r
+          <artifactId>lifecycle-mapping</artifactId>\r
+          <version>1.0.0</version>\r
+          <configuration>\r
+            <lifecycleMappingMetadata>\r
+              <pluginExecutions>\r
+                <pluginExecution>\r
+                  <pluginExecutionFilter>\r
+                    <groupId>org.apache.felix</groupId>\r
+                    <artifactId>maven-bundle-plugin</artifactId>\r
+                    <versionRange>[0,)</versionRange>\r
+                    <goals>\r
+                      <goal>cleanVersions</goal>\r
+                    </goals>\r
+                  </pluginExecutionFilter>\r
+                  <action>\r
+                    <ignore></ignore>\r
+                  </action>\r
+                </pluginExecution>\r
+                <pluginExecution>\r
+                  <pluginExecutionFilter>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-dependency-plugin</artifactId>\r
+                    <versionRange>[0,)</versionRange>\r
+                    <goals>\r
+                      <goal>copy</goal>\r
+                      <goal>unpack</goal>\r
+                    </goals>\r
+                  </pluginExecutionFilter>\r
+                  <action>\r
+                    <ignore></ignore>\r
+                  </action>\r
+                </pluginExecution>\r
+                <pluginExecution>\r
+                  <pluginExecutionFilter>\r
+                    <groupId>org.apache.karaf.tooling</groupId>\r
+                    <artifactId>karaf-maven-plugin</artifactId>\r
+                    <versionRange>[0,)</versionRange>\r
+                    <goals>\r
+                      <goal>commands-generate-help</goal>\r
+                    </goals>\r
+                  </pluginExecutionFilter>\r
+                  <action>\r
+                    <ignore></ignore>\r
+                  </action>\r
+                </pluginExecution>\r
+                <pluginExecution>\r
+                  <pluginExecutionFilter>\r
+                    <groupId>org.fusesource.scalate</groupId>\r
+                    <artifactId>maven-scalate-plugin</artifactId>\r
+                    <versionRange>[0,)</versionRange>\r
+                    <goals>\r
+                      <goal>sitegen</goal>\r
+                    </goals>\r
+                  </pluginExecutionFilter>\r
+                  <action>\r
+                    <ignore></ignore>\r
+                  </action>\r
+                </pluginExecution>\r
+                <pluginExecution>\r
+                  <pluginExecutionFilter>\r
+                    <groupId>org.apache.servicemix.tooling</groupId>\r
+                    <artifactId>depends-maven-plugin</artifactId>\r
+                    <versionRange>[0,)</versionRange>\r
+                    <goals>\r
+                      <goal>generate-depends-file</goal>\r
+                    </goals>\r
+                  </pluginExecutionFilter>\r
+                  <action>\r
+                    <ignore></ignore>\r
+                  </action>\r
+                </pluginExecution>\r
+              </pluginExecutions>\r
+            </lifecycleMappingMetadata>\r
+          </configuration>\r
+        </plugin>\r
+      </plugins>\r
+    </pluginManagement>\r
+    <plugins>\r
+      <plugin>\r
+        <groupId>org.apache.karaf.tooling</groupId>\r
+        <artifactId>karaf-maven-plugin</artifactId>\r
+        <version>${karaf.version}</version>\r
+        <extensions>true</extensions>\r
+        <configuration>\r
+          <bootFeatures>\r
+            <feature>standard</feature>\r
+            <feature>odl-plugin2oc</feature>\r
+            <feature>odl-restconf</feature>\r
+          </bootFeatures>\r
+        </configuration>\r
+        <executions>\r
+          <execution>\r
+            <id>process-resources</id>\r
+            <goals>\r
+              <goal>install-kars</goal>\r
+            </goals>\r
+            <phase>process-resources</phase>\r
+          </execution>\r
+          <execution>\r
+            <id>package</id>\r
+            <goals>\r
+              <goal>instance-create-archive</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-dependency-plugin</artifactId>\r
+        <version>2.6</version>\r
+        <executions>\r
+          <execution>\r
+            <id>copy</id>\r
+            <goals>\r
+              <goal>copy</goal>\r
+            </goals>\r
+            <phase>generate-resources</phase>\r
+            <configuration>\r
+              <artifactItems>\r
+                <artifactItem>\r
+                  <groupId>org.opendaylight.controller</groupId>\r
+                  <artifactId>karaf.branding</artifactId>\r
+                  <version>${karaf.branding.version}</version>\r
+                  <outputDirectory>target/assembly/lib</outputDirectory>\r
+                  <destFileName>karaf.branding-${branding.version}.jar</destFileName>\r
+                </artifactItem>\r
+              </artifactItems>\r
+            </configuration>\r
+          </execution>\r
+          <execution>\r
+            <id>unpack-karaf-resources</id>\r
+            <goals>\r
+              <goal>unpack-dependencies</goal>\r
+            </goals>\r
+            <phase>prepare-package</phase>\r
+            <configuration>\r
+             <outputDirectory>${project.build.directory}/assembly</outputDirectory>\r
+             <groupId>org.opendaylight.controller</groupId>\r
+             <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>\r
+             <excludes>META-INF\/**</excludes>\r
+             <excludeTransitive>true</excludeTransitive>\r
+             <ignorePermissions>false</ignorePermissions>\r
+            </configuration>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-antrun-plugin</artifactId>\r
+        <executions>\r
+            <execution>\r
+                <phase>prepare-package</phase>\r
+                <goals>\r
+                    <goal>run</goal>\r
+                </goals>\r
+                <configuration>\r
+                  <tasks>\r
+                    <chmod perm="755">\r
+                        <fileset dir="${project.build.directory}/assembly/bin">\r
+                          <include name="karaf" />\r
+                          <include name="instance" />\r
+                          <include name="start" />\r
+                          <include name="stop" />\r
+                          <include name="status" />\r
+                          <include name="client" />\r
+                          <include name="shell" />\r
+                        </fileset>\r
+                    </chmod>\r
+                  </tasks>\r
+                </configuration>\r
+            </execution>\r
+        </executions>\r
+      </plugin>\r
+    </plugins>\r
+  </build>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.opendaylight.org:29418/plugin2oc.git</connection>\r
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/plugin2oc.git</developerConnection>\r
+    <tag>HEAD</tag>\r
+    <url>https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=summary</url>\r
+  </scm>\r
+</project>\r

diff --git a/features-plugin2oc/pom.xml b/features-plugin2oc/pom.xml
new file mode 100755 (executable)
index 0000000..7d92be9
--- /dev/null
+++ b/features-plugin2oc/pom.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+ This program and the accompanying materials are made available under the\r
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
+ and is available at http://www.eclipse.org/legal/epl-v10.html\r
+-->\r
+<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">\r
+   <modelVersion>4.0.0</modelVersion>\r
+   <parent>\r
+    <artifactId>plugin2oc.project</artifactId>\r
+    <groupId>org.opendaylight.plugin2oc</groupId>\r
+    <version>0.1</version>\r
+  </parent>\r
+   <artifactId>features-plugin2oc</artifactId>\r
+   <groupId>org.opendaylight.plugin2oc</groupId>\r
+   <packaging>jar</packaging>\r
+   <properties>\r
+      <features.file>features.xml</features.file>\r
+      <branding.version>1.0.0-SNAPSHOT</branding.version>\r
+      <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>\r
+      <karaf.version>3.0.1</karaf.version>\r
+      <feature.test.version>0.6.2-SNAPSHOT</feature.test.version>\r
+      <karaf.empty.version>1.4.2-SNAPSHOT</karaf.empty.version>\r
+      <surefire.version>2.16</surefire.version>\r
+      <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>\r
+   </properties>\r
+\r
+   <dependencies>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <artifactId>sal</artifactId>\r
+            <version>0.8.1-SNAPSHOT</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <artifactId>sal-binding-api</artifactId>\r
+            <version>1.1-SNAPSHOT</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <version>0.4.2-SNAPSHOT</version>\r
+            <artifactId>networkconfig.neutron</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.plugin2oc</groupId>\r
+            <version>0.1</version>\r
+            <artifactId>plugin2oc.neutron</artifactId>\r
+        </dependency>\r
+\r
+   </dependencies>\r
+   <build>\r
+      <resources>\r
+         <resource>\r
+            <directory>src/main/resources</directory>\r
+            <filtering>true</filtering>\r
+         </resource>\r
+      </resources>\r
+      <plugins>\r
+         <plugin>\r
+            <groupId>org.apache.maven.plugins</groupId>\r
+            <artifactId>maven-resources-plugin</artifactId>\r
+            <executions>\r
+               <execution>\r
+                  <id>filter</id>\r
+                  <phase>generate-resources</phase>\r
+                  <goals>\r
+                     <goal>resources</goal>\r
+                  </goals>\r
+               </execution>\r
+            </executions>\r
+         </plugin>\r
+         <plugin>\r
+            <groupId>org.codehaus.mojo</groupId>\r
+            <artifactId>build-helper-maven-plugin</artifactId>\r
+            <executions>\r
+               <execution>\r
+                  <id>attach-artifacts</id>\r
+                  <phase>package</phase>\r
+                  <goals>\r
+                     <goal>attach-artifact</goal>\r
+                  </goals>\r
+                  <configuration>\r
+                     <artifacts>\r
+                        <artifact>\r
+                           <file>${project.build.directory}/classes/${features.file}</file>\r
+                           <type>xml</type>\r
+                           <classifier>features</classifier>\r
+                        </artifact>\r
+                     </artifacts>\r
+                  </configuration>\r
+               </execution>\r
+            </executions>\r
+         </plugin>\r
+         <plugin>\r
+            <groupId>org.apache.maven.plugins</groupId>\r
+            <artifactId>maven-surefire-plugin</artifactId>\r
+            <version>${surefire.version}</version>\r
+            <configuration>\r
+              <systemPropertyVariables>\r
+                <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>\r
+                <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>\r
+                <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>\r
+              </systemPropertyVariables>\r
+              <dependenciesToScan>\r
+               <dependency>org.opendaylight.yangtools:features-test</dependency>\r
+              </dependenciesToScan>\r
+            </configuration>\r
+          </plugin>\r
+      </plugins>\r
+   </build>\r
+   <scm>\r
+      <connection>scm:git:ssh://git.opendaylight.org:29418/plugin2oc.git</connection>\r
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/plugin2oc.git</developerConnection>\r
+      <tag>HEAD</tag>\r
+      <url>https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=summary</url>\r
+   </scm>\r
+</project>\r

diff --git a/features-plugin2oc/src/main/resources/features.xml b/features-plugin2oc/src/main/resources/features.xml
new file mode 100755 (executable)
index 0000000..105770f
--- /dev/null
+++ b/features-plugin2oc/src/main/resources/features.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<features name="odl-plugin2oc-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name='odl-plugin2oc' description="OpenDaylight :: plugin2oc :: Plugin" version='${project.version}'>
+        <bundle>mvn:org.opendaylight.controller/sal/0.8.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-binding-api/1.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.opendaylight.controller/networkconfig.neutron/0.4.2-SNAPSHOT</bundle>
+        <bundle>mvn:org.opendaylight.plugin2oc/plugin2oc.neutron/${project.version}</bundle>
+    </feature>
+</features>

diff --git a/neutron/pom.xml b/neutron/pom.xml
index 5bed3af2f16f615e279858ab15d32f833c8db355..fb42e91eaefd518f76cb5abdfdefa09494670db2 100755 (executable)
--- a/neutron/pom.xml
+++ b/neutron/pom.xml
@@ -1,164 +1,164 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-        <groupId>org.opendaylight.plugin2oc</groupId>
-        <artifactId>commons.plugin2oc</artifactId>
-        <version>0.1</version>
-        <relativePath>../commons/parent</relativePath>
-    </parent>
-    <artifactId>plugin2oc.neutron</artifactId>
-    <version>0.1</version>
-    <packaging>bundle</packaging>
-    <repositories>
-        <repository>
-            <id>juniper-contrail</id>
-            <url>https://github.com/Juniper/contrail-maven/raw/master/releases</url>
-        </repository>
-        <repository>
-            <id>opendaylight-release</id>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release</url>
-        </repository>
-    </repositories>
-    <properties>
-        <guava.version>14.0.1</guava.version>
-        <xtend.version>2.4.3</xtend.version>
-        <bundle.plugin.version>2.4.0</bundle.plugin.version>
-        <maven.clean.plugin.version>2.5</maven.clean.plugin.version>
-        <sonar.host.url> http://localhost:9000/</sonar.host.url>
-    </properties>
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                    <Import-Package>
-                            org.opendaylight.controller.networkconfig.neutron,
-                            org.opendaylight.controller.sal.binding.api,
-                            org.apache.felix.dm,
-                            org.slf4j,
-                            org.apache.http.*;version="4.3.2",
-                            org.osgi.framework,
-                            *
-                        </Import-Package>
-                        <Bundle-Activator>
-                            org.opendaylight.plugin2oc.neutron.Activator
-                        </Bundle-Activator>
-                        <Embed-Dependency>httpclient,httpcore;type=!pom;inline=false</Embed-Dependency>
-                        <Export-Package>
-                            net.juniper.contrail.api.*;version="1.2"
-                        </Export-Package>
-                        <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>net.juniper.contrail</groupId>
-            <artifactId>juniper-contrail-api</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <version>0.4.1</version>
-            <artifactId>networkconfig.neutron</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>4.3.2</version>
-        </dependency>
-        <dependency>
-         <groupId>org.apache.httpcomponents</groupId>
-         <artifactId>httpclient</artifactId>
-         <version>4.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>14.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-exec</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-            <version>0.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.5.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.5.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.15.0-GA</version>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4-legacy</artifactId>
-            <version>1.5.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <version>1.5.4</version>
-        </dependency>
-    </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <parent>\r
+        <groupId>org.opendaylight.plugin2oc</groupId>\r
+        <artifactId>commons.plugin2oc</artifactId>\r
+        <version>0.1</version>\r
+        <relativePath>../commons/parent</relativePath>\r
+    </parent>\r
+    <artifactId>plugin2oc.neutron</artifactId>\r
+    <version>0.1</version>\r
+    <packaging>bundle</packaging>\r
+    <repositories>\r
+        <repository>\r
+            <id>opendaylight-release</id>\r
+            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release</url>\r
+        </repository>\r
+        <repository>\r
+            <id>juniper-contrail</id>\r
+            <url>https://github.com/Juniper/contrail-maven/raw/master/releases</url>\r
+        </repository>\r
+    </repositories>\r
+    <properties>\r
+        <guava.version>14.0.1</guava.version>\r
+        <xtend.version>2.4.3</xtend.version>\r
+        <bundle.plugin.version>2.4.0</bundle.plugin.version>\r
+        <maven.clean.plugin.version>2.5</maven.clean.plugin.version>\r
+        <sonar.host.url> http://localhost:9000/</sonar.host.url>\r
+    </properties>\r
+    <build>\r
+        <defaultGoal>install</defaultGoal>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.felix</groupId>\r
+                <artifactId>maven-bundle-plugin</artifactId>\r
+                <version>2.3.6</version>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <instructions>\r
+                    <Import-Package>\r
+                            org.opendaylight.controller.networkconfig.neutron.*,\r
+                            org.opendaylight.controller.sal.binding.api,\r
+                            org.apache.felix.dm,\r
+                            org.slf4j,\r
+                            org.apache.http.*;version="4.3.2",\r
+                            org.osgi.framework,\r
+                            *\r
+                        </Import-Package>\r
+                        <Bundle-Activator>\r
+                            org.opendaylight.plugin2oc.neutron.Activator\r
+                        </Bundle-Activator>\r
+                        <Embed-Dependency>httpclient,httpcore;type=!pom;inline=false</Embed-Dependency>\r
+                        <Export-Package>\r
+                            net.juniper.contrail.api.*;version="1.2"\r
+                        </Export-Package>\r
+                        <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>net.juniper.contrail</groupId>\r
+            <artifactId>juniper-contrail-api</artifactId>\r
+            <version>1.2</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <version>0.4.2-SNAPSHOT</version>\r
+            <artifactId>networkconfig.neutron</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>junit</groupId>\r
+            <artifactId>junit</artifactId>\r
+            <version>4.10</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+        <groupId>org.apache.httpcomponents</groupId>\r
+        <artifactId>httpcore</artifactId>\r
+        <version>4.3.2</version>\r
+        </dependency>\r
+        <dependency>\r
+         <groupId>org.apache.httpcomponents</groupId>\r
+         <artifactId>httpclient</artifactId>\r
+         <version>4.3.2</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.google.guava</groupId>\r
+            <artifactId>guava</artifactId>\r
+            <version>14.0</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>commons-lang</groupId>\r
+            <artifactId>commons-lang</artifactId>\r
+            <version>2.3</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.commons</groupId>\r
+            <artifactId>commons-exec</artifactId>\r
+            <version>1.1</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>log4j</groupId>\r
+            <artifactId>log4j</artifactId>\r
+            <version>1.2.16</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <artifactId>sal</artifactId>\r
+            <version>0.8.1-SNAPSHOT</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.controller</groupId>\r
+            <artifactId>sal-binding-api</artifactId>\r
+            <version>1.1-SNAPSHOT</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.mockito</groupId>\r
+            <artifactId>mockito-all</artifactId>\r
+            <version>1.9.5</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-module-junit4</artifactId>\r
+            <version>1.5.4</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-api-mockito</artifactId>\r
+            <version>1.5.2</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.javassist</groupId>\r
+            <artifactId>javassist</artifactId>\r
+            <version>3.15.0-GA</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.easymock</groupId>\r
+            <artifactId>easymock</artifactId>\r
+            <version>3.2</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>cglib</groupId>\r
+            <artifactId>cglib-nodep</artifactId>\r
+            <version>2.2</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-module-junit4-legacy</artifactId>\r
+            <version>1.5.4</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-api-easymock</artifactId>\r
+            <version>1.5.4</version>\r
+        </dependency>\r
+    </dependencies>\r
+</project>\r

diff --git a/pom.xml b/pom.xml
index b418b75fb06ed830852fdfa141b875362e173bf3..cc402c45c0d6180fe1fc8793dfb85221808b8e70 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,6 @@
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
-
   <parent>
     <groupId>org.opendaylight.plugin2oc</groupId>
     <artifactId>commons.plugin2oc</artifactId>
@@ -21,5 +20,7 @@
   <modules>
     <module>neutron</module>
     <module>commons/parent</module>
+    <module>features-plugin2oc</module>
+    <module>distribution-karaf</module>
   </modules>
-</project>
\ No newline at end of file
+</project>