terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-<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">
+<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">
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>0.14.0-SNAPSHOT</version>
+ <version>7.0.6</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.netvirt</groupId>
<artifactId>binding-parent</artifactId>
<name>ODL :: netvirt :: ${project.artifactId}</name>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <controller.mdsal.version>1.9.0-SNAPSHOT</controller.mdsal.version>
- <genius.version>0.6.0-SNAPSHOT</genius.version>
- <infrautils.version>1.5.0-SNAPSHOT</infrautils.version>
- <model.bgp.version>2013.07.15.14.0-SNAPSHOT</model.bgp.version>
- <neutron.version>0.12.0-SNAPSHOT</neutron.version>
- <openflowplugin.version>0.8.0-SNAPSHOT</openflowplugin.version>
- <ovsdb.version>1.8.0-SNAPSHOT</ovsdb.version>
+ <genius.version>0.10.0-SNAPSHOT</genius.version>
+ <model.bgp.version>2013.07.15.18.0-SNAPSHOT</model.bgp.version>
+ <neutron.version>0.16.0</neutron.version>
+ <openflowplugin.version>0.12.0</openflowplugin.version>
+ <ovsdb.version>1.12.0</ovsdb.version>
+ <serviceutils.version>0.7.0</serviceutils.version>
</properties>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.opendaylight.infrautils</groupId>
+ <artifactId>infrautils-artifacts</artifactId>
+ <version>1.9.6</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${controller.mdsal.version}</version>
+ <artifactId>controller-artifacts</artifactId>
+ <version>3.0.7</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.serviceutils</groupId>
+ <artifactId>serviceutils-artifacts</artifactId>
+ <version>${serviceutils.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowplugin</groupId>
+ <artifactId>openflowplugin-artifacts</artifactId>
+ <version>${openflowplugin.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.sonarsource.java</groupId>
- <artifactId>sonar-jacoco-listeners</artifactId>
- <version>${sonar-jacoco-listeners.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Ensure that annotation dependencies are optional throughout -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
- <!-- Third-party plugins, grouped by groupId, alpha-sorted by artifactId -->
+ <!-- Third-party plugins, grouped by groupId, alpha-sorted by artifactId -->
<plugin>
<!-- Support Blueprint XML construction using annotations -->
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin</artifactId>
- <version>1.4.0</version>
<configuration>
<scanPaths>
<scanPath>org.opendaylight.netvirt</scanPath>
</scanPaths>
</configuration>
- <dependencies>
- <dependency>
- <!-- See https://issues.apache.org/jira/browse/ARIES-1596 -->
- <!-- This shouldn't be necessary with plugin version 1.5.0 -->
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- <version>4.5</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>blueprint-generate</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<dependency>
<groupId>org.opendaylight.netvirt</groupId>
<artifactId>checkstyle</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
<includeResources>false</includeResources>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
<includeTestResources>false</includeTestResources>
- <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <sourceDirectories>
+ <directory>${project.build.sourceDirectory}</directory>
+ </sourceDirectories>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
</configuration>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
- <plugins>
- <plugin>
- <groupId>jp.skypencil.findbugs.slf4j</groupId>
- <artifactId>bug-pattern</artifactId>
- <version>1.4.0</version>
- </plugin>
- </plugins>
<failOnError>true</failOnError>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <properties>
- <property>
- <name>listener</name>
- <value>org.sonar.java.jacoco.JUnitListener</value>
- </property>
- </properties>
- </configuration>
- </plugin>
</plugins>
</build>