Skip to content
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

POM updates #456

Merged
merged 1 commit into from
Feb 6, 2024
Merged

POM updates #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.76</version>
<version>4.77</version>
<relativePath />
</parent>
<groupId>io.jenkins.plugins</groupId>
Expand Down Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sso</artifactId>
<version>2.22.2</version>
<version>2.23.17</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -137,7 +137,7 @@
<dependency>
<groupId>org.jenkins-ci.test</groupId>
<artifactId>docker-fixtures</artifactId>
<version>178.v2c7d2343886b_</version>
<version>190.vd6a_e600cb_775</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -194,7 +194,6 @@
<dependency>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
<version>1.11</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -244,7 +243,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.3</version>
<version>1.19.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/io/jenkins/plugins/artifact_manager_jclouds/JCloudsVirtualFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,10 @@ public static boolean delete(BlobStoreProvider provider, BlobStore blobStore, St
List<String> paths = new ArrayList<>();
for (StorageMetadata sm : BlobStores.listAll(blobStore, provider.getContainer(), ListContainerOptions.Builder.prefix(prefix).recursive())) {
String path = sm.getName();
assert path.startsWith(prefix);
if (!path.startsWith(prefix)) {
LOGGER.warning(() -> path + " does not start with " + prefix);
continue;
}
paths.add(path);
}
if (paths.isEmpty()) {
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/io/jenkins/plugins/artifact_manager_jclouds/s3/S3BlobStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,6 @@ private Supplier<Credentials> getCredentialsSupplier() throws IOException {
@NonNull
@Override
public URI toURI(@NonNull String container, @NonNull String key) {
assert container != null;
assert key != null;
try {
AmazonS3ClientBuilder builder = getConfiguration().getAmazonS3ClientBuilder();
URI uri = builder.build().getUrl(container, key).toURI();
Expand All @@ -206,8 +204,6 @@ public URI toURI(@NonNull String container, @NonNull String key) {
*/
@Override
public URL toExternalURL(@NonNull Blob blob, @NonNull HttpMethod httpMethod) throws IOException {
assert blob != null;
assert httpMethod != null;
AmazonS3ClientBuilder builder = getConfiguration().getAmazonS3ClientBuilderWithCredentials();

Date expiration = new Date(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1));
Expand Down