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 4.0.2-SNAPSHOT
[controller.git]
/
features
/
odl-jolokia
/
pom.xml
diff --git
a/features/odl-jolokia/pom.xml
b/features/odl-jolokia/pom.xml
index 0e0f06776cec1634792eeaf2c29c8540c2262974..14d507676c1b3d9d131ed9180406f78e66d8757a 100644
(file)
--- a/
features/odl-jolokia/pom.xml
+++ b/
features/odl-jolokia/pom.xml
@@
-8,38
+8,40
@@
-->
<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>
-->
<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>
<parent>
- <groupId>org.opendaylight.
odlparent
</groupId>
+ <groupId>org.opendaylight.
controller
</groupId>
<artifactId>single-feature-parent</artifactId>
<artifactId>single-feature-parent</artifactId>
- <version>
7.0.1
</version>
- <relativePath
/
>
+ <version>
4.0.2-SNAPSHOT
</version>
+ <relativePath
>../single-feature-parent</relativePath
>
</parent>
</parent>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>odl-jolokia</artifactId>
<artifactId>odl-jolokia</artifactId>
- <version>1.15.0-SNAPSHOT</version>
<packaging>feature</packaging>
<packaging>feature</packaging>
-
<name>Jolokia JMX/HTTP bridge</name>
<name>Jolokia JMX/HTTP bridge</name>
- <properties>
- <odl-jolokia-osgi.version>0.12.0-SNAPSHOT</odl-jolokia-osgi.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-osgi</artifactId>
<dependencies>
<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" -->
- <groupId>
${project.groupId}
</groupId>
+ <groupId>
org.opendaylight.controller
</groupId>
<artifactId>odl-jolokia-osgi</artifactId>
<artifactId>odl-jolokia-osgi</artifactId>
- <version>${odl-jolokia-osgi.version}</version>
+ <!-- Note: aligned with feature.xml content -->
+ <version>${project.version}</version>
<type>cfg</type>
<classifier>configuration</classifier>
</dependency>
</dependencies>
<type>cfg</type>
<classifier>configuration</classifier>
</dependency>
</dependencies>
-
</project>
</project>