Merge pull request #192 from IABTechLab/cbc-UID2-4571-cloud-encryption-cleanup

cody-constine-ttd · web-flow · commit e85241eb6835 · 2024-12-17T12:56:52.000-07:00
Cbc UI d2 4571 cloud encryption cleanup
diff --git a/conf/local-e2e-config.json b/conf/local-e2e-config.json
@@ -35,5 +35,5 @@
     "optout_url": "http://localhost:8081",
     "s3_keys_metadata_path": "s3encryption_keys/metadata.json",
     "cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",
-    "encryption_support_version": "5.43.5"
+    "encryption_support_version": "6.0.0"
 }
diff --git a/conf/local-e2e-docker-config.json b/conf/local-e2e-docker-config.json
@@ -33,5 +33,5 @@
   "core_public_url": "http://core:8088",
   "optout_url": "http://optout:8081",
   "cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
-  "encryption_support_version": "5.34.5"
+  "encryption_support_version": "6.0.0"
 }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-core</artifactId>
-    <version>2.23.0</version>
+    <version>2.23.1-alpha-70-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,5 @@`
`35`	`35`	`"optout_url": "http://localhost:8081",`
`36`	`36`	`"s3_keys_metadata_path": "s3encryption_keys/metadata.json",`
`37`	`37`	`"cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",`
`38`		`- "encryption_support_version": "5.43.5"`
	`38`	`+ "encryption_support_version": "6.0.0"`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@`
`33`	`33`	`"core_public_url": "http://core:8088",`
`34`	`34`	`"optout_url": "http://optout:8081",`
`35`	`35`	`"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",`
`36`		`- "encryption_support_version": "5.34.5"`
	`36`	`+ "encryption_support_version": "6.0.0"`
`37`	`37`	`}`