NXP-30993: remove S3BlobProviderFeature duplication

nuxeo · Jan 16, 2023 · 17c8d6c · 17c8d6c
1 parent bc7d297
commit 17c8d6c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 202 deletions.
diff --git a/nuxeo-coldstorage/pom.xml b/nuxeo-coldstorage/pom.xml
@@ -92,6 +92,12 @@
       <artifactId>aws-java-sdk-s3</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.nuxeo.ecm.core</groupId>
+      <artifactId>nuxeo-core-binarymanager-s3</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/nuxeo-coldstorage/src/test/java/org/nuxeo/coldstorage/S3ColdStorageFeature.java b/nuxeo-coldstorage/src/test/java/org/nuxeo/coldstorage/S3ColdStorageFeature.java
diff --git a/nuxeo-coldstorage/src/test/java/org/nuxeo/coldstorage/S3TestHelper.java b/nuxeo-coldstorage/src/test/java/org/nuxeo/coldstorage/S3TestHelper.java
diff --git a/...-coldstorage/src/test/java/org/nuxeo/coldstorage/operations/TestColdStorageRendition.java b/...-coldstorage/src/test/java/org/nuxeo/coldstorage/operations/TestColdStorageRendition.java
@@ -34,9 +34,10 @@
 
 import org.junit.Test;
 import org.nuxeo.coldstorage.ColdStorageConstants;
-import org.nuxeo.coldstorage.S3ColdStorageFeature;
+import org.nuxeo.coldstorage.ColdStorageFeature;
 import org.nuxeo.common.utils.FileUtils;
 import org.nuxeo.ecm.automation.OperationException;
+import org.nuxeo.ecm.blob.s3.S3BlobProviderFeature;
 import org.nuxeo.ecm.core.api.Blob;
 import org.nuxeo.ecm.core.api.Blobs;
 import org.nuxeo.ecm.core.api.CoreSession;
@@ -52,7 +53,7 @@
 /**
  * @since 2021.0.0
  */
-@Features(S3ColdStorageFeature.class)
+@Features({ ColdStorageFeature.class, S3BlobProviderFeature.class})
 public class TestColdStorageRendition extends AbstractTestColdStorageOperation {
 
     @Inject

diff --git a/nuxeo-coldstorage/src/test/java/org/nuxeo/coldstorage/service/TestS3ColdStorageService.java b/nuxeo-coldstorage/src/test/java/org/nuxeo/coldstorage/service/TestS3ColdStorageService.java
@@ -28,7 +28,8 @@
 
 import org.junit.Test;
 import org.nuxeo.coldstorage.ColdStorageConstants;
-import org.nuxeo.coldstorage.S3ColdStorageFeature;
+import org.nuxeo.coldstorage.ColdStorageFeature;
+import org.nuxeo.ecm.blob.s3.S3BlobProviderFeature;
 import org.nuxeo.ecm.core.api.Blob;
 import org.nuxeo.ecm.core.api.Blobs;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -38,7 +39,7 @@
 
 import com.amazonaws.services.s3.model.StorageClass;
 
-@Features(S3ColdStorageFeature.class)
+@Features({ ColdStorageFeature.class, S3BlobProviderFeature.class })
 public class TestS3ColdStorageService extends AbstractTestColdStorageService {
 
     @Test

diff --git a/nuxeo-coldstorage/src/test/resources/OSGI-INF/test-s3-coldstorage-contrib.xml b/nuxeo-coldstorage/src/test/resources/OSGI-INF/test-s3-coldstorage-contrib.xml
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo</groupId>
     <artifactId>nuxeo-parent</artifactId>
-    <version>2021.19</version>
+    <version>2021.21</version>
   </parent>
 
   <groupId>org.nuxeo.coldstorage</groupId>