X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=a7c285b32fa396ab018800f95e949b81f038e090;hb=refs%2Fchanges%2F27%2F110727%2F1;hp=c01c2860d64bb83f815dece84ad6f0c63103353d;hpb=cc4b2685e8a23ab3ceb87c03ad7527f34651f807;p=odlparent.git

diff --git a/pom.xml b/pom.xml
index c01c2860d..a7c285b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.2-SNAPSHOT</version>
+        <version>13.1.0-SNAPSHOT</version>
         <relativePath>odlparent-lite</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</developerConnection>
         <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/ODL_Root_Parent:Main</url>
+        <url>https://wiki.opendaylight.org/display/ODL/ODL+Root+Parent</url>
     </scm>
 
     <properties>
@@ -41,6 +41,8 @@
         <module>bundles-test-lib</module>
         <module>bundles4-test</module>
         <module>features-test</module>
+        <module>features-test-plugin</module>
+        <module>features-test-plugin-it</module>
 
         <!-- Karaf integration -->
         <module>karaf</module>
@@ -48,13 +50,21 @@
         <module>karaf-util</module>
 
         <!-- Parent POMs -->
+        <module>bnd-parent</module>
         <module>bundle-parent</module>
-        <module>untested-single-feature-parent</module>
+        <module>abstract-feature-parent</module>
         <module>single-feature-parent</module>
+        <module>template-feature-parent</module>
         <module>feature-repo-parent</module>
         <module>odlparent</module>
         <module>odlparent-lite</module>
 
+        <!-- Plugin for processing templates for Karaf features -->
+        <module>template-feature-plugin</module>
+
+        <!-- File copying plugin -->
+        <module>copy-files-plugin</module>
+
         <!-- Manifest filtering plugin -->
         <module>filter-manifest-plugin</module>
 
@@ -93,7 +103,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.4.0</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>
@@ -122,12 +132,6 @@
                         <artifactId>jacoco-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <!-- Step one:
-
-                                    merge all .exec files into a single file into this project's
-                                    ${project.build.directory}/jacoco.exec. Note we are being explicit so as
-                                    to override the odlparent/pom.xml override
-                                -->
                                 <id>merge</id>
                                 <goals>
                                     <goal>merge</goal>
@@ -145,21 +149,6 @@
                                     </fileSets>
                                 </configuration>
                             </execution>
-                            <execution>
-                                <!-- Step two:
-
-                                    pick the merged execution file and produce a complete aggregate report,
-                                    including HTML/XML/CSV.
-                                 -->
-                                <id>report</id>
-                                <goals>
-                                    <goal>report-aggregate</goal>
-                                </goals>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <dataFileIncludes>${odl.jacoco.aggregateFile}</dataFileIncludes>
-                                </configuration>
-                            </execution>
                         </executions>
                     </plugin>
                 </plugins>