diff options
13 files changed, 40 insertions, 22 deletions
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index effb8d4945..3e0b32bf45 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -27,6 +27,10 @@ JUnit tests for the various ant tasks. </description> + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 2c1b13429d..fea9da52f9 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -27,6 +27,10 @@ Tests for the LFS server. </description> + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 262258c2dc..7c1ab5846d 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -27,6 +27,10 @@ Tests for the Large File Extension (LFS). </description> + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 85f96c597f..83d5369363 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -27,6 +27,10 @@ Tests for command line client tools built on top of JGit. </description> + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java index f7b37d7816..e2dbb4c466 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java @@ -71,9 +71,9 @@ public class JGitClientSession extends ClientSessionImpl { /** * Default setting for the maximum number of bytes to read in the initial - * protocol version exchange. 64kb is what OpenSSH < 8.0 read; OpenSSH 8.0 - * changed it to 8Mb, but that seems excessive for the purpose stated in RFC - * 4253. The Apache MINA sshd default in + * protocol version exchange. 64kb is what OpenSSH < 8.0 read; OpenSSH + * 8.0 changed it to 8Mb, but that seems excessive for the purpose stated in + * RFC 4253. The Apache MINA sshd default in * {@link org.apache.sshd.core.CoreModuleProperties#MAX_IDENTIFICATION_SIZE} * is 16kb. */ diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/AbstractClientProxyConnector.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/AbstractClientProxyConnector.java index ae2b2b6acc..a8e33af35e 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/AbstractClientProxyConnector.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/AbstractClientProxyConnector.java @@ -105,7 +105,7 @@ public abstract class AbstractClientProxyConnector /** * Obtains the timeout for the whole rest of the proxy connection protocol. * - * @return the timeout in milliseconds, always > 0L + * @return the timeout in milliseconds, always > 0L */ protected long getTimeout() { long last = lastProxyOperationTime; diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProvider.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProvider.java index acc11cefb1..ed9fe37d5c 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProvider.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProvider.java @@ -31,7 +31,7 @@ public interface KeyPasswordProvider { * identifying the key resource that is being attempted to be * loaded * @param attempt - * the number of previous attempts to get a passphrase; >= 0 + * the number of previous attempts to get a passphrase; >= 0 * @return the passphrase * @throws IOException * if no password can be obtained @@ -44,7 +44,7 @@ public interface KeyPasswordProvider { * * @param maxNumberOfAttempts * number of times to ask for a passphrase; - * {@link IllegalArgumentException} may be thrown if <= 0 + * {@link IllegalArgumentException} may be thrown if <= 0 */ void setAttempts(int maxNumberOfAttempts); @@ -53,7 +53,7 @@ public interface KeyPasswordProvider { * attempted for one identity resource through this provider. The default * return 1. * - * @return the number of times to ask for a passphrase; should be >= 1. + * @return the number of times to ask for a passphrase; should be >= 1. */ default int getAttempts() { return 1; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/Candidate.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/Candidate.java index b69bb8f3ee..ca5370e912 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/Candidate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/Candidate.java @@ -71,12 +71,12 @@ class Candidate { /** * Score assigned to the rename to this candidate. * <p> - * Consider the history "A<-B<-C". If the result file S in C was renamed to - * R in B, the rename score for this rename will be held in this field by - * the candidate object for B. By storing the score with B, the application - * can see what the rename score was as it makes the transition from C/S to - * B/R. This may seem backwards since it was C that performed the rename, - * but the application doesn't learn about path R until B. + * Consider the history "A<-B<-C". If the result file S in C was + * renamed to R in B, the rename score for this rename will be held in this + * field by the candidate object for B. By storing the score with B, the + * application can see what the rename score was as it makes the transition + * from C/S to B/R. This may seem backwards since it was C that performed + * the rename, but the application doesn't learn about path R until B. */ int renameScore; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/Region.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/Region.java index e226dbf3cc..2236eecbfe 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/Region.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/Region.java @@ -27,7 +27,7 @@ class Region { /** First position in the {@link Candidate} that owns this Region. */ int sourceStart; - /** Length of the region, always >= 1. */ + /** Length of the region, always >= 1. */ int length; Region(int rs, int ss, int len) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java index 07162db4ce..e0c1e93918 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheTree.java @@ -280,12 +280,12 @@ public class DirCacheTree { * number of bytes of <code>cache[cacheIdx].path</code> that * matches this tree's path. The value at array position * <code>cache[cacheIdx].path[pathOff-1]</code> is always '/' if - * <code>pathOff</code> is > 0. + * <code>pathOff</code> is > 0. * @param ow * the writer to use when serializing to the store. * @return identity of this tree. * @throws UnmergedPathException - * one or more paths contain higher-order stages (stage > 0), + * one or more paths contain higher-order stages (stage > 0), * which cannot be stored in a tree object. * @throws IOException * an unexpected error occurred writing to the object store. @@ -401,7 +401,7 @@ public class DirCacheTree { * number of bytes of <code>cache[cacheIdx].path</code> that * matches this tree's path. The value at array position * <code>cache[cacheIdx].path[pathOff-1]</code> is always '/' if - * <code>pathOff</code> is > 0. + * <code>pathOff</code> is > 0. */ void validate(final DirCacheEntry[] cache, final int cCnt, int cIdx, final int pathOff) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 40c075ec5e..93c6201597 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1530,7 +1530,8 @@ public class GC { } /** - * @return {@code true} if number of packs > gc.autopacklimit (default 50) + * @return {@code true} if number of packs > gc.autopacklimit (default + * 50) */ boolean tooManyPacks() { int autopacklimit = repo.getConfig().getInt( @@ -1549,7 +1550,8 @@ public class GC { * Quickly estimate number of loose objects, SHA1 is distributed evenly so * counting objects in one directory (bucket 17) is sufficient * - * @return {@code true} if number of loose objects > gc.auto (default 6700) + * @return {@code true} if number of loose objects > gc.auto (default + * 6700) */ boolean tooManyLooseObjects() { int auto = getLooseObjectLimit(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java index 2dbb7859b9..648d4a1821 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java @@ -142,7 +142,7 @@ public class OpenSshConfigFile implements SshConfigStore { * real host name, or it may just be a "Host" block in the * configuration file. * @param port - * the user supplied; <= 0 if none + * the user supplied; <= 0 if none * @param userName * the user supplied, may be {@code null} or empty if none given * @return the configuration for the requested name. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConfigStore.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConfigStore.java index d98bd2307f..1226a6b5ea 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConfigStore.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshConfigStore.java @@ -28,7 +28,7 @@ public interface SshConfigStore { * @param hostName * to look up * @param port - * the user supplied; <= 0 if none + * the user supplied; <= 0 if none * @param userName * the user supplied, may be {@code null} or empty if none given * @return the configuration for the requested name. @@ -68,7 +68,7 @@ public interface SshConfigStore { * @param hostName * host name to look up * @param port - * port number; <= 0 if none + * port number; <= 0 if none * @param userName * the user name, may be {@code null} or empty if none given * @return the configuration for the requested name. |