Skip to content

Commit a669d75

Browse files
committed
Update s3-lite client to 0.0.2-SNAPSHOT version
1 parent ca80758 commit a669d75

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

DynmapCore/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ dependencies {
1919
implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES
2020
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
2121
implementation 'org.postgresql:postgresql:42.2.18'
22-
implementation 'io.github.linktosriram:s3-lite-core:0.2.0'
23-
implementation 'io.github.linktosriram:s3-lite-api:0.2.0'
24-
implementation 'io.github.linktosriram:s3-lite-http-client-url-connection:0.2.0'
25-
implementation 'io.github.linktosriram:s3-lite-http-client-spi:0.2.0'
26-
implementation 'io.github.linktosriram:s3-lite-util:0.2.0'
22+
implementation 'io.github.linktosriram.s3lite:core:0.0.2-SNAPSHOT'
23+
implementation 'io.github.linktosriram.s3lite:api:0.0.2-SNAPSHOT'
24+
implementation 'io.github.linktosriram.s3lite:http-client-url-connection:0.0.2-SNAPSHOT'
25+
implementation 'io.github.linktosriram.s3lite:http-client-spi:0.0.2-SNAPSHOT'
26+
implementation 'io.github.linktosriram.s3lite:util:0.0.2-SNAPSHOT'
2727
}
2828

2929
processResources {
@@ -58,11 +58,11 @@ shadowJar {
5858
include(dependency('org.eclipse.jetty::'))
5959
include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
6060
include(dependency('org.postgresql:postgresql:'))
61-
include(dependency('io.github.linktosriram:s3-lite-core:'))
62-
include(dependency('io.github.linktosriram:s3-lite-api:'))
63-
include(dependency('io.github.linktosriram:s3-lite-http-client-url-connection:'))
64-
include(dependency('io.github.linktosriram:s3-lite-http-client-spi:'))
65-
include(dependency('io.github.linktosriram:s3-lite-util:'))
61+
include(dependency('io.github.linktosriram.s3lite:core:'))
62+
include(dependency('io.github.linktosriram.s3lite:api:'))
63+
include(dependency('io.github.linktosriram.s3lite:http-client-url-connection:'))
64+
include(dependency('io.github.linktosriram.s3lite:http-client-spi:'))
65+
include(dependency('io.github.linktosriram.s3lite:util:'))
6666
include(dependency(':DynmapCoreAPI'))
6767
exclude("META-INF/maven/**")
6868
exclude("META-INF/services/**")

DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public boolean write(long hash, BufferOutputStream encImage, long timestamp) {
139139
else {
140140
PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(map.getImageFormat().getEncoding().getContentType())
141141
.addMetadata("x-dynmap-hash", Long.toHexString(hash)).addMetadata("x-dynmap-ts", Long.toString(timestamp)).build();
142-
s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len));
142+
s3.putObject(req, RequestBody.fromBytes(encImage.buf));
143143
}
144144
done = true;
145145
} catch (S3Exception x) {
@@ -518,7 +518,7 @@ public boolean setPlayerFaceImage(String playername, FaceType facetype,
518518
}
519519
else {
520520
PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType("image/png").build();
521-
s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len));
521+
s3.putObject(req, RequestBody.fromBytes(encImage.buf));
522522
}
523523
done = true;
524524
} catch (S3Exception x) {
@@ -571,7 +571,7 @@ public boolean setMarkerImage(String markerid, BufferOutputStream encImage) {
571571
}
572572
else {
573573
PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType("image/png").build();
574-
s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len));
574+
s3.putObject(req, RequestBody.fromBytes(encImage.buf));
575575
}
576576
done = true;
577577
} catch (S3Exception x) {
@@ -734,7 +734,7 @@ else if (fileid.endsWith(".js")) {
734734
ct = "application/x-javascript";
735735
}
736736
PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(ct).build();
737-
s3.putObject(req, RequestBody.fromBytes(content.buf, content.len));
737+
s3.putObject(req, RequestBody.fromBytes(content.buf));
738738
standalone_cache.put(fileid, digest);
739739
}
740740
done = true;

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ allprojects {
3030
mavenLocal()
3131
maven { url 'https://libraries.minecraft.net/' }
3232
maven { url "https://oss.sonatype.org/content/repositories/releases" }
33+
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
3334
maven { url "https://repo.mikeprimm.com" }
3435
maven { url "https://repo.maven.apache.org/maven2" }
3536
maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }

0 commit comments

Comments
 (0)