Overriding the http client for streaming s3 connector
diff --git a/controller/pom.xml b/controller/pom.xml
index e75b481..65943ea 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -102,7 +102,7 @@
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
- <version>0.32.0</version>
+ <version>${sshj}</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index b6767db..8467ac5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -157,8 +157,8 @@
<org.slf4j.version>1.7.25</org.slf4j.version>
<log4j2.version>2.16.0</log4j2.version>
<dozer>5.5.1</dozer>
- <jsch>0.1.55</jsch>
- <sshj>0.27.0</sshj>
+ <jsch>0.1.54</jsch>
+ <sshj>0.32.0</sshj>
<mariadb.jdbc>2.5.1</mariadb.jdbc>
<jclouds.version>2.5.0</jclouds.version>
<commons.io.version>2.6</commons.io.version>
diff --git a/standalone-service/src/main/resources/application.properties b/standalone-service/src/main/resources/application.properties
index 8e413af..629d6f3 100644
--- a/standalone-service/src/main/resources/application.properties
+++ b/standalone-service/src/main/resources/application.properties
@@ -21,5 +21,8 @@
consul.host=localhost
consul.port=8500
-grpc.port=7003
+resource.service.host=localhost
+resource.service.port=7003
+secret.service.host=localhost
+secret.service.port=7003
agent.id=local-agent
\ No newline at end of file
diff --git a/transport/s3-transport/pom.xml b/transport/s3-transport/pom.xml
index ae524c7..6974b20 100644
--- a/transport/s3-transport/pom.xml
+++ b/transport/s3-transport/pom.xml
@@ -51,6 +51,11 @@
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws.sdk.version}</version>
</dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>apache-client</artifactId>
+ <version>2.17.157</version>
+ </dependency>
</dependencies>
<build>
diff --git a/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingStreamingConnector.java b/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingStreamingConnector.java
index 3eaa2c8..710d334 100644
--- a/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingStreamingConnector.java
+++ b/transport/s3-transport/src/main/java/org/apache/airavata/mft/transport/s3/S3OutgoingStreamingConnector.java
@@ -30,6 +30,7 @@
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
@@ -68,6 +69,7 @@
}
S3Client s3Client = S3Client.builder()
+ .httpClient(ApacheHttpClient.builder().build())
.region(Region.of(s3Storage.getRegion())).endpointOverride(new URI(s3Storage.getEndpoint()))
.credentialsProvider(() -> awsCreds)
.build();
