Merge master into releases

FIWARE · Jul 1, 2023 · f5f7e2f · f5f7e2f
1 parent 95a576d
commit f5f7e2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/scorpio b/core/scorpio
diff --git a/security/credentials-config-service b/security/credentials-config-service
diff --git a/security/keycloak-vc-issuer b/security/keycloak-vc-issuer
+2 −2		AllInOneRunner/src/main/resources/application.properties
+29 −0		AllInOneRunner/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+2 −2		Commons/src/main/java/eu/neclab/ngsildbroker/commons/constants/NGSIConstants.java
+20 −7		Commons/src/main/java/eu/neclab/ngsildbroker/commons/datatypes/terms/QQueryTerm.java
+29 −0		EntityManager/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+9 −6		EntityManager/src/test/java/eu/neclab/ngsildbroker/entityhandler/services/EntityServiceTest.java
+1 −1		...EntityManager/src/main/java/eu/neclab/ngsildbroker/historyentitymanager/messaging/HistoryMessagingBase.java
+1 −1		HistoryEntityManager/src/main/resources/application.properties
+29 −0		HistoryEntityManager/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+29 −0		HistoryQueryManager/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+1 −1		QueryManager/src/main/java/eu/neclab/ngsildbroker/queryhandler/services/QueryService.java
+29 −0		QueryManager/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+9 −1		RELEASENOTES
+29 −0		RegistryManager/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+29 −0		RegistrySubscriptionManager/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+8 −2		SubscriptionManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/service/SubscriptionService.java
+29 −0		SubscriptionManager/src/main/resources/db/migration/V20230627.1__batchops161upsertfix.sql
+593 −3		api-test.json
+5 −5		.github/workflows/pre-release.yml
+75 −12		api/api.yaml
+5 −0		doc/compatibility/compatibility.json
+1 −0		doc/compatibility/compatibility.md
+79 −22		src/main/java/org/fiware/keycloak/VCIssuerRealmResourceProvider.java
+1 −1		src/test/java/org/fiware/keycloak/VCIssuerRealmResourceProviderTest.java
+5 −6		src/test/java/org/fiware/keycloak/it/SIOP2IntegrationTest.java
+16 −9		theme/siop-2/account/src/app/content/vc/VC.tsx