diff options
Diffstat (limited to 'org.eclipse.jgit.lfs.server')
7 files changed, 28 insertions, 25 deletions
diff --git a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs index 89394eca41..525ac67142 100644 --- a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.server/.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.server/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.mylyn.team.ui.prefs index ce7a0f0478..984263dd94 100644 --- a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/org.eclipse.jgit.lfs.server/.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.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 0d1eb9fbbb..7bed13371b 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.1.12.qualifier +Bundle-Version: 5.2.3.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.server;version="5.1.12"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.2.3"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.1.12"; + org.eclipse.jgit.lfs.server.fs;version="5.2.3"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.1.12";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.1.12"; + org.eclipse.jgit.lfs.server.internal;version="5.2.3";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.2.3"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.1.12,5.2.0)", - org.eclipse.jgit.internal;version="[5.1.12,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.internal;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.12,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.12,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.12,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.12,5.2.0)", - org.eclipse.jgit.transport.http.apache;version="[5.1.12,5.2.0)", - org.eclipse.jgit.util;version="[5.1.12,5.2.0)", + org.eclipse.jgit.annotations;version="[5.2.3,5.3.0)", + org.eclipse.jgit.internal;version="[5.2.3,5.3.0)", + org.eclipse.jgit.internal.storage.file;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.errors;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.internal;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lfs.lib;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.transport.http;version="[5.2.3,5.3.0)", + org.eclipse.jgit.transport.http.apache;version="[5.2.3,5.3.0)", + org.eclipse.jgit.util;version="[5.2.3,5.3.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 1cad340d98..4a2b38ac18 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.1.12-SNAPSHOT</version> + <version>5.2.3-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server</artifactId> diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LargeFileRepository.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LargeFileRepository.java index cfa53af9cd..c2439adf62 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LargeFileRepository.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LargeFileRepository.java @@ -61,7 +61,7 @@ public interface LargeFileRepository { * id of the object to download * @return Action for downloading the object */ - public Response.Action getDownloadAction(AnyLongObjectId id); + Response.Action getDownloadAction(AnyLongObjectId id); /** * Get upload action @@ -72,7 +72,7 @@ public interface LargeFileRepository { * size of the object to be uploaded * @return Action for uploading the object */ - public Response.Action getUploadAction(AnyLongObjectId id, long size); + Response.Action getUploadAction(AnyLongObjectId id, long size); /** * Get verify action @@ -82,7 +82,8 @@ public interface LargeFileRepository { * @return Action for verifying the object, or {@code null} if the server * doesn't support or require verification */ - public @Nullable Response.Action getVerifyAction(AnyLongObjectId id); + @Nullable + Response.Action getVerifyAction(AnyLongObjectId id); /** * Get size of an object @@ -93,5 +94,5 @@ public interface LargeFileRepository { * exist * @throws java.io.IOException */ - public long getSize(AnyLongObjectId id) throws IOException; + long getSize(AnyLongObjectId id) throws IOException; } diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java index 55d9093241..0a7c37ca55 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java @@ -99,7 +99,8 @@ public class FileLfsRepository implements LargeFileRepository { /** {@inheritDoc} */ @Override - public @Nullable Action getVerifyAction(AnyLongObjectId id) { + @Nullable + public Action getVerifyAction(AnyLongObjectId id) { return null; } diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java index b21c94e4e6..7b76cecf0c 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java @@ -411,7 +411,8 @@ class SignerV4 { String stringToSign = stringToSign(SCHEME, ALGORITHM, dateTimeStamp, scope, canonicalRequest); - byte[] signature = (SCHEME + bucketConfig.getSecretKey()).getBytes(); + byte[] signature = (SCHEME + bucketConfig.getSecretKey()) + .getBytes(UTF_8); signature = sign(dateStamp, signature); signature = sign(bucketConfig.getRegion(), signature); signature = sign(S3, signature); |