aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-10-26 17:11:58 +0000
committerOlivier Lamy <olamy@apache.org>2012-10-26 17:11:58 +0000
commita08f0487f6d5fd2288df589f471eae800f5b5349 (patch)
tree222175b6eebe8a7a1519affa3f25ed4c4c62392e
parent30ffd9ee14cad99bb72590f18b168cda44d5c02e (diff)
downloadarchiva-a08f0487f6d5fd2288df589f471eae800f5b5349.tar.gz
archiva-a08f0487f6d5fd2288df589f471eae800f5b5349.zip
do not inherit javadoc
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1402580 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-base/pom.xml3
-rw-r--r--archiva-modules/pom.xml2
2 files changed, 3 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml
index ab52609e5..eecd404aa 100644
--- 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 9f7dfd6c8..0acc7dca8 100644
--- 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>