Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deprecated aws s3 api #410

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update deprecated aws s3 api #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dev/cosbench-ampli/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-api/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-cdmi-base/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-cdmi-swift/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-cdmi-util/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-controller-web/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-controller/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-core-web/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-core/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-driver-web/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-driver/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-gcs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-http/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-httpauth/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-keystone/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-librados/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-log/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-mock/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
10 changes: 5 additions & 5 deletions dev/cosbench-s3/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ Bundle-Version: 0.4.1.0
Bundle-Vendor: intel
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
aws-java-sdk-s3-1.10.76.jar,
aws-java-sdk-kms-1.10.76.jar,
aws-java-sdk-core-1.10.76.jar,
aws-java-sdk-s3-1.11.1028.jar,
aws-java-sdk-kms-1.11.1028.jar,
aws-java-sdk-core-1.11.1028.jar,
aspectjrt.jar,
aspectjweaver.jar,
commons-codec-1.6.jar,
commons-logging-1.1.3.jar,
freemarker-2.3.20.jar,
httpclient-4.3.6.jar,
httpcore-4.3.3.jar,
httpclient-4.5.13.jar,
httpcore-4.4.13.jar,
jackson-core-asl-1.8.7.jar,
jackson-mapper-asl-1.8.7.jar,
jackson-databind-2.5.3.jar,
Expand Down
Binary file removed dev/cosbench-s3/aws-java-sdk-core-1.10.76.jar
View file
Open in desktop
Binary file not shown.
Binary file added dev/cosbench-s3/aws-java-sdk-core-1.11.1028.jar
View file
Open in desktop
Binary file not shown.
Binary file removed dev/cosbench-s3/aws-java-sdk-kms-1.10.76.jar
View file
Open in desktop
Binary file not shown.
Binary file added dev/cosbench-s3/aws-java-sdk-kms-1.11.1028.jar
View file
Open in desktop
Binary file not shown.
Binary file removed dev/cosbench-s3/aws-java-sdk-s3-1.10.76.jar
View file
Open in desktop
Binary file not shown.
Binary file added dev/cosbench-s3/aws-java-sdk-s3-1.11.1028.jar
View file
Open in desktop
Binary file not shown.
Binary file removed dev/cosbench-s3/httpclient-4.3.6.jar
View file
Open in desktop
Binary file not shown.
Binary file added dev/cosbench-s3/httpclient-4.5.13.jar
View file
Open in desktop
Binary file not shown.
Binary file removed dev/cosbench-s3/httpcore-4.3.3.jar
View file
Open in desktop
Binary file not shown.
Binary file added dev/cosbench-s3/httpcore-4.4.13.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public InputStream getObject(String container, String object, Config config) {
public void createContainer(String container, Config config) {
super.createContainer(container, config);
try {
if(!client.doesBucketExist(container)) {
if(!client.doesBucketExistV2(container)) {

client.createBucket(container);
}
Expand Down Expand Up @@ -134,7 +134,7 @@ public void createObject(String container, String object, InputStream data,
public void deleteContainer(String container, Config config) {
super.deleteContainer(container, config);
try {
if(client.doesBucketExist(container)) {
if(client.doesBucketExistV2(container)) {
client.deleteBucket(container);
}
} catch(AmazonS3Exception awse) {
Expand Down
1 change: 1 addition & 0 deletions dev/cosbench-scality/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-swauth/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-swift/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
1 change: 1 addition & 0 deletions dev/cosbench-tomcat/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
Binary file added dist/osgi/plugins/cosbench-s3_0.4.1.0.jar
View file
Open in desktop
Binary file not shown.