Pull upstream (#3)

* Upgrade spotbugs to 4.7.3 Release notes: https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md#473---2022-10-15 * Bump maven-jar-plugin from 3.2.2 to 3.3.0 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.2 to 3.3.0. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.2.2...maven-jar-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-resources-plugin from 3.2.0 to 3.3.0 Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/apache/maven-resources-plugin/releases) - [Commits](apache/maven-resources-plugin@maven-resources-plugin-3.2.0...maven-resources-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-resources-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-assembly-plugin from 3.4.1 to 3.4.2 Bumps [maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.4.1 to 3.4.2. - [Release notes](https://github.com/apache/maven-assembly-plugin/releases) - [Commits](apache/maven-assembly-plugin@maven-assembly-plugin-3.4.1...maven-assembly-plugin-3.4.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-assembly-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Suppress spurious md5 deprecation warnings * Remove unneeded AliasBlobStore directory methods These are not needed and generate deprecation warnings. * Upgrade to error-prone 2.16 Release notes: https://github.com/google/error-prone/releases/tag/v2.16 * Bump jetty-servlet from 11.0.11 to 11.0.13 Bumps [jetty-servlet](https://github.com/eclipse/jetty.project) from 11.0.11 to 11.0.13. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](jetty/jetty.project@jetty-11.0.11...jetty-11.0.13) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-shade-plugin from 3.3.0 to 3.4.1 Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.3.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](apache/maven-shade-plugin@maven-shade-plugin-3.3.0...maven-shade-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](apache/maven-checkstyle-plugin@maven-checkstyle-plugin-3.1.2...maven-checkstyle-plugin-3.2.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump slf4j.version from 1.7.36 to 2.0.6 Bumps `slf4j.version` from 1.7.36 to 2.0.6. Updates `slf4j-api` from 1.7.36 to 2.0.6 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](qos-ch/slf4j@v_1.7.36...v_2.0.6) Updates `jcl-over-slf4j` from 1.7.36 to 2.0.6 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](qos-ch/slf4j@v_1.7.36...v_2.0.6) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Bump logback-classic from 1.2.11 to 1.4.5 Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.2.11 to 1.4.5. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](qos-ch/logback@v_1.2.11...v_1.4.5) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-javadoc-plugin from 3.4.0 to 3.4.1 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.4.0...maven-javadoc-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-install-plugin from 3.0.1 to 3.1.0 Bumps [maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](apache/maven-install-plugin@maven-install-plugin-3.0.1...maven-install-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Configure Dependabot for monthly notifications * Upgrade to jclouds 2.6.0-SNAPSHOT Shuffle some test teardown methods to satisfy newer testng. References gaul#473. * Bump assertj-core from 3.23.1 to 3.24.2 Bumps assertj-core from 3.23.1 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-checkstyle-plugin from 3.2.0 to 3.2.1 Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](apache/maven-checkstyle-plugin@maven-checkstyle-plugin-3.2.0...maven-checkstyle-plugin-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-enforcer-plugin from 3.1.0 to 3.2.1 Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.1.0 to 3.2.1. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](apache/maven-enforcer@enforcer-3.1.0...enforcer-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump commons-fileupload from 1.4 to 1.5 Bumps commons-fileupload from 1.4 to 1.5. --- updated-dependencies: - dependency-name: commons-fileupload:commons-fileupload dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-deploy-plugin from 3.0.0 to 3.1.0 Bumps [maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](apache/maven-deploy-plugin@maven-deploy-plugin-3.0.0...maven-deploy-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump surefire.version from 3.0.0-M8 to 3.0.0-M9 Bumps `surefire.version` from 3.0.0-M8 to 3.0.0-M9. Updates `surefire-junit47` from 3.0.0-M8 to 3.0.0-M9 Updates `surefire-testng` from 3.0.0-M8 to 3.0.0-M9 Updates `surefire-junit-platform` from 3.0.0-M8 to 3.0.0-M9 Updates `maven-surefire-plugin` from 3.0.0-M8 to 3.0.0-M9 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.surefire:surefire-junit47 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.surefire:surefire-testng dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.surefire:surefire-junit-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-assembly-plugin from 3.4.2 to 3.5.0 Bumps [maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.4.2 to 3.5.0. - [Release notes](https://github.com/apache/maven-assembly-plugin/releases) - [Commits](apache/maven-assembly-plugin@maven-assembly-plugin-3.4.2...maven-assembly-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-assembly-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump jetty-servlet from 11.0.13 to 11.0.14 Bumps [jetty-servlet](https://github.com/eclipse/jetty.project) from 11.0.13 to 11.0.14. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](jetty/jetty.project@jetty-11.0.13...jetty-11.0.14) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Add S3PROXY_JAVA_OPTS environment variable * Bump logback-classic from 1.4.5 to 1.4.6 Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.4.5 to 1.4.6. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](qos-ch/logback@v_1.4.5...v_1.4.6) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-install-plugin from 3.1.0 to 3.1.1 Bumps [maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-install-plugin/releases) - [Commits](apache/maven-install-plugin@maven-install-plugin-3.1.0...maven-install-plugin-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-install-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump surefire.version from 3.0.0-M9 to 3.0.0 Bumps `surefire.version` from 3.0.0-M9 to 3.0.0. Updates `surefire-junit47` from 3.0.0-M9 to 3.0.0 Updates `surefire-testng` from 3.0.0-M9 to 3.0.0 Updates `surefire-junit-platform` from 3.0.0-M9 to 3.0.0 Updates `maven-surefire-plugin` from 3.0.0-M9 to 3.0.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.surefire:surefire-junit47 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.surefire:surefire-testng dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.surefire:surefire-junit-platform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump slf4j.version from 2.0.6 to 2.0.7 Bumps `slf4j.version` from 2.0.6 to 2.0.7. Updates `slf4j-api` from 2.0.6 to 2.0.7 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](qos-ch/slf4j@v_2.0.6...v_2.0.7) Updates `jcl-over-slf4j` from 2.0.6 to 2.0.7 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](qos-ch/slf4j@v_2.0.6...v_2.0.7) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Configure Keystore through environment variables * Fix variable typo * Configure Secure Endpoint with environment variable * Set default non chunked request size value * Expose 443 port for TLS/secure endpoint feature * Improve TLS Support documentation * Align SSL/TLS terminology * Update s3-tests submodule References gaul#479. * Bump jetty-servlet from 11.0.14 to 11.0.15 Bumps [jetty-servlet](https://github.com/eclipse/jetty.project) from 11.0.14 to 11.0.15. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](jetty/jetty.project@jetty-11.0.14...jetty-11.0.15) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-servlet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump logback-classic from 1.4.6 to 1.4.7 Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.4.6 to 1.4.7. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](qos-ch/logback@v_1.4.6...v_1.4.7) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update s3-tests Fixes gaul#479. * Add and ignore x-amz-api-version Fixes gaul#497. * Cleanup the build workflow --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Andrew Gaul <gaul@google.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Gaul <andrew@gaul.org> Co-authored-by: Srujan Deshpande <srujan.deshpande@gmail.com> Co-authored-by: Yann Defretin <kinoute@gmail.com> Co-authored-by: Yann Defretin <yann@defret.in> Co-authored-by: Timur Alperovich <timur@timuralp.com>
sourcegraph · Jun 21, 2023 · 36c5d36 · 36c5d36
1 parent 55367eb
commit 36c5d36
Show file tree

Hide file tree

Showing 17 changed files with 78 additions and 128 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,4 +8,4 @@ updates:
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "monthly"
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - "master"
-      - "develop"
   pull_request:
     branches:
       - "*"
@@ -19,7 +18,6 @@ jobs:
       container_version: ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.version'] }}
       container_revision: ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
       container_base: ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }}
-      new_release_version: ${{ steps.version.outputs.new_release_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -31,9 +29,6 @@ jobs:
         run: echo "::set-output name=defined::true"
         env:
           MY_KEY: ${{ secrets.DOCKER_PASS }}
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "14"
       - name: Docker meta
         id: docker_action_meta
         uses: docker/metadata-action@v4.0.1
@@ -44,9 +39,7 @@ jobs:
           tags: |
             type=sha,format=long
             type=sha
-            type=semver,pattern={{version}},value=${{ steps.version.outputs.new_release_version }}
-            type=semver,pattern={{major}},value=${{ steps.version.outputs.new_release_version }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ steps.version.outputs.new_release_version }}
+            type=match,pattern=s3proxy-(.*),group=1
             type=ref,event=branch
             type=ref,event=pr
             type=ref,event=tag
@@ -60,7 +53,6 @@ jobs:
         with:
           submodules: "recursive"
 
-      # These steps are quick and will work or if fail only because of external issues
       - uses: actions/setup-java@v2
         with:
           distribution: "temurin"
@@ -74,7 +66,7 @@ jobs:
       #Run tests
       - name: Maven Set version
         run: |
-          mvn versions:set -DnewVersion=${{ needs.meta.outputs.new_release_version }}
+          mvn versions:set -DnewVersion=${{ needs.meta.outputs.version }}
       - name: Maven Package
         run: |
           mvn package -DskipTests
@@ -99,7 +91,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [runTests, meta]
     steps:
-      #Yes we need code
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
         with:
@@ -109,7 +100,6 @@ jobs:
         with:
           name: pom
           path: .
-      # These steps are quick and will work or if fail only because of external issues
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
@@ -122,15 +112,14 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
-      - name: Login to DockerHub
+      - name: Login to GHCR
         uses: docker/login-action@v2.0.0
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      #Generate Meta
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
@@ -145,37 +134,13 @@ jobs:
             REVISION=${{ needs.meta.outputs.container_revision }}
           cache-from: type=registry,ref=${{ needs.meta.outputs.container_base }}
           cache-to: type=inline
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-      - name: Setup regctl
-        if: github.event_name != 'pull_request' && needs.meta.outputs.dockerhub-publish == 'true'
-        run: |
-          curl -L https://github.com/regclient/regclient/releases/download/v0.3.5/regctl-linux-amd64 >/tmp/regctl
-          chmod 755 /tmp/regctl
 
-      - name: Docker meta
-        if: github.event_name != 'pull_request' && needs.meta.outputs.dockerhub-publish == 'true'
-        id: docker_action_meta
-        uses: docker/metadata-action@v4.0.1
-        with:
-          images: andrewgaul/s3proxy
-          flavor: |
-            latest=false
-          tags: |
-            type=sha
-            type=semver,pattern={{version}},value=${{ needs.meta.outputs.new_release_version }}
-            type=semver,pattern={{major}},value=${{ needs.meta.outputs.new_release_version }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ needs.meta.outputs.new_release_version }}
-            type=ref,event=branch
-            type=ref,event=pr
-            type=ref,event=tag
-          labels: |
-            org.opencontainers.image.licenses=Apache-2.0
       - name: Publish to Docker
         if: github.event_name != 'pull_request' && needs.meta.outputs.dockerhub-publish == 'true'
         run: |
+          curl -L https://github.com/regclient/regclient/releases/download/v0.3.5/regctl-linux-amd64 >/tmp/regctl
+          chmod 755 /tmp/regctl
           for line in $CONTAINER_DEST_TAGS; do echo working on "$line"; /tmp/regctl image copy $SOURCE_CONTAINER $line; done
         env:
-          SOURCE_CONTAINER: ${{ needs.meta.outputs.new_release_version }}
-          CONTAINER_DEST_TAGS: ${{ steps.docker_action_meta.outputs.tags }}
+          SOURCE_CONTAINER: ${{ needs.meta.outputs.container_version }}
+          CONTAINER_DEST_TAGS: ${{ needs.meta.outputs.container_tags }}
diff --git a/Dockerfile b/Dockerfile
@@ -15,6 +15,8 @@ ENV \
     S3PROXY_IDENTITY="local-identity" \
     S3PROXY_CREDENTIAL="local-credential" \
     S3PROXY_VIRTUALHOST="" \
+    S3PROXY_KEYSTORE_PATH="keystore.jks" \
+    S3PROXY_KEYSTORE_PASSWORD="password" \
     S3PROXY_CORS_ALLOW_ALL="false" \
     S3PROXY_CORS_ALLOW_ORIGINS="" \
     S3PROXY_CORS_ALLOW_METHODS="" \
@@ -34,5 +36,5 @@ ENV \
     JCLOUDS_KEYSTONE_PROJECT_DOMAIN_NAME="" \
     JCLOUDS_FILESYSTEM_BASEDIR="/data"
 
-EXPOSE 80
+EXPOSE 80 443
 ENTRYPOINT ["/opt/s3proxy/run-docker-container.sh"]
diff --git a/README.md b/README.md
@@ -108,6 +108,10 @@ S3Proxy can modify its behavior based on middlewares:
 * [read-only](https://github.com/gaul/s3proxy/wiki/Middleware-read-only)
 * [sharded backend containers](https://github.com/gaul/s3proxy/wiki/Middleware-sharded-backend)
 
+## SSL Support
+
+S3Proxy can listen on HTTPS by setting the `secure-endpoint` and [configuring a keystore](http://wiki.eclipse.org/Jetty/Howto/Configure_SSL#Generating_Keys_and_Certificates_with_JDK_keytool). You can read more about how configure S3Proxy for SSL Support in [the dedicated wiki page](https://github.com/gaul/s3proxy/wiki/SSL-support) with Docker, Kubernetes or simply Java.
+
 ## Limitations
 
 S3Proxy has broad compatibility with the S3 API, however, it does not support:

diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>enforce-maven</id>
@@ -100,17 +100,17 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>check</id>
@@ -139,12 +139,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
+        <version>3.11.0</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -153,27 +153,13 @@
           <compilerArgs>
             <arg>-Xlint</arg>
             <arg>-XDcompilePolicy=simple</arg>
-            <arg>-Xplugin:ErrorProne
-                 -Xep:CanIgnoreReturnValueSuggester:OFF
-                 -Xep:DefaultCharset:OFF
-                 -Xep:HidingField:OFF
-                 -Xep:JavaUtilDate:OFF
-                 -Xep:ProtectedMembersInFinalClass:OFF
-            </arg>
           </compilerArgs>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>com.google.errorprone</groupId>
-              <artifactId>error_prone_core</artifactId>
-              <version>2.15.0</version>
-            </path>
-          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>3.3.0</version>
         <configuration>
           <archive>
             <manifest>
@@ -186,7 +172,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <id>attach-javadocs</id>
@@ -199,7 +185,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -237,7 +223,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
@@ -294,7 +280,7 @@
           </dependency>
         </dependencies>
         <configuration>
-          <parallel>all</parallel>
+          <parallel>classes</parallel>
           <threadCount>1</threadCount>
           <argLine>-Xmx512m</argLine>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -312,14 +298,7 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>4.7.1.1</version>
-        <dependencies>
-          <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs</artifactId>
-            <version>4.7.1</version>
-          </dependency>
-        </dependencies>
+        <version>4.7.3.0</version>
         <configuration>
           <effort>Max</effort>
           <omitVisitors>CrossSiteScripting,DefaultEncodingDetector,FindNullDeref</omitVisitors>
@@ -382,10 +361,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>11</java.version>
-    <jclouds.version>2.5.0</jclouds.version>
-    <slf4j.version>1.7.36</slf4j.version>
+    <jclouds.version>2.6.0-SNAPSHOT</jclouds.version>
+    <slf4j.version>2.0.7</slf4j.version>
     <shade.prefix>${project.groupId}.shaded</shade.prefix>
-    <surefire.version>2.22.2</surefire.version>
+    <surefire.version>3.0.0</surefire.version>
   </properties>
 
   <repositories>
@@ -419,7 +398,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.11</version>
+      <version>1.4.7</version>
     </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
@@ -459,7 +438,7 @@
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -486,12 +465,12 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
       <!-- we need to use the same version as in jclouds because we pull in their tests -->
-      <version>1.7.1</version>
+      <version>3.24.2</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>11.0.11</version>
+      <version>11.0.15</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -529,7 +508,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.8.21</version>
+      <version>7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/s3-tests b/s3-tests
diff --git a/src/main/java/org/gaul/s3proxy/AliasBlobStore.java b/src/main/java/org/gaul/s3proxy/AliasBlobStore.java
@@ -193,21 +193,6 @@ public boolean deleteContainerIfEmpty(String container) {
         return delegate().deleteContainerIfEmpty(getContainer(container));
     }
 
-    @Override
-    public boolean directoryExists(String container, String directory) {
-        return delegate().directoryExists(getContainer(container), directory);
-    }
-
-    @Override
-    public void createDirectory(String container, String directory) {
-        delegate().createDirectory(getContainer(container), directory);
-    }
-
-    @Override
-    public void deleteDirectory(String container, String directory) {
-        delegate().deleteDirectory(getContainer(container), directory);
-    }
-
     @Override
     public boolean blobExists(String container, String name) {
         return delegate().blobExists(getContainer(container), name);

diff --git a/src/main/java/org/gaul/s3proxy/AwsHttpHeaders.java b/src/main/java/org/gaul/s3proxy/AwsHttpHeaders.java
@@ -18,6 +18,7 @@
 
 final class AwsHttpHeaders {
     static final String ACL = "x-amz-acl";
+    static final String API_VERSION = "x-amz-api-version";
     static final String CONTENT_SHA256 = "x-amz-content-sha256";
     static final String COPY_SOURCE = "x-amz-copy-source";
     static final String COPY_SOURCE_IF_MATCH = "x-amz-copy-source-if-match";

diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -163,6 +163,7 @@ public class S3ProxyHandler {
     /** All supported x-amz- headers, except for x-amz-meta- user metadata. */
     private static final Set<String> SUPPORTED_X_AMZ_HEADERS = ImmutableSet.of(
             AwsHttpHeaders.ACL,
+            AwsHttpHeaders.API_VERSION,
             AwsHttpHeaders.CONTENT_SHA256,
             AwsHttpHeaders.COPY_SOURCE,
             AwsHttpHeaders.COPY_SOURCE_IF_MATCH,
+1 −1		requirements.txt
+0 −1		s3tests/functional/test_s3_website.py
+2 −0		s3tests_boto3/functional/test_headers.py