Skip to content

Commit 0092929

Browse files
committed
Merge remote-tracking branch 'origin/chore/awsSdk2x' into development
2 parents dd0141a + 06aa3e9 commit 0092929

16 files changed

Lines changed: 689 additions & 561 deletions

.github/workflows/build-main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16+
- name: Start MinIO Server
17+
uses: comfuture/minio-action@v1
18+
with:
19+
access_key: minioadmin
20+
secret_key: minioadmin
1621
- name: Set up Java
1722
uses: actions/setup-java@v5
1823
with:

.github/workflows/build-pr.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v4
14+
- name: Start MinIO Server
15+
uses: comfuture/minio-action@v1
16+
with:
17+
access_key: minioadmin
18+
secret_key: minioadmin
1419
- name: Set up Java
1520
uses: actions/setup-java@v5
1621
with:

.github/workflows/platform-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v4
23+
- name: Start MinIO Server
24+
uses: comfuture/minio-action@v1
25+
with:
26+
access_key: minioadmin
27+
secret_key: minioadmin
2328
- name: Set up Java
2429
uses: actions/setup-java@v5
2530
with:

pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120

121121
<n5.version>4.0.0-alpha-4</n5.version>
122122

123-
<s3mock_2.12.version>0.2.5</s3mock_2.12.version>
124123
<jaxb-api.version>2.2.2</jaxb-api.version>
125124
</properties>
126125

@@ -130,8 +129,9 @@
130129
<artifactId>n5</artifactId>
131130
</dependency>
132131
<dependency>
133-
<groupId>com.amazonaws</groupId>
134-
<artifactId>aws-java-sdk-s3</artifactId>
132+
<groupId>software.amazon.awssdk</groupId>
133+
<artifactId>s3</artifactId>
134+
<version>2.30.10</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>com.google.code.findbugs</groupId>
@@ -145,12 +145,6 @@
145145
<artifactId>junit</artifactId>
146146
<scope>test</scope>
147147
</dependency>
148-
<dependency>
149-
<groupId>io.findify</groupId>
150-
<artifactId>s3mock_2.12</artifactId>
151-
<version>${s3mock_2.12.version}</version>
152-
<scope>test</scope>
153-
</dependency>
154148
<dependency>
155149
<groupId>org.slf4j</groupId>
156150
<artifactId>slf4j-simple</artifactId>

0 commit comments

Comments
 (0)