More parent cleanup

[lispflowmapping.git] / commons / parent / pom.xml

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 3ad968dcda35127a2a04486bfad333c6805b5e3f..e55dc34763f2f5c01bcd1b867d2840d9cb5389c1 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 
@@ -50,7 +50,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>4.0.6</version>
+        <version>5.0.3</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>
@@ -231,31 +231,6 @@
             </filesets>
           </configuration>
         </plugin>
-        <plugin>
-          <!-- Configures the java doc generation. Generally you should not have
-               to override this unless you need to exclude other packages etc. -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <doclet>org.jboss.apiviz.APIviz</doclet>
-            <docletArtifact>
-              <groupId>org.jboss.apiviz</groupId>
-              <artifactId>apiviz</artifactId>
-              <version>1.3.2.GA</version>
-            </docletArtifact>
-            <finalName>${project.artifactId}-${project.version}</finalName>
-            <useStandardDocletOptions>true</useStandardDocletOptions>
-            <charset>UTF-8</charset>
-            <encoding>UTF-8</encoding>
-            <docencoding>UTF-8</docencoding>
-            <breakiterator>true</breakiterator>
-            <version>true</version>
-            <author>true</author>
-            <keywords>true</keywords>
-            <excludePackageNames>net.sf.jnetlib.*:cern.*:corejava:*.internal:edu.uci.*</excludePackageNames>
-            <failOnError>false</failOnError>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
@@ -348,66 +323,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <reporting>
-    <outputDirectory>${project.build.directory}/site</outputDirectory>
-    <excludeDefaults>true</excludeDefaults>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <doclet>org.jboss.apiviz.APIviz</doclet>
-          <docletArtifact>
-            <groupId>org.jboss.apiviz</groupId>
-            <artifactId>apiviz</artifactId>
-            <version>1.3.2.GA</version>
-          </docletArtifact>
-          <finalName>${project.artifactId}-${build.suffix}</finalName>
-          <useStandardDocletOptions>true</useStandardDocletOptions>
-          <charset>UTF-8</charset>
-          <encoding>UTF-8</encoding>
-          <docencoding>UTF-8</docencoding>
-          <breakiterator>true</breakiterator>
-          <version>true</version>
-          <author>true</author>
-          <keywords>true</keywords>
-          <excludePackageNames>*.internal:edu.uci.*</excludePackageNames>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <linkJavadoc>true</linkJavadoc>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${projectinfo}</version>
-        <configuration>
-          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-              <report>project-team</report>
-              <report>license</report>
-              <report>mailing-list</report>
-              <report>plugin-management</report>
-              <report>cim</report>
-              <report>issue-tracking</report>
-              <report>scm</report>
-              <report>summary</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>