Bump odlparent to 4.0.7

[controller.git] / opendaylight / archetypes / pom.xml

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 7ffd22c1d3e4c4be4281d3c97195b431b334a959..6b3209028a917a6f2fca98559decbe50100cac7f 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -4,73 +4,24 @@
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>2.0.4</version>
+    <artifactId>odlparent-lite</artifactId>
+    <version>4.0.7</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller.archetypes</groupId>
   <artifactId>archetypes-parent</artifactId>
-  <version>0.7.0-SNAPSHOT</version>
+  <version>0.9.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:2.0.4 -->
-    <archetype.test.skip>true</archetype.test.skip>
-  </properties>
-
   <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>
-
-    <plugins>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <configuration>
-            <!-- Required so that .gitignore gets included in archetypes; see https://issues.apache.org/jira/browse/MRESOURCES-190 -->
-            <addDefaultExcludes>false</addDefaultExcludes>
-          </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-help-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <output>${project.build.directory}/effective-settings.xml</output>
-        </configuration>
-        <executions>
-          <execution>
-            <!-- This makes sure we run before maven-archetype-plugin -->
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>effective-settings</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-archetype-plugin</artifactId>
-        <version>${maven.archetype.version}</version>
-        <configuration>
-          <settingsFile>${project.build.directory}/effective-settings.xml</settingsFile>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
   </build>
 
   <modules>