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 upstreams
[openflowplugin.git]
/
applications
/
topology-manager
/
pom.xml
diff --git
a/applications/topology-manager/pom.xml
b/applications/topology-manager/pom.xml
index 22def068155d62269170b6068fe8ef7154da264d..d346fe0408d3cca597a0e5ebd0419237cccf0f80 100644
(file)
--- a/
applications/topology-manager/pom.xml
+++ b/
applications/topology-manager/pom.xml
@@
-2,44
+2,28
@@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
config
-parent</artifactId>
- <version>0.
8
.0-SNAPSHOT</version>
- <relativePath
/
>
+ <groupId>org.opendaylight.
openflowplugin
</groupId>
+ <artifactId>
openflowplugin
-parent</artifactId>
+ <version>0.
17
.0-SNAPSHOT</version>
+ <relativePath
>../../parent</relativePath
>
</parent>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>topology-manager</artifactId>
</parent>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
<artifactId>topology-manager</artifactId>
- <version>0.
6
.0-SNAPSHOT</version>
+ <version>0.
17
.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>openflowplugin-artifacts</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-config</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
sal-binding-util
</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
mdsal-singleton-common-api
</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin.model</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin.model</groupId>
@@
-50,29
+34,30
@@
<artifactId>openflowplugin-common</artifactId>
</dependency>
<dependency>
<artifactId>openflowplugin-common</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
.model</groupId>
+ <groupId>org.opendaylight.
openflowplugin
.model</groupId>
<artifactId>model-inventory</artifactId>
</dependency>
<dependency>
<artifactId>model-inventory</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
.model</groupId>
+ <groupId>org.opendaylight.
openflowplugin
.model</groupId>
<artifactId>model-topology</artifactId>
</dependency>
<dependency>
<artifactId>model-topology</artifactId>
</dependency>
<dependency>
- <groupId>
junit
</groupId>
- <artifactId>
junit
</artifactId>
- <
scope>test</scope
>
+ <groupId>
com.github.spotbugs
</groupId>
+ <artifactId>
spotbugs-annotations
</artifactId>
+ <
optional>true</optional
>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
org.mockito
</groupId>
- <artifactId>
mockito-core
</artifactId>
- <
scope>test</scope
>
+ <groupId>
com.guicedee.services
</groupId>
+ <artifactId>
javax.inject
</artifactId>
+ <
optional>true</optional
>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
org.slf4j
</groupId>
- <artifactId>
slf4j-log4j12
</artifactId>
- <
scope>test</scope
>
+ <groupId>
jakarta.annotation
</groupId>
+ <artifactId>
jakarta.annotation-api
</artifactId>
+ <
optional>true</optional
>
</dependency>
</dependencies>
</dependency>
</dependencies>
+
<scm>
<connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
<scm>
<connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
@@
-80,5
+65,4
@@
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>
-
</project>
</project>