Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add to jboss repository snapshot and release properties"
[controller.git]
/
opendaylight
/
md-sal
/
sal-compability
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-compability/pom.xml
b/opendaylight/md-sal/sal-compability/pom.xml
index e3d8c589f7e135037ffd57738a0a7e4d700fe7a4..40301a379fe404463adae6e65987fb4260dcbdd9 100644
(file)
--- a/
opendaylight/md-sal/sal-compability/pom.xml
+++ b/
opendaylight/md-sal/sal-compability/pom.xml
@@
-5,7
+5,6
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>../../sal/yang-prototype/sal/pom.xml</relativePath>
</parent>
<artifactId>sal-compability</artifactId>
</parent>
<artifactId>sal-compability</artifactId>
@@
-38,7
+37,6
@@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <type>bundle</type>
<version>14.0.1</version>
</dependency>
</dependencies>
<version>14.0.1</version>
</dependency>
</dependencies>