From 44bebb09ffdce8576051bfadd120c7a1f5ac5394 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Fri, 8 Aug 2014 16:27:39 +0000
Subject: QPID-5980: final tweaks to resolve javadoc errors and allow use of
 the apache-release profile

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616816 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java   | 2 +-
 qpid/java/qpid-systests-parent/pom.xml                             | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'qpid/java')

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
index ee374e180d..a465813159 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
@@ -27,7 +27,7 @@ public class ConfigFileHelper
 {
     /**
      * Returns absolute paths to the config file(s).
-     * <p/>
+     * <p>
      * If testConfigPath is a directory, its .js and .json files are returned.
      * Otherwise, the returned list just contains testConfigPath.
      */
diff --git a/qpid/java/qpid-systests-parent/pom.xml b/qpid/java/qpid-systests-parent/pom.xml
index ce31f5d1a9..c2b1dfd6a9 100644
--- a/qpid/java/qpid-systests-parent/pom.xml
+++ b/qpid/java/qpid-systests-parent/pom.xml
@@ -229,6 +229,13 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <!--The systests arent currently deployed, and their javadoc is rather broken anyway -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
-- 
cgit v1.2.1