X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=commons%2Fparent%2Fpom.xml;h=3074cef9fc764bf236d6025734ad1765ee3b6fa3;hb=eeb141311649875c03b5b10ce3a1f3ca3a2b3dcd;hp=3af72ac4b0123eba9c6bd57a1fd4550380963201;hpb=bfbe873febd832fc04254dfa7cf5b94ebd9d2910;p=lispflowmapping.git

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 3af72ac4b..3074cef9f 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -16,6 +16,7 @@
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -30,7 +31,6 @@
     <build.suffix>1.0.0</build.suffix>
     <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
     <config.version>0.3.0-SNAPSHOT</config.version>
-    <controller.checkstyle.version>0.1.0-SNAPSHOT</controller.checkstyle.version>
     <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
     <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
@@ -39,14 +39,14 @@
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
     <lispflowmapping.version>1.2.0-SNAPSHOT</lispflowmapping.version>
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+    <neutron.version>0.5.0-SNAPSHOT</neutron.version>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <nsf.version>0.5.0-SNAPSHOT</nsf.version>
     <sal.version>0.9.0-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-    <sonar.branch>${user.name}-develop</sonar.branch>
-    <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
+    <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
+    <sonar.jacoco.reportPath>target/jacoco.exec</sonar.jacoco.reportPath>
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-    <sonar.language>java</sonar.language>
     <statisticsmanager.version>0.5.0</statisticsmanager.version>
     <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
     <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
@@ -62,21 +62,6 @@
     <dependencies>
       <!-- NOTE: The "Type" jar is considered default. You only need to specify
                  the type when it is something other than jar. -->
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>equinoxSDK381</groupId>
-        <artifactId>org.eclipse.osgi</artifactId>
-        <version>3.8.1.v20120830-144521</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.8.1</version>
-      </dependency>
       <dependency>
         <groupId>junit-addons</groupId>
         <artifactId>junit-addons</artifactId>
@@ -91,7 +76,7 @@
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-core</artifactId>
-        <version>1.3</version>
+        <version>${hamcrest.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jmock</groupId>
@@ -133,14 +118,6 @@
         <artifactId>containermanager</artifactId>
         <version>0.6.0-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>distribution.opendaylight</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
-        <classifier>osgipackage</classifier>
-        <type>zip</type>
-        <!-- Make sure this isn't included on any classpath -->
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>features-adsal</artifactId>
@@ -162,6 +139,13 @@
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.neutron</groupId>
+        <artifactId>features-neutron</artifactId>
+        <version>${neutron.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>features-nsf</artifactId>
@@ -182,8 +166,8 @@
         <version>${config.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>networkconfig.neutron</artifactId>
+        <groupId>org.opendaylight.neutron</groupId>
+        <artifactId>neutron-spi</artifactId>
         <version>0.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>
@@ -294,6 +278,11 @@
         <artifactId>mappingservice.northbound</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.lispflowmapping</groupId>
+        <artifactId>mappingservice.shell</artifactId>
+        <version>${lispflowmapping.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.southbound</artifactId>
@@ -372,12 +361,6 @@
         <version>${lispflowmapping.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>features-test</artifactId>
-        <version>${feature.test.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>mockito-configuration</artifactId>
@@ -418,52 +401,11 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.4.0</version>
-          <extensions>true</extensions>
-          <configuration>
-            <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.4</version>
         </plugin>
-        <plugin>
-          <!-- Define the configuration for the checkstyle plugin.  Import the rules from the controller project, which
-               is defined as a dependency.  Print rule violations to the console, but don't fail the build if violations
-               are found. -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${checkstyle.version}</version>
-          <configuration>
-            <failOnViolation>false</failOnViolation>
-            <configLocation>controller/checkstyle.xml</configLocation>
-            <consoleOutput>true</consoleOutput>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <sourceDirectory>${project.basedir}</sourceDirectory>
-            <includes>**\/*.java,**\/*.xml,**\/*.yang</includes>
-            <excludes>**\/target\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/</excludes>
-          </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>checkstyle</artifactId>
-              <version>${controller.checkstyle.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <!-- TODO move up to ODL parent. -->
           <!-- This is required to make sure that we delete the files which are
@@ -496,30 +438,11 @@
             </filesets>
           </configuration>
         </plugin>
-        <plugin>
-          <!-- this should really be defined in odl parent as it defines what
-               JRE this is targeted for. -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-            <source>${java.version.source}</source>
-            <target>${java.version.target}</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <!-- we are overriding the default version of this plugin here... not
-               sure why. -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.8</version>
-        </plugin>
         <plugin>
           <!-- Configures the java doc generation. Generally you should not have
                to override this unless you need to exclude other packages etc. -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.8.1</version>
           <configuration>
             <doclet>org.jboss.apiviz.APIviz</doclet>
             <docletArtifact>
@@ -550,20 +473,9 @@
             <javadocDir>target/apidocs</javadocDir>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>${releaseplugin.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.14.1</version>
-        </plugin>
         <plugin>
           <groupId>org.codehaus.enunciate</groupId>
           <artifactId>maven-enunciate-plugin</artifactId>
-          <version>${enunciate.version}</version>
           <configuration>
             <configFile>enunciate.xml</configFile>
           </configuration>
@@ -579,7 +491,6 @@
           <!-- TODO: This should be in ODL parent -->
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.8</version>
           <executions>
             <execution>
               <id>add-source</id>
@@ -690,11 +601,6 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
-        </plugin>
         <plugin>
           <!-- here we are defining the default generators for yang You may need
                to override this in child poms if you want to define additional generators,
@@ -730,15 +636,39 @@
       </plugins>
     </pluginManagement>
     <plugins>
-
       <plugin>
-        <!-- This should run on ALL projects because it makes eclipse import
-             the correct source folders to get rid of hte red x's. This should live in
-             ODLPARENT. -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>prepare-ut-agent</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${sonar.jacoco.reportPath}</destFile>
+            </configuration>
+          </execution>
+          <execution>
+            <id>prepare-it-agent</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${sonar.jacoco.itReportPath}</destFile>
+            </configuration>
+          </execution>
+           <execution>
+             <id>post-test</id>
+             <phase>test</phase>
+             <goals>
+               <goal>report</goal>
+             </goals>
+           </execution>
+        </executions>
       </plugin>
-
     </plugins>
   </build>