james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rouaz...@apache.org
Subject [james-project] 14/29: JAMES-2855 Upgrade JavaDoc plugin to 3.1.1
Date Tue, 03 Sep 2019 15:40:06 GMT
This is an automated email from the ASF dual-hosted git repository.

rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 959662d7bc7cbfa04a5c7d783d165af484268e58
Author: Benoit Tellier <btellier@linagora.com>
AuthorDate: Wed Aug 28 15:08:06 2019 +0700

    JAMES-2855 Upgrade JavaDoc plugin to 3.1.1
---
 .../org/apache/james/mpt/host/ExternalHostSystem.java   |  2 +-
 .../james/mpt/protocol/FileProtocolSessionBuilder.java  |  2 +-
 .../org/apache/james/mpt/protocol/ProtocolSession.java  | 17 +++--------------
 .../james/mpt/protocol/ProtocolSessionBuilder.java      |  2 +-
 .../mpt/script/GenericSimpleScriptedTestProtocol.java   |  2 --
 pom.xml                                                 |  2 +-
 6 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
index 59f524e..081de7a 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
@@ -39,7 +39,7 @@ import org.apache.james.util.Port;
  * <p>
  * This is typically used for functional integration testing of a complete
  * server system (including sockets). Apache James MPT AntLib provides an <a
- * href='http://ant.apache.org' rel='tag'>Ant</a> task suitable for this use
+ * href='http://ant.apache.org'>Ant</a> task suitable for this use
  * case.
  * </p>
  */
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
index 9185782..4f6db47 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
@@ -30,7 +30,7 @@ import org.apache.james.mpt.protocol.ProtocolSession.TimerCommand;
 /**
  * A builder which generates a ProtocolSession from a test file.
  * 
- * @author Darrell DeBoer <darrell@apache.org>
+ * @author Darrell DeBoer &lt;darrell@apache.org&gt;
  * 
  * @version $Revision$
  */
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
index add4a25..64fa886 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
@@ -41,7 +41,7 @@ import com.google.common.base.Stopwatch;
  * itself be a permissible ProtocolElement, so that we can nest and reuse
  * sessions.
  * 
- * @author Darrell DeBoer <darrell@apache.org>
+ * @author Darrell DeBoer &lt;darrell@apache.org&gt;
  */
 public class ProtocolSession implements ProtocolInteractor {
 
@@ -95,11 +95,6 @@ public class ProtocolSession implements ProtocolInteractor {
      * order that they appear in the test elements. The index of a reader/writer
      * in the array corresponds to the number of the session. If an exception
      * occurs, no more test elements are executed.
-     * 
-     * @param out
-     *            The client requests are written to here.
-     * @param in
-     *            The server responses are read from here.
      */
     public void runSessions(Session[] sessions) throws Exception {
         this.sessions = sessions;
@@ -334,11 +329,7 @@ public class ProtocolSession implements ProtocolInteractor {
          * expected regular expression. If the sessionNumber == -1, then all
          * readers are tested, otherwise, only the reader for this session is
          * tested.
-         * 
-         * @param out
-         *            Is ignored.
-         * @param in
-         *            The server response is read from here.
+         *
          * @throws InvalidServerResponseException
          *             If the actual server response didn't match the regular
          *             expression expected.
@@ -444,9 +435,7 @@ public class ProtocolSession implements ProtocolInteractor {
          * Reads lines from the server response and matches them against the
          * list of expected regular expressions. Each regular expression in the
          * expected list must be matched by only one server response line.
-         * 
-         * @param reader
-         *            Server responses are read from here.
+         *
          * @throws InvalidServerResponseException
          *             If a line is encountered which doesn't match one of the
          *             expected lines.
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
index 0d52c9e..fb7dcd8 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
@@ -33,7 +33,7 @@ import org.apache.james.mpt.api.ProtocolInteractor;
 /**
  * A builder which generates scripts from textual input.
  * 
- * @author Darrell DeBoer <darrell@apache.org>
+ * @author Darrell DeBoer &lt;darrell@apache.org&gt;
  * 
  * @version $Revision$
  */
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
index 6fcf292..b4569b4 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java
@@ -116,8 +116,6 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem,
SelfT exten
     /**
      * Reads test elements from the protocol session file and adds them to the
      * {@link #testElements} ProtocolSession. Then calls {@link #runSessions}.
-     * @param locale
-     *            execute the test using this locale
      */
     public void run(String fileName) throws Exception {
         prepare();
diff --git a/pom.xml b/pom.xml
index 1d275df..7e4b400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2795,7 +2795,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                    <version>3.1.1</version>
                     <configuration>
                         <linksource>true</linksource>
                         <maxmemory>1g</maxmemory>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message