Porównaj commity

...

4 Commity

Autor SHA1 Wiadomość Data
dependabot[bot] 33e8c55dc8 Bump org.assertj:assertj-core from 3.24.2 to 3.25.3
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-25 18:04:03 +09:00
dependabot[bot] dcf7624e4c Bump org.testng:testng from 7.5 to 7.5.1
Bumps [org.testng:testng](https://github.com/cbeust/testng) from 7.5 to 7.5.1.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/testng-team/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/compare/7.5...7.5.1)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-25 18:03:56 +09:00
Andrew Gaul 90d6abc7fb Reapply "Upgrade to jclouds 2.6.0-SNAPSHOT"
This reverts commit e1e1a9e0fd.
References #473.
2024-02-25 17:42:15 +09:00
Andrew Gaul bf879d653e Set Jetty legacy URI compliance
This resolves an issue with, "Ambiguous URI empty segment" in s3fs
integration test_time_mountpoint.
2024-02-25 16:04:06 +09:00
8 zmienionych plików z 36 dodań i 28 usunięć

Wyświetl plik

@ -279,7 +279,7 @@
</dependency>
</dependencies>
<configuration>
<parallel>all</parallel>
<parallel>classes</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.5.0</jclouds.version>
<jclouds.version>2.6.0-SNAPSHOT</jclouds.version>
<jetty.version>11.0.20</jetty.version>
<slf4j.version>2.0.11</slf4j.version>
<shade.prefix>${project.groupId}.shaded</shade.prefix>
@ -466,7 +466,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>1.7.1</version>
<version>3.25.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@ -509,7 +509,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.21</version>
<version>7.5.1</version>
<scope>test</scope>
</dependency>
<dependency>

Wyświetl plik

@ -31,6 +31,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.http.UriCompliance;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
@ -86,6 +87,7 @@ public final class S3Proxy {
HttpConfiguration httpConfiguration = new HttpConfiguration();
httpConfiguration.setHttpCompliance(HttpCompliance.LEGACY);
httpConfiguration.setUriCompliance(UriCompliance.LEGACY);
SecureRequestCustomizer src = new SecureRequestCustomizer();
src.setSniHostCheck(false);
httpConfiguration.addCustomizer(src);

Wyświetl plik

@ -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.AfterClass;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.Test;
@SuppressWarnings("UnstableApiUsage")
@ -64,10 +64,11 @@ public final class EncryptedBlobStoreLiveTest extends S3ClientLiveTest {
private S3Proxy s3Proxy;
private BlobStoreContext context;
@AfterClass
public void tearDown() throws Exception {
s3Proxy.stop();
@AfterSuite
@Override
public void destroyResources() throws Exception {
context.close();
s3Proxy.stop();
}
@Override

Wyświetl plik

@ -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.AfterClass;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.Test;
@Test(testName = "JcloudsBucketsLiveTest")
@ -46,10 +46,11 @@ public final class JcloudsBucketsLiveTest extends BucketsLiveTest {
private BlobStoreContext context;
private String blobStoreType;
@AfterClass
public void tearDown() throws Exception {
s3Proxy.stop();
@AfterSuite
@Override
public void destroyResources() throws Exception {
context.close();
s3Proxy.stop();
}
@Override

Wyświetl plik

@ -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.AfterClass;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.Test;
@Test(testName = "JcloudsS3BlobIntegrationLiveTest")
@ -42,10 +42,11 @@ public final class JcloudsS3BlobIntegrationLiveTest
private BlobStoreContext context;
private String blobStoreType;
@AfterClass
public void tearDown() throws Exception {
s3Proxy.stop();
@AfterSuite
@Override
public void destroyResources() throws Exception {
context.close();
s3Proxy.stop();
}
@Override

Wyświetl plik

@ -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.AfterClass;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.Test;
@Test(testName = "JcloudsS3BlobSignerLiveTest")
@ -38,10 +38,11 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
private S3Proxy s3Proxy;
private BlobStoreContext context;
@AfterClass
public void tearDown() throws Exception {
s3Proxy.stop();
@AfterSuite
@Override
public void destroyResources() throws Exception {
context.close();
s3Proxy.stop();
}
@Override

Wyświetl plik

@ -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.AfterClass;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.Test;
@Test(testName = "JcloudsS3ClientLiveTest")
@ -50,10 +50,11 @@ public final class JcloudsS3ClientLiveTest extends S3ClientLiveTest {
private BlobStoreContext context;
private String blobStoreType;
@AfterClass
public void tearDown() throws Exception {
s3Proxy.stop();
@AfterSuite
@Override
public void destroyResources() throws Exception {
context.close();
s3Proxy.stop();
}
@Override

Wyświetl plik

@ -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.AfterClass;
import org.testng.annotations.AfterSuite;
import org.testng.annotations.Test;
@Test(testName = "JcloudsS3ContainerIntegrationLiveTest")
@ -41,10 +41,11 @@ public final class JcloudsS3ContainerIntegrationLiveTest
private BlobStoreContext context;
private String blobStoreType;
@AfterClass
public void tearDown() throws Exception {
s3Proxy.stop();
@AfterSuite
@Override
public void destroyResources() throws Exception {
context.close();
s3Proxy.stop();
}
@Override