diff --git a/nexus-blobstore-google-cloud-it/src/test/java/org/sonatype/nexus/blobstore/gcloud/internal/GoogleCloudBlobStoreDeploymentIT.java b/nexus-blobstore-google-cloud-it/src/test/java/org/sonatype/nexus/blobstore/gcloud/internal/GoogleCloudBlobStoreDeploymentIT.java index 1e9d303..d2a4d35 100644 --- a/nexus-blobstore-google-cloud-it/src/test/java/org/sonatype/nexus/blobstore/gcloud/internal/GoogleCloudBlobStoreDeploymentIT.java +++ b/nexus-blobstore-google-cloud-it/src/test/java/org/sonatype/nexus/blobstore/gcloud/internal/GoogleCloudBlobStoreDeploymentIT.java @@ -7,6 +7,10 @@ import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; +/** + * Integration test intended to deploy the plugin within Nexus Repository manager to confirm that the OSGi + * packaging is correct and the bundle will run. + */ public class GoogleCloudBlobStoreDeploymentIT extends GoogleCloudBlobStoreITSupport { @@ -21,6 +25,6 @@ public static Option[] configureNexus() { @Test public void createGoogleCloudBlobStore() { - //assertNotNull(nxrm.getBlobStoreManager()); + // no-op; this test will fail in inherited rule/before methods if the plugin is not successfully deployed } } diff --git a/nexus-blobstore-google-cloud/pom.xml b/nexus-blobstore-google-cloud/pom.xml index 4c33905..99f12c2 100644 --- a/nexus-blobstore-google-cloud/pom.xml +++ b/nexus-blobstore-google-cloud/pom.xml @@ -62,11 +62,6 @@ google-cloud-datastore - - com.google.oauth-client - google-oauth-client - - io.dropwizard.metrics metrics-healthchecks diff --git a/nexus-blobstore-google-cloud/src/main/java/org/sonatype/nexus/blobstore/gcloud/internal/MultipartUploader.java b/nexus-blobstore-google-cloud/src/main/java/org/sonatype/nexus/blobstore/gcloud/internal/MultipartUploader.java index b094928..127df06 100644 --- a/nexus-blobstore-google-cloud/src/main/java/org/sonatype/nexus/blobstore/gcloud/internal/MultipartUploader.java +++ b/nexus-blobstore-google-cloud/src/main/java/org/sonatype/nexus/blobstore/gcloud/internal/MultipartUploader.java @@ -36,6 +36,7 @@ import com.google.cloud.storage.BlobInfo; import com.google.cloud.storage.Storage; import com.google.cloud.storage.Storage.BlobTargetOption; +import com.google.cloud.storage.Storage.BlobWriteOption; import com.google.cloud.storage.Storage.ComposeRequest; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.Futures; @@ -151,8 +152,7 @@ public Blob upload(final Storage storage, final String bucket, final String dest BlobInfo blobInfo = BlobInfo.newBuilder(bucket, finalChunkName).build(); // read the rest of the current stream // downside here is that since we don't know the stream size, we can't chunk it. - // the deprecated create method here does not allow us to disable GZIP compression on these PUTs - return storage.create(blobInfo, current); + return storage.create(blobInfo, current, BlobWriteOption.disableGzipContent()); })); } diff --git a/pom.xml b/pom.xml index 77dc2c4..6e99080 100644 --- a/pom.xml +++ b/pom.xml @@ -34,29 +34,22 @@ - 1.84.0 + 1.84.0 + 1.104.0 3.20.1-01 - com.google.cloud google-cloud-storage - ${google-cloud.version} + ${google-cloud-storage.version} - com.google.cloud google-cloud-datastore - ${google-cloud.version} - - - - com.google.oauth-client - google-oauth-client - 1.30.1 + ${google-cloud-datastore.version}