Skip to content

Commit 8104605

Browse files
authored
Merge pull request #46 from saalfeldlab/devSdkBump
merge SDK v2 bump into development
2 parents dd0141a + 394418a commit 8104605

15 files changed

Lines changed: 626 additions & 602 deletions

.github/workflows/build-main.yml

Lines changed: 6 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:
@@ -30,3 +35,4 @@ jobs:
3035
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
3136
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
3237
SIGNING_ASC: ${{ secrets.SIGNING_ASC }}
38+
AWS_REGION: us-east-1

.github/workflows/build-pr.yml

Lines changed: 7 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:
@@ -21,3 +26,5 @@ jobs:
2126
run: .github/setup.sh
2227
- name: Execute the build
2328
run: .github/build.sh
29+
env:
30+
AWS_REGION: us-east-1

.github/workflows/platform-test.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

pom.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,8 @@
117117

118118
<!-- NB: Deploy releases to the SciJava Maven repository. -->
119119
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
120+
<n5.version>4.0.0-alpha-7-SNAPSHOT</n5.version>
120121

121-
<n5.version>4.0.0-alpha-4</n5.version>
122-
123-
<s3mock_2.12.version>0.2.5</s3mock_2.12.version>
124122
<jaxb-api.version>2.2.2</jaxb-api.version>
125123
</properties>
126124

@@ -130,8 +128,9 @@
130128
<artifactId>n5</artifactId>
131129
</dependency>
132130
<dependency>
133-
<groupId>com.amazonaws</groupId>
134-
<artifactId>aws-java-sdk-s3</artifactId>
131+
<groupId>software.amazon.awssdk</groupId>
132+
<artifactId>s3</artifactId>
133+
<version>2.30.10</version>
135134
</dependency>
136135
<dependency>
137136
<groupId>com.google.code.findbugs</groupId>
@@ -145,12 +144,6 @@
145144
<artifactId>junit</artifactId>
146145
<scope>test</scope>
147146
</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>
154147
<dependency>
155148
<groupId>org.slf4j</groupId>
156149
<artifactId>slf4j-simple</artifactId>

0 commit comments

Comments
 (0)