Skip to content

Commit

Permalink
Revert "Upgrade to jclouds 2.6.0-SNAPSHOT"
Browse files Browse the repository at this point in the history 
This reverts commit 222f479.
References #473.
  • Loading branch information
@gaul
gaul committed Sep 26, 2023
1 parent b134e81 commit e1e1a9e
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 34 deletions.
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
</dependency>
</dependencies>
<configuration>
<parallel>classes</parallel>
<parallel>all</parallel>
<threadCount>1</threadCount>
<argLine>-Xmx512m</argLine>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
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")
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
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")
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
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")
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
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")
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
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")
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
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")
Expand All @@ -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
Expand Down

0 comments on commit e1e1a9e

Please sign in to comment.