diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index 5d731e32..3e4347c3 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -19,11 +19,11 @@ dependencies { implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1' implementation 'org.postgresql:postgresql:42.2.18' - implementation 'io.github.linktosriram:s3-lite-core:0.2.0' - implementation 'io.github.linktosriram:s3-lite-api:0.2.0' - implementation 'io.github.linktosriram:s3-lite-http-client-url-connection:0.2.0' - implementation 'io.github.linktosriram:s3-lite-http-client-spi:0.2.0' - implementation 'io.github.linktosriram:s3-lite-util:0.2.0' + implementation 'io.github.linktosriram.s3lite:core:0.0.2-SNAPSHOT' + implementation 'io.github.linktosriram.s3lite:api:0.0.2-SNAPSHOT' + implementation 'io.github.linktosriram.s3lite:http-client-url-connection:0.0.2-SNAPSHOT' + implementation 'io.github.linktosriram.s3lite:http-client-spi:0.0.2-SNAPSHOT' + implementation 'io.github.linktosriram.s3lite:util:0.0.2-SNAPSHOT' } processResources { @@ -58,11 +58,11 @@ shadowJar { include(dependency('org.eclipse.jetty::')) include(dependency('org.eclipse.jetty.orbit:javax.servlet:')) include(dependency('org.postgresql:postgresql:')) - include(dependency('io.github.linktosriram:s3-lite-core:')) - include(dependency('io.github.linktosriram:s3-lite-api:')) - include(dependency('io.github.linktosriram:s3-lite-http-client-url-connection:')) - include(dependency('io.github.linktosriram:s3-lite-http-client-spi:')) - include(dependency('io.github.linktosriram:s3-lite-util:')) + include(dependency('io.github.linktosriram.s3lite:core:')) + include(dependency('io.github.linktosriram.s3lite:api:')) + include(dependency('io.github.linktosriram.s3lite:http-client-url-connection:')) + include(dependency('io.github.linktosriram.s3lite:http-client-spi:')) + include(dependency('io.github.linktosriram.s3lite:util:')) include(dependency(':DynmapCoreAPI')) exclude("META-INF/maven/**") exclude("META-INF/services/**") diff --git a/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java b/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java index e954279f..0dfe8660 100644 --- a/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java +++ b/DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java @@ -139,7 +139,7 @@ public class AWSS3MapStorage extends MapStorage { else { PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(map.getImageFormat().getEncoding().getContentType()) .addMetadata("x-dynmap-hash", Long.toHexString(hash)).addMetadata("x-dynmap-ts", Long.toString(timestamp)).build(); - s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len)); + s3.putObject(req, RequestBody.fromBytes(encImage.buf)); } done = true; } catch (S3Exception x) { @@ -518,7 +518,7 @@ public class AWSS3MapStorage extends MapStorage { } else { PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType("image/png").build(); - s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len)); + s3.putObject(req, RequestBody.fromBytes(encImage.buf)); } done = true; } catch (S3Exception x) { @@ -571,7 +571,7 @@ public class AWSS3MapStorage extends MapStorage { } else { PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType("image/png").build(); - s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len)); + s3.putObject(req, RequestBody.fromBytes(encImage.buf)); } done = true; } catch (S3Exception x) { @@ -734,7 +734,7 @@ public class AWSS3MapStorage extends MapStorage { ct = "application/x-javascript"; } PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(ct).build(); - s3.putObject(req, RequestBody.fromBytes(content.buf, content.len)); + s3.putObject(req, RequestBody.fromBytes(content.buf)); standalone_cache.put(fileid, digest); } done = true; diff --git a/build.gradle b/build.gradle index 1d5cf8f9..de7cb9a3 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ allprojects { mavenLocal() maven { url 'https://libraries.minecraft.net/' } maven { url "https://oss.sonatype.org/content/repositories/releases" } + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } maven { url "https://repo.mikeprimm.com" } maven { url "https://repo.maven.apache.org/maven2" } maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }