do not inherit javadoc

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1402580 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml
index ab52609e523f5297e3e5a877bad187d0691e7c30..eecd404aa7f8c3b6bb32a03b0bfad7fd17e191f8 100644 (file)
--- a/archiva-modules/archiva-base/pom.xml
+++ b/archiva-modules/archiva-base/pom.xml
@@ -16,7 +16,8 @@
   ~ KIND, either express or implied.  See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
-  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.archiva</groupId>

diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 9f7dfd6c8f31b010488921c79c5e13a3bfebd998..0acc7dca8a19776a716b902100852c1a1c79d1f0 100644 (file)
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -102,6 +102,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadocPluginVersion}</version>
+        <inherited>false</inherited>
         <configuration>
           <source>1.5</source>
           <links>
@@ -135,7 +136,6 @@
             </reports>
           </reportSet>
         </reportSets>
-        <!-- <inherited>false</inherited> skygo failing-->
       </plugin>
 
     </plugins>