Merge pull request #456 from jglick/pom

POM updates
jenkinsci · Feb 6, 2024 · 0b62663 · 0b62663
2 parents 9419ebb + b6987ce
commit 0b62663
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -194,7 +194,6 @@
     <dependency>
       <groupId>org.kohsuke.metainf-services</groupId>
       <artifactId>metainf-services</artifactId>
-      <version>1.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -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>

diff --git a/src/main/java/io/jenkins/plugins/artifact_manager_jclouds/JCloudsVirtualFile.java b/src/main/java/io/jenkins/plugins/artifact_manager_jclouds/JCloudsVirtualFile.java
@@ -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()) {

diff --git a/src/main/java/io/jenkins/plugins/artifact_manager_jclouds/s3/S3BlobStore.java b/src/main/java/io/jenkins/plugins/artifact_manager_jclouds/s3/S3BlobStore.java
@@ -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();
@@ -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));