diff options
Diffstat (limited to 'org.eclipse.jgit.lfs')
9 files changed, 38 insertions, 32 deletions
diff --git a/org.eclipse.jgit.lfs/.settings/.api_filters b/org.eclipse.jgit.lfs/.settings/.api_filters index db45ade674..95a45574ec 100644 --- a/org.eclipse.jgit.lfs/.settings/.api_filters +++ b/org.eclipse.jgit.lfs/.settings/.api_filters @@ -3,8 +3,8 @@ <resource path="META-INF/MANIFEST.MF"> <filter id="924844039"> <message_arguments> - <message_argument value="5.1.9"/> - <message_argument value="5.1.0"/> + <message_argument value="5.2.3"/> + <message_argument value="5.2.0"/> </message_arguments> </filter> </resource> diff --git a/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs index 89394eca41..525ac67142 100644 --- a/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs @@ -91,7 +91,7 @@ org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore diff --git a/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs index ce7a0f0478..984263dd94 100644 --- a/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs @@ -1,2 +1,2 @@ -commit.comment.template=${task.description} \n\nBug\: ${task.key} +commit.comment.template=${task.description}\n\nBug\: ${task.key} eclipse.preferences.version=1 diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f731c54919..209b2b2e52 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.1.9.qualifier +Bundle-Version: 5.2.3.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs;version="5.1.9", - org.eclipse.jgit.lfs.errors;version="5.1.9", - org.eclipse.jgit.lfs.internal;version="5.1.9";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.1.9" +Export-Package: org.eclipse.jgit.lfs;version="5.2.3", + org.eclipse.jgit.lfs.errors;version="5.2.3", + org.eclipse.jgit.lfs.internal;version="5.2.3";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="5.2.3" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", org.apache.http.impl.client;version="[4.2.6,5.0.0)", org.apache.http.impl.conn;version="[4.2.6,5.0.0)", - org.eclipse.jgit.annotations;version="[5.1.9,5.2.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.1.9,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.9,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.9,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.9,5.2.0)", - org.eclipse.jgit.hooks;version="[5.1.9,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.9,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.9,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.9,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.9,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.9,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.9,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.9,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.9,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.9,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.9,5.2.0)", - org.eclipse.jgit.util;version="[5.1.9,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.9,5.2.0)" + org.eclipse.jgit.annotations;version="[5.2.3,5.3.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.2.3,5.3.0)", + org.eclipse.jgit.attributes;version="[5.2.3,5.3.0)", + org.eclipse.jgit.diff;version="[5.2.3,5.3.0)", + org.eclipse.jgit.errors;version="[5.2.3,5.3.0)", + org.eclipse.jgit.hooks;version="[5.2.3,5.3.0)", + org.eclipse.jgit.internal.storage.file;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lib;version="[5.2.3,5.3.0)", + org.eclipse.jgit.nls;version="[5.2.3,5.3.0)", + org.eclipse.jgit.revwalk;version="[5.2.3,5.3.0)", + org.eclipse.jgit.storage.file;version="[5.2.3,5.3.0)", + org.eclipse.jgit.storage.pack;version="[5.2.3,5.3.0)", + org.eclipse.jgit.transport;version="[5.2.3,5.3.0)", + org.eclipse.jgit.transport.http;version="[5.2.3,5.3.0)", + org.eclipse.jgit.treewalk;version="[5.2.3,5.3.0)", + org.eclipse.jgit.treewalk.filter;version="[5.2.3,5.3.0)", + org.eclipse.jgit.util;version="[5.2.3,5.3.0)", + org.eclipse.jgit.util.io;version="[5.2.3,5.3.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 311b6ceead..f7cad33523 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.1.9-SNAPSHOT</version> + <version>5.2.3-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs</artifactId> diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java index 415caa9859..56e3a12ddc 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java @@ -99,7 +99,8 @@ public class BuiltinLFS extends LfsFactory { } @Override - public @Nullable PrePushHook getPrePushHook(Repository repo, + @Nullable + public PrePushHook getPrePushHook(Repository repo, PrintStream outputStream) { if (isEnabled(repo)) { return new LfsPrePushHook(repo, outputStream); diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java index fac87c177e..7bacf49269 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java @@ -222,7 +222,10 @@ public class SmudgeFilter extends FilterCommand { Integer.valueOf(responseCode))); } Path path = lfs.getMediaFile(ptr.getOid()); - path.getParent().toFile().mkdirs(); + Path parent = path.getParent(); + if (parent != null) { + parent.toFile().mkdirs(); + } try (InputStream contentIn = contentServerConn .getInputStream()) { long bytesCopied = Files.copy(contentIn, path); diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/AtomicObjectOutputStream.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/AtomicObjectOutputStream.java index 0762ac5f14..317d68a980 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/AtomicObjectOutputStream.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/AtomicObjectOutputStream.java @@ -106,7 +106,8 @@ public class AtomicObjectOutputStream extends OutputStream { * stream. May return {@code null} if called before closing this * stream. */ - public @Nullable AnyLongObjectId getId() { + @Nullable + public AnyLongObjectId getId() { return id; } diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java index 955eca0c3f..feb8b4ae5a 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java @@ -227,7 +227,8 @@ public class LfsConnectionFactory { * @throws IOException * in case of any error. */ - public static @NonNull HttpConnection getLfsContentConnection( + @NonNull + public static HttpConnection getLfsContentConnection( Repository repo, Protocol.Action action, String method) throws IOException { URL contentUrl = new URL(action.href); |