X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Farchetypes%2Fopendaylight-startup%2Fsrc%2Fmain%2Fresources%2Farchetype-resources%2Ffeatures%2Fpom.xml;h=f481b7796bb7299f59d32d53e1e6c7157e19c3ef;hp=4afbedb76e44ada6766aa119c3b63c8f773d25ff;hb=e7574c267bf058d1af2d0343e2a3d525742d79ff;hpb=ade0f1a0dba585a8be29aa17fe594c161a144d62

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
index 4afbedb76e..f481b7796b 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
@@ -3,31 +3,39 @@
 #set( $symbol_escape = '\' )
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-${copyright} and others. All rights reserved.
+Copyright © ${copyrightYear} ${copyright} and others. All rights reserved.
+
 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
 -->
-<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>features-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
+
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-features</artifactId>
   <version>${version}</version>
-  <name>${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <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>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
+
   <dependencyManagement>
     <dependencies>
       <!-- project specific dependencies -->
@@ -38,14 +46,36 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>restconf-artifacts</artifactId>
+        <version>${restconf.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-yangtools</artifactId>
       <classifier>features</classifier>
-      <version>${yangtools.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
+      <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
@@ -53,15 +83,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
       <classifier>features</classifier>
-      <version>${mdsal.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>
       <classifier>features</classifier>
-      <version>${mdsal.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
@@ -72,14 +100,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <dependency>
       <groupId>${symbol_dollar}{project.groupId}</groupId>
-      <artifactId>${artifactId}-impl</artifactId>
+      <artifactId>${artifactId}-api</artifactId>
       <version>${symbol_dollar}{project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>${symbol_dollar}{project.groupId}</groupId>
-      <artifactId>${artifactId}-api</artifactId>
+      <artifactId>${artifactId}-cli</artifactId>
       <version>${symbol_dollar}{project.version}</version>
     </dependency>
   </dependencies>