Code Review
/
aaa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump to odlparent 4.0.9
[aaa.git]
/
karaf
/
pom.xml
diff --git
a/karaf/pom.xml
b/karaf/pom.xml
index f4770047fc65d6752631ec62b5c82e88c63f780a..d82d04962ea5c0e69fa1dcfd6bd5b050ccdcf35b 100644
(file)
--- a/
karaf/pom.xml
+++ b/
karaf/pom.xml
@@
-6,24
+6,21
@@
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>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
- <artifactId>karaf-parent</artifactId>
- <version>
1.8.0-SNAPSHOT
</version>
- <relativePath
></relativePath
>
+ <artifactId>karaf
4
-parent</artifactId>
+ <version>
4.0.9
</version>
+ <relativePath
/
>
</parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-karaf</artifactId>
</parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-karaf</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
+ <name>ODL :: aaa :: ${project.artifactId}</name>
<packaging>pom</packaging>
<packaging>pom</packaging>
- <prerequisites>
- <maven>3.1.1</maven>
- </prerequisites>
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>
@@
-49,13
+46,7
@@
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>features-aaa</artifactId>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>features-aaa</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>features-aaa-shiro</artifactId>
+ <version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>