Skip to content

Commit

Permalink
Merge master into releases
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Sep 15, 2022
2 parents 8acc932 + 829c819 commit 8bb6b56
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion core/scorpio
Submodule scorpio updated 37 files
+120 −120 .github/workflows/release-native-windows.yml
+2 −0 AllInOneRunner/src/main/resources/dockerfiles/dockerfile-java
+2 −0 AllInOneRunner/src/main/resources/dockerfiles/dockerfile-ubuntu
+2 −2 BrokerParent/build-pom.xml
+4 −4 BrokerParent/pom.xml
+0 −11 Commons/pom.xml
+5 −3 Commons/src/main/java/eu/neclab/ngsildbroker/commons/controllers/EntryControllerFunctions.java
+3 −2 Commons/src/main/java/eu/neclab/ngsildbroker/commons/datatypes/ScopeQueryTerm.java
+12 −8 Commons/src/main/java/eu/neclab/ngsildbroker/commons/querybase/BaseQueryService.java
+0 −104 Commons/src/main/java/eu/neclab/ngsildbroker/commons/tools/ConsulRegistration.java
+5 −5 Commons/src/main/java/eu/neclab/ngsildbroker/commons/tools/HttpUtils.java
+2 −0 EntityManager/src/main/resources/dockerfiles/dockerfile-java
+2 −0 EntityManager/src/main/resources/dockerfiles/dockerfile-ubuntu
+17 −17 EntityManager/src/test/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityBatchControllerTest.java
+0 −2 HistoryManager/src/main/java/eu/neclab/ngsildbroker/historymanager/messaging/HistoryMessagingBase.java
+2 −0 HistoryManager/src/main/resources/dockerfiles/dockerfile-java
+2 −0 HistoryManager/src/main/resources/dockerfiles/dockerfile-ubuntu
+2 −0 QueryManager/src/main/resources/dockerfiles/dockerfile-java
+2 −0 QueryManager/src/main/resources/dockerfiles/dockerfile-ubuntu
+2 −2 QueryManager/src/test/java/eu/neclab/ngsildbroker/queryhandler/controller/CustomProfile.java
+10 −7 QueryManager/src/test/java/eu/neclab/ngsildbroker/queryhandler/controller/QueryControllerTest.java
+31 −36 README.md
+12 −0 RELEASENOTES
+0 −2 RegistryManager/src/main/java/eu/neclab/ngsildbroker/registryhandler/messaging/CSourceMessagingBase.java
+2 −0 RegistryManager/src/main/resources/dockerfiles/dockerfile-java
+2 −0 RegistryManager/src/main/resources/dockerfiles/dockerfile-ubuntu
+104 −65 RegistryManager/src/test/java/eu/neclab/ngsildbroker/registryhandler/controller/RegistryControllerTest.java
+2 −0 RegistrySubscriptionManager/src/main/resources/dockerfiles/dockerfile-java
+2 −0 RegistrySubscriptionManager/src/main/resources/dockerfiles/dockerfile-ubuntu
+199 −124 ...Manager/src/test/java/eu/neclab/ngsildbroker/subscriptionmanager/controller/SubscriptionControllerTest.java
+0 −2 ...onManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/messaging/SubscriptionMessagingBase.java
+0 −3 ...tionManager/src/main/java/eu/neclab/ngsildbroker/subscriptionmanager/messaging/SubscriptionSyncService.java
+2 −0 SubscriptionManager/src/main/resources/dockerfiles/dockerfile-java
+2 −0 SubscriptionManager/src/main/resources/dockerfiles/dockerfile-ubuntu
+30 −56 ...Manager/src/test/java/eu/neclab/ngsildbroker/subscriptionmanager/controller/NotificationControllerTest.java
+206 −241 ...Manager/src/test/java/eu/neclab/ngsildbroker/subscriptionmanager/controller/SubscriptionControllerTest.java
+1,111 −4 api-test.json
2 changes: 1 addition & 1 deletion security/wilma

0 comments on commit 8bb6b56

Please sign in to comment.