diff --git a/dev/cosbench-s3/.classpath b/dev/cosbench-s3/.classpath
index c836559b..d5ba8291 100644
--- a/dev/cosbench-s3/.classpath
+++ b/dev/cosbench-s3/.classpath
@@ -3,21 +3,26 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/cosbench-s3/META-INF/MANIFEST.MF b/dev/cosbench-s3/META-INF/MANIFEST.MF
index 5aa9c0ad..e81b0826 100644
--- a/dev/cosbench-s3/META-INF/MANIFEST.MF
+++ b/dev/cosbench-s3/META-INF/MANIFEST.MF
@@ -6,22 +6,27 @@ Bundle-Version: 0.4.1.0
Bundle-Vendor: intel
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
- com.amazonaws-1.0.0.jar,
+ aws-java-sdk-s3-1.10.76.jar,
+ aws-java-sdk-kms-1.10.76.jar,
+ aws-java-sdk-core-1.10.76.jar,
aspectjrt.jar,
aspectjweaver.jar,
- commons-codec-1.3.jar,
- commons-logging-1.1.1.jar,
+ commons-codec-1.6.jar,
+ commons-logging-1.1.3.jar,
freemarker-2.3.20.jar,
- httpclient-4.1.1.jar,
- httpcore-4.1.jar,
+ httpclient-4.3.6.jar,
+ httpcore-4.3.3.jar,
jackson-core-asl-1.8.7.jar,
jackson-mapper-asl-1.8.7.jar,
+ jackson-databind-2.5.3.jar,
+ jackson-annotations-2.5.0.jar,
+ jackson-core-2.5.3.jar,
+ jackson-dataformat-cbor-2.5.3.jar,
+ joda-time-2.8.1.jar,
mail-1.4.3.jar,
spring-beans-3.0.7.jar,
spring-context-3.0.7.jar,
- spring-core-3.0.7.jar,
- stax-1.2.0.jar,
- stax-api-1.0.1.jar
+ spring-core-3.0.7.jar
Import-Package: com.intel.cosbench.api.auth,
com.intel.cosbench.api.context,
com.intel.cosbench.api.storage,
diff --git a/dev/cosbench-s3/aws-java-sdk-core-1.10.76.jar b/dev/cosbench-s3/aws-java-sdk-core-1.10.76.jar
new file mode 100644
index 00000000..6b24595a
Binary files /dev/null and b/dev/cosbench-s3/aws-java-sdk-core-1.10.76.jar differ
diff --git a/dev/cosbench-s3/aws-java-sdk-kms-1.10.76.jar b/dev/cosbench-s3/aws-java-sdk-kms-1.10.76.jar
new file mode 100644
index 00000000..d3551b5a
Binary files /dev/null and b/dev/cosbench-s3/aws-java-sdk-kms-1.10.76.jar differ
diff --git a/dev/cosbench-s3/aws-java-sdk-s3-1.10.76.jar b/dev/cosbench-s3/aws-java-sdk-s3-1.10.76.jar
new file mode 100644
index 00000000..2d19a17b
Binary files /dev/null and b/dev/cosbench-s3/aws-java-sdk-s3-1.10.76.jar differ
diff --git a/dev/cosbench-s3/build.properties b/dev/cosbench-s3/build.properties
index d1e947ee..eb7bb7b3 100644
--- a/dev/cosbench-s3/build.properties
+++ b/dev/cosbench-s3/build.properties
@@ -1,36 +1,25 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- com.amazonaws-1.0.0.jar,\
.,\
+ aws-java-sdk-s3-1.10.76.jar,\
+ aws-java-sdk-kms-1.10.76.jar,\
+ aws-java-sdk-core-1.10.76.jar,\
aspectjrt.jar,\
aspectjweaver.jar,\
- commons-codec-1.3.jar,\
- commons-logging-1.1.1.jar,\
+ commons-codec-1.6.jar,\
+ commons-logging-1.1.3.jar,\
freemarker-2.3.20.jar,\
- httpclient-4.1.1.jar,\
- httpcore-4.1.jar,\
+ httpclient-4.3.6.jar,\
+ httpcore-4.3.3.jar,\
jackson-core-asl-1.8.7.jar,\
jackson-mapper-asl-1.8.7.jar,\
+ jackson-databind-2.5.3.jar,\
+ jackson-annotations-2.5.0.jar,\
+ jackson-core-2.5.3.jar,\
+ jackson-dataformat-cbor-2.5.3.jar,\
+ joda-time-2.8.1.jar,\
mail-1.4.3.jar,\
spring-beans-3.0.7.jar,\
spring-context-3.0.7.jar,\
- spring-core-3.0.7.jar,\
- stax-1.2.0.jar,\
- stax-api-1.0.1.jar
- .,\
- aspectjrt.jar,\
- aspectjweaver.jar,\
- commons-codec-1.3.jar,\
- commons-logging-1.1.1.jar,\
- freemarker-2.3.20.jar,\
- httpclient-4.1.1.jar,\
- httpcore-4.1.jar,\
- jackson-core-asl-1.8.7.jar,\
- jackson-mapper-asl-1.8.7.jar,\
- mail-1.4.3.jar,\
- spring-beans-3.0.7.jar,\
- spring-context-3.0.7.jar,\
- spring-core-3.0.7.jar,\
- stax-1.2.0.jar,\
- stax-api-1.0.1.jar
+ spring-core-3.0.7.jar
diff --git a/dev/cosbench-s3/com.amazonaws-1.0.0.jar b/dev/cosbench-s3/com.amazonaws-1.0.0.jar
deleted file mode 100644
index 8a4de1aa..00000000
Binary files a/dev/cosbench-s3/com.amazonaws-1.0.0.jar and /dev/null differ
diff --git a/dev/cosbench-s3/commons-codec-1.3.jar b/dev/cosbench-s3/commons-codec-1.3.jar
deleted file mode 100644
index 957b6752..00000000
Binary files a/dev/cosbench-s3/commons-codec-1.3.jar and /dev/null differ
diff --git a/dev/cosbench-s3/commons-codec-1.6.jar b/dev/cosbench-s3/commons-codec-1.6.jar
new file mode 100644
index 00000000..ee1bc49a
Binary files /dev/null and b/dev/cosbench-s3/commons-codec-1.6.jar differ
diff --git a/dev/cosbench-s3/commons-logging-1.1.1.jar b/dev/cosbench-s3/commons-logging-1.1.1.jar
deleted file mode 100644
index 8758a96b..00000000
Binary files a/dev/cosbench-s3/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/dev/cosbench-s3/commons-logging-1.1.3.jar b/dev/cosbench-s3/commons-logging-1.1.3.jar
new file mode 100644
index 00000000..ab512540
Binary files /dev/null and b/dev/cosbench-s3/commons-logging-1.1.3.jar differ
diff --git a/dev/cosbench-s3/httpclient-4.1.1.jar b/dev/cosbench-s3/httpclient-4.1.1.jar
deleted file mode 100644
index c845ef96..00000000
Binary files a/dev/cosbench-s3/httpclient-4.1.1.jar and /dev/null differ
diff --git a/dev/cosbench-s3/httpclient-4.3.6.jar b/dev/cosbench-s3/httpclient-4.3.6.jar
new file mode 100755
index 00000000..091498c9
Binary files /dev/null and b/dev/cosbench-s3/httpclient-4.3.6.jar differ
diff --git a/dev/cosbench-s3/httpcore-4.1.jar b/dev/cosbench-s3/httpcore-4.1.jar
deleted file mode 100644
index a357c076..00000000
Binary files a/dev/cosbench-s3/httpcore-4.1.jar and /dev/null differ
diff --git a/dev/cosbench-s3/httpcore-4.3.3.jar b/dev/cosbench-s3/httpcore-4.3.3.jar
new file mode 100755
index 00000000..a8747b0c
Binary files /dev/null and b/dev/cosbench-s3/httpcore-4.3.3.jar differ
diff --git a/dev/cosbench-s3/jackson-annotations-2.5.0.jar b/dev/cosbench-s3/jackson-annotations-2.5.0.jar
new file mode 100755
index 00000000..62521310
Binary files /dev/null and b/dev/cosbench-s3/jackson-annotations-2.5.0.jar differ
diff --git a/dev/cosbench-s3/jackson-core-2.5.3.jar b/dev/cosbench-s3/jackson-core-2.5.3.jar
new file mode 100755
index 00000000..f3ae1ae5
Binary files /dev/null and b/dev/cosbench-s3/jackson-core-2.5.3.jar differ
diff --git a/dev/cosbench-s3/jackson-databind-2.5.3.jar b/dev/cosbench-s3/jackson-databind-2.5.3.jar
new file mode 100755
index 00000000..e2171874
Binary files /dev/null and b/dev/cosbench-s3/jackson-databind-2.5.3.jar differ
diff --git a/dev/cosbench-s3/jackson-dataformat-cbor-2.5.3.jar b/dev/cosbench-s3/jackson-dataformat-cbor-2.5.3.jar
new file mode 100755
index 00000000..e8ecc04c
Binary files /dev/null and b/dev/cosbench-s3/jackson-dataformat-cbor-2.5.3.jar differ
diff --git a/dev/cosbench-s3/joda-time-2.8.1.jar b/dev/cosbench-s3/joda-time-2.8.1.jar
new file mode 100755
index 00000000..94be6599
Binary files /dev/null and b/dev/cosbench-s3/joda-time-2.8.1.jar differ
diff --git a/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java b/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java
index 7a7c34a4..509c56be 100644
--- a/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java
+++ b/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java
@@ -55,6 +55,7 @@ public void init(Config config, Logger logger) {
clientConf.setConnectionTimeout(timeout);
clientConf.setSocketTimeout(timeout);
clientConf.withUseExpectContinue(false);
+ clientConf.withSignerOverride("S3SignerType");
// clientConf.setProtocol(Protocol.HTTP);
if((!proxyHost.equals(""))&&(!proxyPort.equals(""))){
clientConf.setProxyHost(proxyHost);
diff --git a/dev/cosbench-s3/stax-1.2.0.jar b/dev/cosbench-s3/stax-1.2.0.jar
deleted file mode 100644
index 0df112a9..00000000
Binary files a/dev/cosbench-s3/stax-1.2.0.jar and /dev/null differ
diff --git a/dev/cosbench-s3/stax-api-1.0.1.jar b/dev/cosbench-s3/stax-api-1.0.1.jar
deleted file mode 100644
index d9a16651..00000000
Binary files a/dev/cosbench-s3/stax-api-1.0.1.jar and /dev/null differ