summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Duft <markus.duft@ssi-schaefer.com>2015-03-12 11:04:02 +0100
committerChristian Halstrick <christian.halstrick@sap.com>2015-03-12 15:17:27 +0100
commitede4b3d5a36fcea35a53a3186fd6ea3cbb6cb337 (patch)
tree62fff6143fc78534a2b8e903f99ad20a18c14847
parentd1bda470d447905c9425e5c9e86f3d9e90e1bf6b (diff)
downloadjgit-ede4b3d5a36fcea35a53a3186fd6ea3cbb6cb337.tar.gz
jgit-ede4b3d5a36fcea35a53a3186fd6ea3cbb6cb337.zip
Fix compile error due to missing dependencies and since tags
Change-Id: I98a9f17f987c4f3ea19d107f681c44754ed83dca Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
-rw-r--r--org.eclipse.jgit.archive/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java1
3 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index f44d00ff07..118bd0bd51 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
org.eclipse.jgit.api;version="[4.0.0,4.1.0)",
org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.jgit.archive.FormatActivator
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
index f52a934774..9014aaf1a2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
@@ -497,6 +497,7 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
* @param options
* archive format options (e.g., level=9 for zip compression).
* @return this
+ * @since 4.0
*/
public ArchiveCommand setFormatOptions(Map<String, Object> options) {
this.formatOptions = options;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java
index 1fd5089300..2bfeaf1166 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java
@@ -110,6 +110,7 @@ public final class StringUtils {
* @param str
* the String to capitalize, may be null
* @return the capitalized String, <code>null</code> if null String input
+ * @since 4.0
*/
public static String capitalize(String str) {
int strLen;