kopia lustrzana https://github.com/gaul/s3proxy
Revert "Upgrade to jclouds 2.6.0-SNAPSHOT"
This reverts commit 222f4796b1
.
References #473.
pull/554/head
rodzic
b134e81406
commit
e1e1a9e0fd
8
pom.xml
8
pom.xml
|
@ -280,7 +280,7 @@
|
|||
</dependency>
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<parallel>classes</parallel>
|
||||
<parallel>all</parallel>
|
||||
<threadCount>1</threadCount>
|
||||
<argLine>-Xmx512m</argLine>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
|
@ -361,7 +361,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<java.version>11</java.version>
|
||||
<jclouds.version>2.6.0-SNAPSHOT</jclouds.version>
|
||||
<jclouds.version>2.5.0</jclouds.version>
|
||||
<slf4j.version>2.0.7</slf4j.version>
|
||||
<shade.prefix>${project.groupId}.shaded</shade.prefix>
|
||||
<surefire.version>3.0.0</surefire.version>
|
||||
|
@ -465,7 +465,7 @@
|
|||
<artifactId>assertj-core</artifactId>
|
||||
<scope>test</scope>
|
||||
<!-- we need to use the same version as in jclouds because we pull in their tests -->
|
||||
<version>3.24.2</version>
|
||||
<version>1.7.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
|
@ -508,7 +508,7 @@
|
|||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<version>7.5</version>
|
||||
<version>6.8.21</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -48,7 +48,7 @@ import org.jclouds.s3.domain.ObjectMetadataBuilder;
|
|||
import org.jclouds.s3.domain.S3Object;
|
||||
import org.jclouds.s3.reference.S3Constants;
|
||||
import org.testng.SkipException;
|
||||
import org.testng.annotations.AfterSuite;
|
||||
import org.testng.annotations.AfterClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@SuppressWarnings("UnstableApiUsage")
|
||||
|
@ -64,11 +64,10 @@ public final class EncryptedBlobStoreLiveTest extends S3ClientLiveTest {
|
|||
private S3Proxy s3Proxy;
|
||||
private BlobStoreContext context;
|
||||
|
||||
@AfterSuite
|
||||
@Override
|
||||
public void destroyResources() throws Exception {
|
||||
context.close();
|
||||
@AfterClass
|
||||
public void tearDown() throws Exception {
|
||||
s3Proxy.stop();
|
||||
context.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -32,7 +32,7 @@ import org.jclouds.blobstore.BlobStoreContext;
|
|||
import org.jclouds.s3.reference.S3Constants;
|
||||
import org.jclouds.s3.services.BucketsLiveTest;
|
||||
import org.testng.SkipException;
|
||||
import org.testng.annotations.AfterSuite;
|
||||
import org.testng.annotations.AfterClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@Test(testName = "JcloudsBucketsLiveTest")
|
||||
|
@ -46,11 +46,10 @@ public final class JcloudsBucketsLiveTest extends BucketsLiveTest {
|
|||
private BlobStoreContext context;
|
||||
private String blobStoreType;
|
||||
|
||||
@AfterSuite
|
||||
@Override
|
||||
public void destroyResources() throws Exception {
|
||||
context.close();
|
||||
@AfterClass
|
||||
public void tearDown() throws Exception {
|
||||
s3Proxy.stop();
|
||||
context.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -27,7 +27,7 @@ import org.jclouds.blobstore.domain.Blob;
|
|||
import org.jclouds.s3.blobstore.integration.S3BlobIntegrationLiveTest;
|
||||
import org.jclouds.s3.reference.S3Constants;
|
||||
import org.testng.SkipException;
|
||||
import org.testng.annotations.AfterSuite;
|
||||
import org.testng.annotations.AfterClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@Test(testName = "JcloudsS3BlobIntegrationLiveTest")
|
||||
|
@ -42,11 +42,10 @@ public final class JcloudsS3BlobIntegrationLiveTest
|
|||
private BlobStoreContext context;
|
||||
private String blobStoreType;
|
||||
|
||||
@AfterSuite
|
||||
@Override
|
||||
public void destroyResources() throws Exception {
|
||||
context.close();
|
||||
@AfterClass
|
||||
public void tearDown() throws Exception {
|
||||
s3Proxy.stop();
|
||||
context.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -25,7 +25,7 @@ import org.jclouds.Constants;
|
|||
import org.jclouds.blobstore.BlobStoreContext;
|
||||
import org.jclouds.s3.blobstore.integration.S3BlobSignerLiveTest;
|
||||
import org.jclouds.s3.reference.S3Constants;
|
||||
import org.testng.annotations.AfterSuite;
|
||||
import org.testng.annotations.AfterClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@Test(testName = "JcloudsS3BlobSignerLiveTest")
|
||||
|
@ -38,11 +38,10 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
|
|||
private S3Proxy s3Proxy;
|
||||
private BlobStoreContext context;
|
||||
|
||||
@AfterSuite
|
||||
@Override
|
||||
public void destroyResources() throws Exception {
|
||||
context.close();
|
||||
@AfterClass
|
||||
public void tearDown() throws Exception {
|
||||
s3Proxy.stop();
|
||||
context.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -36,7 +36,7 @@ import org.jclouds.s3.S3ClientLiveTest;
|
|||
import org.jclouds.s3.domain.S3Object;
|
||||
import org.jclouds.s3.reference.S3Constants;
|
||||
import org.testng.SkipException;
|
||||
import org.testng.annotations.AfterSuite;
|
||||
import org.testng.annotations.AfterClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@Test(testName = "JcloudsS3ClientLiveTest")
|
||||
|
@ -50,11 +50,10 @@ public final class JcloudsS3ClientLiveTest extends S3ClientLiveTest {
|
|||
private BlobStoreContext context;
|
||||
private String blobStoreType;
|
||||
|
||||
@AfterSuite
|
||||
@Override
|
||||
public void destroyResources() throws Exception {
|
||||
context.close();
|
||||
@AfterClass
|
||||
public void tearDown() throws Exception {
|
||||
s3Proxy.stop();
|
||||
context.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -26,7 +26,7 @@ import org.jclouds.blobstore.BlobStoreContext;
|
|||
import org.jclouds.s3.blobstore.integration.S3ContainerIntegrationLiveTest;
|
||||
import org.jclouds.s3.reference.S3Constants;
|
||||
import org.testng.SkipException;
|
||||
import org.testng.annotations.AfterSuite;
|
||||
import org.testng.annotations.AfterClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@Test(testName = "JcloudsS3ContainerIntegrationLiveTest")
|
||||
|
@ -41,11 +41,10 @@ public final class JcloudsS3ContainerIntegrationLiveTest
|
|||
private BlobStoreContext context;
|
||||
private String blobStoreType;
|
||||
|
||||
@AfterSuite
|
||||
@Override
|
||||
public void destroyResources() throws Exception {
|
||||
context.close();
|
||||
@AfterClass
|
||||
public void tearDown() throws Exception {
|
||||
s3Proxy.stop();
|
||||
context.close();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Ładowanie…
Reference in New Issue