Skip to content

PR-Release #212

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

Merged
merged 8 commits into from
Sep 1, 2025
Merged

PR-Release #212

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a48e0a5
updating poms for 3.1.16-SNAPSHOT development
github-actions[bot] Aug 11, 2025
f9f90a1
updating poms for branch'release-3.1.15' with non-snapshot versions
github-actions[bot] Aug 11, 2025
26531bd
Merge branch 'release-3.1.15'
github-actions[bot] Aug 11, 2025
a475284
updating develop poms to master versions to avoid merge conflicts
github-actions[bot] Aug 11, 2025
1549957
Merge branch 'master' into develop
github-actions[bot] Aug 11, 2025
e7e9fbf
Updating develop poms back to pre merge state
github-actions[bot] Aug 11, 2025
52f3baa
added aws-java-nio-spi-for-s3 dependencies
Sep 1, 2025
9014e8d
Merge pull request #211 from swisspost/added-AWS-s3-dependencies
ZhengXinCN Sep 1, 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
68 changes: 60 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.swisspush</groupId>
<artifactId>rest-storage</artifactId>
<version>3.1.15-SNAPSHOT</version>
<version>3.1.16-SNAPSHOT-TEST1</version>
<name>rest-storage</name>
<description>
Persistence for REST resources in the filesystem or a redis database
Expand Down Expand Up @@ -69,10 +69,53 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.nio.s3</groupId>
<artifactId>aws-java-nio-spi-for-s3</artifactId>
<version>${nio.spi.s3.version}</version>
</dependency>
<!-- software.amazon.nio.spi.s3 is a Gradle project, dependencies are missing when running on server -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3-transfer-manager</artifactId>
<version>${awssdk.version}</version>
<exclusions>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>netty-nio-client</artifactId>
<version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk.crt</groupId>
<artifactId>aws-crt</artifactId>
<version>${aws-crt.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>${awssdk.version}</version>
<exclusions>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>${caffeine.version}</version>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava3</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava.version}</version>
</dependency>
<!-- TEST dependencies -->
<dependency>
Expand Down Expand Up @@ -137,12 +180,18 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.nio.s3</groupId>
<artifactId>aws-java-nio-spi-for-s3</artifactId>
<version>${nio.spi.s3.version}</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>${awssdk.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -364,8 +413,11 @@
</profiles>
<properties>
<vertx.version>4.5.2</vertx.version>
<awssdk.version>2.27.17</awssdk.version>
<nio.spi.s3.version>2.1.0</nio.spi.s3.version>
<awssdk.version>2.31.40</awssdk.version>
<aws-crt.version>0.38.2</aws-crt.version>
<rxjava.version>3.1.10</rxjava.version>
<caffeine.version>3.1.8</caffeine.version>
<nio.spi.s3.version>2.2.1</nio.spi.s3.version>
<slf4j.version>2.0.10</slf4j.version>
<junit.version>4.13.2</junit.version>
<jackson.version>2.16.0</jackson.version>
Expand Down