Fix archetype compilation

Change-Id: I9217cb78881118c46c81f7c5d4f8c9bafe82d3fd
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 684c48aba29d1c87190679ed1409d506f59f967e)

diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml
index 61ee6f8b6ef8f1a37d071c316aed4840e84ce570..d6687175d7fb59ccaed912f3e2e57b9d47c5283e 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/pom.xml
@@ -2,6 +2,12 @@
 <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.archetypes</groupId>
+     <artifactId>archetypes-parent</artifactId>
+     <version>0.2.0-SNAPSHOT</version>
+  </parent>
+
   <groupId>org.opendaylight.controller.archetypes</groupId>
   <artifactId>odl-model-project</artifactId>
   <version>1.3.0-SNAPSHOT</version>
@@ -29,22 +35,6 @@
         <version>2.2</version>
       </extension>
     </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>2.2</version>
-          <dependencies>
-            <dependency>
-              <groupId>commons-lang</groupId>
-              <artifactId>commons-lang</artifactId>
-              <version>2.6</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
   <distributionManagement>

diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
index 0a984de6b475602b5eedcade107a7178db014d11..60ad33d7a425b38efe7a2f4e68a2100228c75a9b 100644 (file)
--- a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
+++ b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
@@ -2,6 +2,12 @@
 <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.archetypes</groupId>
+     <artifactId>archetypes-parent</artifactId>
+     <version>0.2.0-SNAPSHOT</version>
+  </parent>
+
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>opendaylight-configfile-archetype</artifactId>
   <version>1.3.0-SNAPSHOT</version>

diff --git a/opendaylight/archetypes/opendaylight-startup/pom.xml b/opendaylight/archetypes/opendaylight-startup/pom.xml
index 9d08cb119eccf28c64c9479fe35bcaae3c682061..62b408401484f03e99b01890889738890ee3c1e0 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/pom.xml
@@ -2,6 +2,12 @@
 <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.archetypes</groupId>
+     <artifactId>archetypes-parent</artifactId>
+     <version>0.2.0-SNAPSHOT</version>
+  </parent>
+
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>opendaylight-startup-archetype</artifactId>
   <version>1.1.0-SNAPSHOT</version>

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index c93759139ff912c11a253babc0e7cc70a555a3d0..a12abca7407ca31b16016458f8ad7c461939b0ff 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -34,6 +34,25 @@
       <url>${sitedeploy}</url>
     </site>
   </distributionManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>2.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>commons-lang</groupId>
+              <artifactId>commons-lang</artifactId>
+              <version>2.6</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
   <modules>
     <module>odl-model-project</module>
     <module>opendaylight-configfile-archetype</module>