Skip to content

Migrate AWS S3 Storage from s3lite to MinIO Client and Enhance Error Handling #4212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: v3.0
Choose a base branch
from
Open

Migrate AWS S3 Storage from s3lite to MinIO Client and Enhance Error Handling #4212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20917af
Migrate AWS S3 storage from s3lite to MinIO client with enhanced erro…
Gk0Wk May 24, 2025
1d728b8
Translate comments
Gk0Wk May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 36 additions & 16 deletions DynmapCore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,9 @@ 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.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'
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
implementation 'com.sun.xml.bind:jaxb-impl:3.0.0'

// MinIO S3 client (replaces s3lite) - using older version to avoid Java 22 bytecode
implementation 'io.minio:minio:8.5.7'
}

processResources {
Expand Down Expand Up @@ -60,14 +56,31 @@ shadowJar {
include(dependency('org.eclipse.jetty::'))
include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
include(dependency('org.postgresql:postgresql:'))
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('jakarta.xml.bind::'))
include(dependency('com.sun.xml.bind::'))
include(dependency('io.minio:minio:'))
include(dependency(':DynmapCoreAPI'))

// MinIO dependencies
include(dependency('com.google.guava:guava:'))
include(dependency('com.google.guava:failureaccess:'))
include(dependency('com.google.guava:listenablefuture:'))
include(dependency('com.carrotsearch.thirdparty:simple-xml-safe:'))
include(dependency('com.squareup.okhttp3:okhttp:'))
include(dependency('com.squareup.okio:okio:'))
include(dependency('com.squareup.okio:okio-jvm:'))
include(dependency('com.fasterxml.jackson.core:jackson-annotations:'))
include(dependency('com.fasterxml.jackson.core:jackson-core:'))
include(dependency('com.fasterxml.jackson.core:jackson-databind:'))
include(dependency('org.bouncycastle:bcprov-jdk18on:'))
include(dependency('org.apache.commons:commons-compress:'))
include(dependency('commons-codec:commons-codec:'))
include(dependency('org.xerial.snappy:snappy-java:'))
include(dependency('org.jetbrains.kotlin:kotlin-stdlib:'))
include(dependency('org.jetbrains.kotlin:kotlin-stdlib-common:'))
include(dependency('org.jetbrains.kotlin:kotlin-stdlib-jdk7:'))
include(dependency('org.jetbrains.kotlin:kotlin-stdlib-jdk8:'))
include(dependency('commons-io:commons-io:'))
include(dependency('org.apache.commons:commons-lang3:'))

exclude("META-INF/maven/**")
exclude("META-INF/services/**")
}
Expand All @@ -77,8 +90,15 @@ shadowJar {
relocate('org.owasp.html', 'org.dynmap.org.owasp.html')
relocate('javax.servlet', 'org.dynmap.javax.servlet' )
relocate('org.postgresql', 'org.dynmap.org.postgresql')
relocate('io.github.linktosriram.s3lite', 'org.dynmap.s3lite')


// MinIO and dependencies relocations
relocate('io.minio', 'org.dynmap.minio')
relocate('okhttp3', 'org.dynmap.okhttp3')
relocate('okio', 'org.dynmap.okio')
relocate('com.fasterxml.jackson', 'org.dynmap.jackson')
relocate('com.google.common', 'org.dynmap.guava')
relocate('kotlin', 'org.dynmap.kotlin')

destinationDirectory = file '../target'
archiveClassifier = ''
}
Expand Down
Loading