Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <joewitt@apache.org>
This commit is contained in:
exceptionfactory 2023-01-24 15:58:59 -06:00 committed by Joe Witt
parent 1148738c19
commit 4fe2c318e6
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-commons/nifi-property-protection-gcp/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectTest.java
View File

@ -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";

4
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectTest.java
View File

@ -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";

2
nifi-nar-bundles/nifi-gcp-bundle/pom.xml
View File

@ -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>