Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes Ic53c9f04,Iae5644f6,Ib3975607
[transportpce.git]
/
tapi
/
pom.xml
diff --git
a/tapi/pom.xml
b/tapi/pom.xml
index 1195ce3f5de36389c38875dbc50bb07b237a3e89..c8b183509b99409723b6a52537082cc727675184 100644
(file)
--- a/
tapi/pom.xml
+++ b/
tapi/pom.xml
@@
-15,13
+15,13
@@
Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>
5
.0.9</version>
+ <version>
7
.0.9</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.transportpce</groupId>
<artifactId>transportpce-tapi</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.transportpce</groupId>
<artifactId>transportpce-tapi</artifactId>
- <version>
1
.0.0-SNAPSHOT</version>
+ <version>
4
.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencyManagement>
<packaging>bundle</packaging>
<dependencyManagement>
@@
-29,7
+29,7
@@
Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>
5
.0.9</version>
+ <version>
7
.0.9</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<scope>import</scope>
<type>pom</type>
</dependency>
@@
-78,6
+78,14
@@
Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
<version>${project.version}</version>
</dependency>
<version>${project.version}</version>
</dependency>
+ <!-- Sodium bump: javax.annotation.Nullable and friends -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
@@
-100,19
+108,13
@@
Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
<groupId>${project.groupId}</groupId>
<artifactId>test-common</artifactId>
<version>${project.version}</version>
<groupId>${project.groupId}</groupId>
<artifactId>test-common</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
</dependencies>
-<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
- <properties>
- <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
- <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
- </properties>
-
</project>
</project>