From: Michael Vorburger <vorburger@redhat.com>
Date: Mon, 27 Nov 2017 18:24:25 +0000 (+0100)
Subject: Enable archetype self testing
X-Git-Tag: release/oxygen~31
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4b469ed643f0a744819ff7f27956f1c070fb2c30

Enable archetype self testing

this requires https://git.opendaylight.org/gerrit/#/c/65940/

see https://jira.opendaylight.org/browse/CONTROLLER-1799

Change-Id: I1cecbad50abf595f164463deb55bdcda797f5a9e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 0b2ede4b2e..db50dcb8ab 100644
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -14,20 +14,23 @@
   <version>0.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <properties>
-    <!-- TODO Bump maven-archetype-plugin version in odlparent instead of here: -->
-    <maven.archetype.version>3.0.1</maven.archetype.version>
-    <!-- TODO Figure out why SFT fails on archetype self test with:
-         ArtifactResolutionException: Error resolving artifact org.opendaylight.odlparent:opendaylight-karaf-empty:zip:3.0.2 -->
-    <archetype.test.skip>true</archetype.test.skip>
-  </properties>
+  <dependencies>
+    <dependency>
+      <!-- Required for https://jira.opendaylight.org/browse/CONTROLLER-1799
+           but this is only half of the solution; the other half is setting org.ops4j.pax.url.mvn.localRepository -->
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>opendaylight-karaf-empty</artifactId>
+      <version>3.0.2</version>
+      <type>zip</type>
+    </dependency>
+  </dependencies>
 
   <build>
     <extensions>
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
-        <version>${maven.archetype.version}</version>
+        <version>${maven.archetype.plugin.version}</version>
       </extension>
     </extensions>
 
@@ -42,7 +45,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-help-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
           <output>${project.build.directory}/effective-settings.xml</output>
         </configuration>
@@ -58,7 +60,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-archetype-plugin</artifactId>
-        <version>${maven.archetype.version}</version>
         <configuration>
           <settingsFile>${project.build.directory}/effective-settings.xml</settingsFile>
         </configuration>