Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions by x.y.(z+1)
[openflowplugin.git]
/
extension
/
openflowplugin-extension-nicira
/
pom.xml
diff --git
a/extension/openflowplugin-extension-nicira/pom.xml
b/extension/openflowplugin-extension-nicira/pom.xml
index 38e6c1f9777d57fc44b3c486543fb5b778454f25..c258dcb0eec7020d567853f6c824f7fc6c0301f0 100644
(file)
--- a/
extension/openflowplugin-extension-nicira/pom.xml
+++ b/
extension/openflowplugin-extension-nicira/pom.xml
@@
-4,24
+4,20
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>openflowplugin-
extension-
parent</artifactId>
- <version>0.
6
.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <artifactId>openflowplugin-parent</artifactId>
+ <version>0.
11
.0-SNAPSHOT</version>
+ <relativePath>../
../parent
</relativePath>
</parent>
<artifactId>openflowplugin-extension-nicira</artifactId>
<packaging>bundle</packaging>
</parent>
<artifactId>openflowplugin-extension-nicira</artifactId>
<packaging>bundle</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openflowplugin-extension-api</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openflowplugin-extension-api</artifactId>
@@
-58,18
+54,13
@@
</dependency>
<!-- Test dependencies -->
<dependency>
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>
org.slf4j
</groupId>
- <artifactId>
slf4j-log4j12
</artifactId>
+ <groupId>
pl.pragmatists
</groupId>
+ <artifactId>
JUnitParams
</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>