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-provider
/
pom.xml
diff --git
a/opendaylight/md-sal/samples/toaster-provider/pom.xml
b/opendaylight/md-sal/samples/toaster-provider/pom.xml
index 247105ba9975e72d3c2a7c7c1144ea72c2ce1ebb..cbbd9ee50ab79bb7044ba850fdfcbbca14b28663 100644
(file)
--- a/
opendaylight/md-sal/samples/toaster-provider/pom.xml
+++ b/
opendaylight/md-sal/samples/toaster-provider/pom.xml
@@
-3,41
+3,23
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
config
-parent</artifactId>
- <version>
0.7
.0-SNAPSHOT</version>
- <relativePath>../../
../config/config-
parent</relativePath>
+ <artifactId>
mdsal
-parent</artifactId>
+ <version>
2.0
.0-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
</parent>
<groupId>org.opendaylight.controller.samples</groupId>
<artifactId>sample-toaster-provider</artifactId>
</parent>
<groupId>org.opendaylight.controller.samples</groupId>
<artifactId>sample-toaster-provider</artifactId>
- <version>1.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sample-toaster</artifactId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sample-toaster</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
</dependency>
<dependency>
</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.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-50,31
+32,25
@@
<!-- dependencies to use AbstractDataBrokerTest -->
<dependency>
<!-- dependencies to use AbstractDataBrokerTest -->
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
sal-binding-broker-impl
</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
mdsal-binding-dom-adapter
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-broker-impl</artifactId>
- <type>test-jar</type>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-generator-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- <scope>test</scope>
- </dependency>
- <!-- used to mock up classes -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-runtime-spi</artifactId>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
-
<dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-dom-adapter</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependency>
</dependencies>