summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-08-08 16:27:39 +0000
committerRobert Gemmell <robbie@apache.org>2014-08-08 16:27:39 +0000
commit44bebb09ffdce8576051bfadd120c7a1f5ac5394 (patch)
tree9d414d9c0f365cb63a3e7d096bafbce0b9ec65f8 /qpid/java
parentddb91338d5920311f9f7a4493df26c8c9e108e3d (diff)
downloadqpid-python-44bebb09ffdce8576051bfadd120c7a1f5ac5394.tar.gz
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
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java2
-rw-r--r--qpid/java/qpid-systests-parent/pom.xml7
2 files changed, 8 insertions, 1 deletions
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>