Format startup archetype much more nicely, and clean up stuff

[controller.git] / opendaylight / archetypes / opendaylight-startup / src / main / resources / archetype-resources / it / pom.xml

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
index b60b82638ffc86cd9890145d32ee5891006e20b6..2b3be10dd4e4b170301141f20d84baf3f666a431 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml
@@ -1,22 +1,21 @@
 <?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
 -->
-
 <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.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}-it</artifactId>
   <version>${version}</version>
@@ -24,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <properties>
     <skipITs>false</skipITs>
-    <karaf.distro.groupId>org.opendaylight.${artifactId}</karaf.distro.groupId>
+    <karaf.distro.groupId>${groupId}</karaf.distro.groupId>
     <karaf.distro.artifactId>${artifactId}-karaf</karaf.distro.artifactId>
     <karaf.distro.version>${version}</karaf.distro.version>
     <karaf.distro.type>zip</karaf.distro.type>
@@ -37,5 +36,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-
-</project>
\ No newline at end of file
+</project>