Release odlparent

[odlparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index beae01c32eecbff56f5c302e99c295ff7ba9209b..a9e65a1ae895aa15adbbcbd4c34aff1598af3923 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.5-SNAPSHOT</version>
+        <version>13.0.9</version>
         <relativePath>odlparent-lite</relativePath>
     </parent>
 
@@ -48,13 +48,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 +101,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 +130,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 +147,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>