Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions to 7.0.4-SNAPSHOT
[controller.git]
/
features
/
odl-jolokia
/
pom.xml
diff --git
a/features/odl-jolokia/pom.xml
b/features/odl-jolokia/pom.xml
index 6a8dc576899eca1238d8ded428ade6436966aee5..1a1f23c96e0abc4fc7bb1a7ce13e71d33ff8a9f9 100644
(file)
--- a/
features/odl-jolokia/pom.xml
+++ b/
features/odl-jolokia/pom.xml
@@
-11,7
+11,7
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>
2
.0.4-SNAPSHOT</version>
+ <version>
7
.0.4-SNAPSHOT</version>
<relativePath>../single-feature-parent</relativePath>
</parent>
<relativePath>../single-feature-parent</relativePath>
</parent>
@@
-23,6
+23,16
@@
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-osgi</artifactId>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-osgi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jolokia</groupId>
+ <artifactId>jolokia-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jolokia</groupId>
+ <artifactId>jolokia-jsr160</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<!-- finalname="/etc/org.jolokia.osgi.cfg" -->
</dependency>
<dependency>
<!-- finalname="/etc/org.jolokia.osgi.cfg" -->