X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Farchetypes%2Fpom.xml;h=5bce2eec8a5d09a060880164184b26b8f4d4d036;hb=refs%2Fchanges%2F32%2F75032%2F1;hp=7ffd22c1d3e4c4be4281d3c97195b431b334a959;hpb=c0e813ca83ce80d5f3fb340175ddaecd780c6aea;p=controller.git

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 7ffd22c1d3..5bce2eec8a 100644
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -5,29 +5,36 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.4</version>
+    <version>3.1.3</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller.archetypes</groupId>
   <artifactId>archetypes-parent</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
+  <version>0.7.4-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:2.0.4 -->
     <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.1.3</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 +49,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-help-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
           <output>${project.build.directory}/effective-settings.xml</output>
         </configuration>
@@ -58,7 +64,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-archetype-plugin</artifactId>
-        <version>${maven.archetype.version}</version>
         <configuration>
           <settingsFile>${project.build.directory}/effective-settings.xml</settingsFile>
         </configuration>