From fd00720376236e3c3d030f977c2eb245140a52cd Mon Sep 17 00:00:00 2001 From: AndreyKoltsov1997 Date: Mon, 11 Jan 2021 15:10:21 +0300 Subject: [PATCH 1/7] Replace interfaces' references for credentials. --- .../mongoose/storage/driver/pravega/PravegaStorageDriver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/emc/mongoose/storage/driver/pravega/PravegaStorageDriver.java b/src/main/java/com/emc/mongoose/storage/driver/pravega/PravegaStorageDriver.java index 2af952d1..f3f89c9e 100644 --- a/src/main/java/com/emc/mongoose/storage/driver/pravega/PravegaStorageDriver.java +++ b/src/main/java/com/emc/mongoose/storage/driver/pravega/PravegaStorageDriver.java @@ -96,8 +96,8 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import io.pravega.client.stream.impl.Credentials; -import io.pravega.client.stream.impl.DefaultCredentials; +import io.pravega.shared.security.auth.Credentials; +import io.pravega.shared.security.auth.DefaultCredentials; import io.pravega.client.stream.impl.PositionImpl; import io.pravega.client.stream.impl.StreamImpl; import io.pravega.common.util.AsyncIterator; From d1d5d26ba7773b71b2a0a2df2d2bb7dd2771368e Mon Sep 17 00:00:00 2001 From: AndreyKoltsov1997 Date: Mon, 11 Jan 2021 16:50:01 +0300 Subject: [PATCH 2/7] Update Pravega client properties. --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 885b918c..c117af0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -pravegaCommit=e4c436b -pravegaVersion=v0.8.0 +pravegaCommit=cb8aab2 +pravegaVersion=v0.10.0 From 10d580906f3776327471bf70eeb1dcbcbb51e834 Mon Sep 17 00:00:00 2001 From: Andrey Koltsov Date: Mon, 11 Jan 2021 18:34:38 +0300 Subject: [PATCH 3/7] Add security module @ build.gradle --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 7f489936..97c41a2a 100644 --- a/build.gradle +++ b/build.gradle @@ -75,6 +75,7 @@ ext { pravegaClientJarDir = "${pravegaSrcDir}${File.separator}client${File.separator}${buildLibsPath}" pravegaCommonJarDir = "${pravegaSrcDir}${File.separator}common${File.separator}${buildLibsPath}" pravegaSharedAuthpluginJarDir = "${pravegaSrcDir}${File.separator}shared${File.separator}authplugin${File.separator}${buildLibsPath}" + pravegaSharedSecurityPluginJarDir = "${pravegaSrcDir}${File.separator}shared${File.separator}security${File.separator}${buildLibsPath}" pravegaSharedControllerApiJarDir = "${pravegaSrcDir}${File.separator}shared${File.separator}controller-api${File.separator}${buildLibsPath}" pravegaSharedProtocolJarDir = "${pravegaSrcDir}${File.separator}shared${File.separator}protocol${File.separator}${buildLibsPath}" } @@ -166,6 +167,7 @@ dependencies { files( "${pravegaClientJarDir}${File.separator}pravega-client-${pravegaVersion}.jar", "${pravegaCommonJarDir}${File.separator}pravega-common-${pravegaVersion}.jar", + "${pravegaSharedSecurityPluginJarDir}${File.separator}pravega-shared-security-${pravegaVersion}.jar", "${pravegaSharedAuthpluginJarDir}${File.separator}pravega-shared-authplugin-${pravegaVersion}.jar", "${pravegaSharedControllerApiJarDir}${File.separator}pravega-shared-controller-api-${pravegaVersion}.jar", "${pravegaSharedProtocolJarDir}${File.separator}pravega-shared-protocol-${pravegaVersion}.jar", From 56dcb13afd9ef484ddc115368b0c5905be0931ef Mon Sep 17 00:00:00 2001 From: Andrey Koltsov Date: Tue, 9 Mar 2021 17:09:55 +0300 Subject: [PATCH 4/7] Add configurable Pravega URI. --- build.gradle | 2 +- gradle.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 97c41a2a..9a3bb748 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,7 @@ task clonePravegaRepo { } if(!destDir.exists()) { def gitRepo = Grgit.clone { - uri = "https://github.com/pravega/pravega.git" + uri = pravegaUri dir = pravegaSrcDir } gitRepo.reset { diff --git a/gradle.properties b/gradle.properties index c117af0c..e6bbc5ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ pravegaCommit=cb8aab2 pravegaVersion=v0.10.0 +pravegaUri=https://github.com/pravega/pravega.git \ No newline at end of file From e9cc7b415a0526736688525e75eca6c4951a007d Mon Sep 17 00:00:00 2001 From: AndreyKoltsov1997 Date: Sat, 13 Mar 2021 11:39:13 +0300 Subject: [PATCH 5/7] Update Mongoose Base version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9a3bb748..ad304e9b 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ ext { grpc : "1.30.0", guava : "28.1-jre", log4j : "2.8.2", - mongooseBase : "4.2.19", + mongooseBase : "4.3.0", mongooseStorageDriverPreempt: "4.2.23", netty : "4.1.45.Final", nettyTcNative : "2.0.25.Final", From 98206953cc1531ecb2f475dabfb75b3d5b789ba0 Mon Sep 17 00:00:00 2001 From: AndreyKoltsov1997 Date: Sat, 13 Mar 2021 12:45:52 +0300 Subject: [PATCH 6/7] Change Mongoose Base release to development. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ad304e9b..a4f5f403 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ ext { grpc : "1.30.0", guava : "28.1-jre", log4j : "2.8.2", - mongooseBase : "4.3.0", + mongooseBase : "4.3.0-development", mongooseStorageDriverPreempt: "4.2.23", netty : "4.1.45.Final", nettyTcNative : "2.0.25.Final", From baca6160127c7adf944a4f0e5a0b2d417e293d5d Mon Sep 17 00:00:00 2001 From: AndreyKoltsov1997 Date: Thu, 25 Mar 2021 13:12:12 +0300 Subject: [PATCH 7/7] Set Gradle properties with respect to the latest Pravega release. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a4f5f403..9a3bb748 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ ext { grpc : "1.30.0", guava : "28.1-jre", log4j : "2.8.2", - mongooseBase : "4.3.0-development", + mongooseBase : "4.2.19", mongooseStorageDriverPreempt: "4.2.23", netty : "4.1.45.Final", nettyTcNative : "2.0.25.Final",