Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reduce JSR305 proliferation
[controller.git]
/
opendaylight
/
md-sal
/
sal-common-impl
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-common-impl/pom.xml
b/opendaylight/md-sal/sal-common-impl/pom.xml
index 1d9745cbf8cba3bfbc8eed3ad9db31033878595c..f11c53e49e566a1b2e2c182da2ef732c950998e3 100644
(file)
--- a/
opendaylight/md-sal/sal-common-impl/pom.xml
+++ b/
opendaylight/md-sal/sal-common-impl/pom.xml
@@
-3,17
+3,17
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <artifactId>mdsal-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
</parent>
+
+ <groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-impl</artifactId>
<artifactId>sal-common-impl</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<packaging>bundle</packaging>
<dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-api</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-api</artifactId>
@@
-30,14
+30,9
@@
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-model-api</artifactId>
</dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-model-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
all
</artifactId>
+ <artifactId>mockito-
core
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-61,6
+56,7
@@
</plugin>
</plugins>
</build>
</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>