for plugin configuration etc. -->
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
+ <relativePath/>
</parent>
<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>lispflowmapping-commons</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Parent POM</name>
- <description></description>
<properties>
- <branding.version>1.1.0-SNAPSHOT</branding.version>
+ <branding.version>1.2.0-SNAPSHOT</branding.version>
<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>
+ <clustering.services.version>0.7.0-SNAPSHOT</clustering.services.version>
+ <config.version>0.4.0-SNAPSHOT</config.version>
+ <feature.test.version>0.8.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>
+ <ietf-inet-types.version>2010.09.24.8-SNAPSHOT</ietf-inet-types.version>
<jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
- <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
- <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>
+ <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
+ <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
+ <lispflowmapping.version>1.3.0-SNAPSHOT</lispflowmapping.version>
+ <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+ <neutron.version>0.6.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>
+ <nsf.version>0.6.0-SNAPSHOT</nsf.version>
+ <sal.version>0.10.0-SNAPSHOT</sal.version>
<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+ <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>
<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>
- <yang.binding.version>0.6.1</yang.binding.version>
- <yang.codegen.version>0.6.1</yang.codegen.version>
<yang.src.path>src/main/yang</yang.src.path>
- <yang.version>0.6.1</yang.version>
- <yangtools.binding.version>0.6.1</yangtools.binding.version>
- <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+ <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
</properties>
<dependencyManagement>
<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>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
+ <version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-legacy</artifactId>
<version>2.6.0</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>clustering.services</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>commons.northbound</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-api</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-util</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>containermanager</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.4.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>
- <version>${sal.version}</version>
+ <artifactId>features-mdsal</artifactId>
+ <version>${mdsal.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal</artifactId>
+ <artifactId>features-restconf</artifactId>
<version>${mdsal.version}</version>
<classifier>features</classifier>
<type>xml</type>
<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>
<artifactId>netty-event-executor-config</artifactId>
<version>${config.version}</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>networkconfig.neutron</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>opendaylight-karaf-empty</artifactId>
<artifactId>opendaylight-karaf-resources</artifactId>
<version>${karaf.resources.version}</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-api</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>threadpool-config-impl</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>mappingservice.implementation</artifactId>
<version>${lispflowmapping.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.opendaylight.lispflowmapping</groupId>
+ <artifactId>mappingservice.inmemorydb</artifactId>
+ <version>${lispflowmapping.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>mappingservice.netconf</artifactId>
<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>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-api</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-util</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-model-api</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-inet-types</artifactId>
- <version>2010.09.24.7-SNAPSHOT</version>
+ <version>${ietf-inet-types.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-yang-types</artifactId>
- <version>2010.09.24.7-SNAPSHOT</version>
+ <version>${ietf-inet-types.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<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>
</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
</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>
<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>
- <executions>
- <execution>
- <goals>
- <goal>docs</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<!-- 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>
<ignore></ignore>
</action>
</pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
- <versionRange>[0.0,)</versionRange>
- <goals>
- <goal>docs</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jacoco</groupId>
</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,
</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.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>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
-
</plugins>
</build>
Code Review / lispflowmapping.git / blobdiff