[nifi] 02/03: NIFI-11091 This closes #6884. Upgraded Google libraries-bom from 25.4.0 to 26.4.0

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 4fe2c318e6fde4e6b2f51f5a61cfda4220a8f54a
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Tue Jan 24 15:58:59 2023 -0600

    NIFI-11091 This closes #6884. Upgraded Google libraries-bom from 25.4.0 to 26.4.0
    
    - Upgraded Google Drive library to v3-rev20221219-2.0.0
    - Corrected test encryption keys to match expected encoding
    
    Signed-off-by: Joe Witt <jo...@apache.org>
---
 nifi-commons/nifi-property-protection-gcp/pom.xml                   | 2 +-
 nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml        | 6 +++++-
 .../org/apache/nifi/processors/gcp/storage/FetchGCSObjectTest.java  | 2 +-
 .../org/apache/nifi/processors/gcp/storage/PutGCSObjectTest.java    | 4 ++--
 nifi-nar-bundles/nifi-gcp-bundle/pom.xml                            | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml b/nifi-commons/nifi-property-protection-gcp/pom.xml
index 7710ec1855..f7306163cb 100644
--- a/nifi-commons/nifi-property-protection-gcp/pom.xml
+++ b/nifi-commons/nifi-property-protection-gcp/pom.xml
@@ -22,7 +22,7 @@
     </parent>
     <artifactId>nifi-property-protection-gcp</artifactId>
     <properties>
-        <gcp.sdk.version>25.4.0</gcp.sdk.version>
+        <gcp.sdk.version>26.4.0</gcp.sdk.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
index 8c5871ebf8..2063da4b54 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
@@ -92,6 +92,10 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -155,7 +159,7 @@
         <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-drive</artifactId>
-            <version>v3-rev20220709-1.32.1</version>
+            <version>v3-rev20221219-2.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.tdunning</groupId>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectTest.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectTest.java
index c98702d6d2..2d15396752 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectTest.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectTest.java
@@ -91,7 +91,7 @@ public class FetchGCSObjectTest extends AbstractGCSTest {
     private static final String CONTENT_TYPE = "test-content-type";
     private static final String CRC32C = "test-crc32c";
     private static final String ENCRYPTION = "test-encryption";
-    private static final String ENCRYPTION_SHA256 = "test-encryption-256";
+    private static final String ENCRYPTION_SHA256 = "12345678";
     private static final String ETAG = "test-etag";
     private static final String GENERATED_ID = "test-generated-id";
     private static final String MD5 = "test-md5";
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectTest.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectTest.java
index 1d463f8e92..8a2a74f98d 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectTest.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectTest.java
@@ -78,7 +78,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
     private static final String MD5 = "test-md5";
     private static final String CRC32C = "test-crc32c";
     private static final Storage.PredefinedAcl ACL = BUCKET_OWNER_READ;
-    private static final String ENCRYPTION_KEY = "test-encryption-key";
+    private static final String ENCRYPTION_KEY = "12345678";
     private static final Boolean OVERWRITE = false;
     private static final String CONTENT_DISPOSITION_TYPE = "inline";
 
@@ -89,7 +89,7 @@ public class PutGCSObjectTest extends AbstractGCSTest {
     private static final String CONTENT_ENCODING = "test-content-encoding";
     private static final String CONTENT_LANGUAGE = "test-content-language";
     private static final String ENCRYPTION = "test-encryption";
-    private static final String ENCRYPTION_SHA256 = "test-encryption-256";
+    private static final String ENCRYPTION_SHA256 = "12345678";
     private static final String ETAG = "test-etag";
     private static final String GENERATED_ID = "test-generated-id";
     private static final String MEDIA_LINK = "test-media-link";
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
index 11ec5a89e2..02ad0d81ad 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
@@ -26,7 +26,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <google.libraries.version>25.2.0</google.libraries.version>
+        <google.libraries.version>26.4.0</google.libraries.version>
     </properties>
 
     <dependencyManagement>