Merge branch 'main' into bmz-UID2-4612-operator-remote-config-endpoint

Behnam Mozafari · Behnam Mozafari · commit 06d78ff2e44c · 2025-01-14T11:43:36.000+11:00
diff --git a/conf/default-config.json b/conf/default-config.json
@@ -18,5 +18,5 @@
     "att_token_enc_salt": null,
     "enforceJwt": false,
     "cloud_encryption_keys_metadata_path": null,
-    "encryption_support_version": "9999"
+    "encryption_support_version": "5.45.0"
 }
diff --git a/conf/integ-config.json b/conf/integ-config.json
@@ -19,5 +19,5 @@
     "salts_metadata_path": "uid2/salts/metadata.json",
     "enforceJwt": false,
     "cloud_encryption_keys_metadata_path": "uid2/cloud_encryption_keys/metadata.json",
-    "encryption_support_version": "9999"
+    "encryption_support_version": "5.45.0"
 }
diff --git a/conf/local-config.json b/conf/local-config.json
@@ -20,5 +20,5 @@
     "provide_private_site_data": true,
     "enforceJwt": false,
     "cloud_encryption_keys_metadata_path": "/com.uid2.core/test/cloud_encryption_keys/metadata.json",
-    "encryption_support_version": "9999"
+    "encryption_support_version": "5.45.0"
 }
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": "6.0.0"
+    "encryption_support_version": "5.45.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": "6.0.0"
+  "encryption_support_version": "5.45.0"
 }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-core</artifactId>
-    <version>2.23.17</version>
+    <version>2.24.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.23", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }
+{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.24", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`"att_token_enc_salt": null,`
`19`	`19`	`"enforceJwt": false,`
`20`	`20`	`"cloud_encryption_keys_metadata_path": null,`
`21`		`- "encryption_support_version": "9999"`
	`21`	`+ "encryption_support_version": "5.45.0"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`"salts_metadata_path": "uid2/salts/metadata.json",`
`20`	`20`	`"enforceJwt": false,`
`21`	`21`	`"cloud_encryption_keys_metadata_path": "uid2/cloud_encryption_keys/metadata.json",`
`22`		`- "encryption_support_version": "9999"`
	`22`	`+ "encryption_support_version": "5.45.0"`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`"provide_private_site_data": true,`
`21`	`21`	`"enforceJwt": false,`
`22`	`22`	`"cloud_encryption_keys_metadata_path": "/com.uid2.core/test/cloud_encryption_keys/metadata.json",`
`23`		`- "encryption_support_version": "9999"`
	`23`	`+ "encryption_support_version": "5.45.0"`
`24`	`24`	`}`
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": "6.0.0"`
	`38`	`+ "encryption_support_version": "5.45.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": "6.0.0"`
	`36`	`+ "encryption_support_version": "5.45.0"`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.23", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }`
	`1`	`+{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.24", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }`