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 "Bump deps to new Silicon dev versions"
[transportpce.git]
/
networkmodel
/
pom.xml
diff --git
a/networkmodel/pom.xml
b/networkmodel/pom.xml
index 22b82e15c23eaba3115114a57f5eb3942ee25834..11efadc143fba4231119f78f9d5428d7ef93f516 100644
(file)
--- a/
networkmodel/pom.xml
+++ b/
networkmodel/pom.xml
@@
-13,21
+13,21
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>
3.1.6
</version>
+ <version>
8.1.1
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.transportpce</groupId>
<artifactId>transportpce-networkmodel</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.transportpce</groupId>
<artifactId>transportpce-networkmodel</artifactId>
- <version>
0.3
.0-SNAPSHOT</version>
+ <version>
4.0
.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<packaging>bundle</packaging>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.opendaylight.
netconf
</groupId>
- <artifactId>
netconf
-artifacts</artifactId>
- <version>
1.5.2-SNAPSHOT
</version>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
mdsal
-artifacts</artifactId>
+ <version>
7.0.6
</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<scope>import</scope>
<type>pom</type>
</dependency>
@@
-35,42
+35,38
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
</dependencyManagement>
<dependencies>
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>transportpce-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>transportpce-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>transportpce-common</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- Sodium bump: javax.annotation.Nullable and friends -->
<dependency>
<dependency>
- <groupId>${project.groupId}.ordmodels</groupId>
- <artifactId>transportpce-ordmodels-network</artifactId>
- <version>${project.version}</version>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
+ <optional>true</optional>
</dependency>
</dependency>
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>t
ransportpce-renderer
</artifactId>
+ <artifactId>t
est-common
</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-dom-adapter</artifactId>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
-
<dependency>
<dependency>
- <groupId>org.
mockito
</groupId>
- <artifactId>m
ockito-core
</artifactId>
+ <groupId>org.
opendaylight.mdsal
</groupId>
+ <artifactId>m
dsal-binding-dom-adapter
</artifactId>
<scope>test</scope>
<scope>test</scope>
+ <type>test-jar</type>
</dependency>
</dependencies>
</dependency>
</dependencies>
+
</project>
</project>