Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Cleanup versions across modules
[controller.git]
/
opendaylight
/
md-sal
/
samples
/
toaster-consumer
/
pom.xml
diff --git
a/opendaylight/md-sal/samples/toaster-consumer/pom.xml
b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
index 30cef8f27b4a3ab670a3b47e6fbc23f8805bcc52..2a4e22a7b9d708701e0dcd21e2f00147186c0ad5 100644
(file)
--- a/
opendaylight/md-sal/samples/toaster-consumer/pom.xml
+++ b/
opendaylight/md-sal/samples/toaster-consumer/pom.xml
@@
-2,29
+2,16
@@
<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.
mdsal
</groupId>
- <artifactId>
binding
-parent</artifactId>
- <version>
0.1
0.0-SNAPSHOT</version>
- <relativePath
/
>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>
mdsal
-parent</artifactId>
+ <version>
2.
0.0-SNAPSHOT</version>
+ <relativePath
>../../parent</relativePath
>
</parent>
<groupId>org.opendaylight.controller.samples</groupId>
</parent>
<groupId>org.opendaylight.controller.samples</groupId>
- <version>1.5.0-SNAPSHOT</version>
<artifactId>sample-toaster-consumer</artifactId>
<packaging>bundle</packaging>
<artifactId>sample-toaster-consumer</artifactId>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-35,12
+22,8
@@
<artifactId>sal-common-util</artifactId>
</dependency>
<dependency>
<artifactId>sal-common-util</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>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@
-48,14
+31,6
@@
</dependency>
</dependencies>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
<scm>
<connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
<scm>
<connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>