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 to odlparent 3.1.1
[controller.git]
/
opendaylight
/
archetypes
/
opendaylight-startup
/
src
/
main
/
resources
/
archetype-resources
/
karaf
/
pom.xml
diff --git
a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
index c801b3bfa2d52959df9a1fd9520c765d81c8a1d8..815eb01d5e7bb85cedbc6b7fee14f06aa0db8da3 100644
(file)
--- a/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
+++ b/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
@@
-8,24
+8,28
@@
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
-->
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
-->
-<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>
<parent>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>karaf-parent</artifactId>
- <version>
1.7.0-SNAPSHOT
</version>
+ <groupId>org.opendaylight.
odlparent
</groupId>
+ <artifactId>karaf
4
-parent</artifactId>
+ <version>
3.1.1
</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}-karaf</artifactId>
<version>${version}</version>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}-karaf</artifactId>
<version>${version}</version>
- <
name>${project.artifactId}</name>
-
<prerequisites
>
-
<maven>3.1.1</maven
>
- </prerequisites>
+ <
!-- <name> formatting is used by autorelease to parse and notify projects on
+
build failure. Please do not modify this unless you have a good reason. --
>
+
<name>ODL :: ${groupId} :: ${project.artifactId}</name
>
+
<properties>
<properties>
- <karaf.localFeature>odl-${artifactId}-
ui
</karaf.localFeature>
+ <karaf.localFeature>odl-${artifactId}-
rest
</karaf.localFeature>
</properties>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<dependencyManagement>
<dependencies>
<dependency>
@@
-37,6
+41,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
</dependency>
</dependencies>
</dependencyManagement>
</dependency>
</dependencies>
</dependencyManagement>
+
<dependencies>
<dependency>
<!-- scope is compile so all features (there is only one) are installed
<dependencies>
<dependency>
<!-- scope is compile so all features (there is only one) are installed
@@
-48,15
+53,16
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
- <artifactId>
${artifactId}-features
</artifactId>
+ <artifactId>
features-${artifactId}
</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
</dependencies>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
</dependencies>
- <!-- DO NOT install or deploy the karaf artifact -->
+
<build>
<plugins>
<build>
<plugins>
+ <!-- DO NOT deploy the karaf artifact -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>