Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release Neon
[controller.git]
/
features
/
extras
/
odl-jolokia
/
pom.xml
diff --git
a/features/extras/odl-jolokia/pom.xml
b/features/extras/odl-jolokia/pom.xml
index 45c80d180b2f3488b20d9bf27a7a0f32b7054641..bc07adc2eb7f5baccc8f48f5b2d2e1afd41bd137 100644
(file)
--- a/
features/extras/odl-jolokia/pom.xml
+++ b/
features/extras/odl-jolokia/pom.xml
@@
-6,35
+6,31
@@
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-<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">
+<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.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>
3.0.2
</version>
+ <version>
4.0.9
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>odl-jolokia</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>odl-jolokia</artifactId>
- <version>1.1
0.0-SNAPSHOT
</version>
+ <version>1.1
2.0
</version>
<packaging>feature</packaging>
<name>Jolokia JMX/HTTP bridge</name>
<properties>
<packaging>feature</packaging>
<name>Jolokia JMX/HTTP bridge</name>
<properties>
- <odl-jolokia-osgi.version>0.
7.0-SNAPSHOT
</odl-jolokia-osgi.version>
+ <odl-jolokia-osgi.version>0.
9.0
</odl-jolokia-osgi.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-osgi</artifactId>
</properties>
<dependencies>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-osgi</artifactId>
- <!-- TODO: remove once the version upgrade makes it to odlparent -->
- <version>1.5.0</version>
</dependency>
<dependency>
<!-- finalname="/etc/org.jolokia.osgi.cfg" -->
</dependency>
<dependency>
<!-- finalname="/etc/org.jolokia.osgi.cfg" -->