Fix compile error due to missing dependencies and since tags

Change-Id: I98a9f17f987c4f3ea19d107f681c44754ed83dca
Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>

diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index f44d00ff0774975b55f7a80a57714922ff969687..118bd0bd519f7f9d6d15103ef2ed591986e6c63f 100644 (file)
--- 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 f52a9347748befe1c043e9f38b892f8bd1cbc76b..9014aaf1a26effe379402b720b89d5880cf60d54 100644 (file)
--- 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 1fd5089300e99a4a6ce8672a27ca5f96e96c51c5..2bfeaf1166007b064f3e9ae0c9e6a225136aa101 100644 (file)
--- 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;