Skip to content

Commit

Permalink
Merge branch 'master' into releases
Browse files Browse the repository at this point in the history 
* ScorpioBroker 0.9.1
* Idra v2.0.2
* cosmos-flink 1.2.0
* cosmos-spark 1.1.0
* Knowage 7.0.0
* Kurento 6.12.0
* Fast RTPS 1.9.1
  • Loading branch information
@jason-fox
jason-fox committed Oct 18, 2019
2 parents 2652cb1 + bf34bc5 commit f2f26c1
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion core/scorpio
Submodule scorpio updated 31 files
+24 −27 Commons/src/main/java/eu/neclab/ngsildbroker/commons/ldcontext/ContextResolverBasic.java
+19 −8 Commons/src/main/java/eu/neclab/ngsildbroker/commons/ngsiqueries/ParamsResolver.java
+1 −0 Core/AtContextServer/src/main/resources/application.properties
+3 −0 Core/EntityManager/src/main/java/eu/neclab/ngsildbroker/entityhandler/services/EntityService.java
+1 −1 Core/EntityManager/src/test/java/eu/neclab/ngsildbroker/entityhandler/controller/EntityControllerTest.java
+2 −0 Core/QueryManager/src/main/resources/application.properties
+1 −1 Core/QueryManager/src/test/java/eu/neclab/ngsildbroker/queryhandler/controller/QueryControllerTest.java
+1 −0 Core/SubscriptionManager/src/main/resources/application.properties
+1 −1 History/HistoryManager/src/main/resources/application.properties
+33 −14 OverallParent/pom.xml
+2 −2 ...Manager/src/main/java/eu/neclab/ngsildbroker/registryhandler/controller/RegistrySubscriptionController.java
+2 −2 Registry/RegistryManager/src/main/resources/application.properties
+1 −1 ...RegistryManager/src/test/java/eu/neclab/ngsildbroker/registryhandler/controller/RegistryControllerTest.java
+2 −2 ...ger/src/test/java/eu/neclab/ngsildbroker/registryhandler/controller/RegistrySubscriptionControllerTest.java
+1 −0 SpringCloudModules/config-server/src/main/resources/application.properties
+2 −1 Storage/StorageManager/src/main/resources/application.properties
+1 −1 docker-compose-aaio.yml
+1 −1 docker-compose-dist.yml
+19 −0 docs/Makefile
+ − docs/_build/doctrees/environment.pickle
+ − docs/_build/html/objects.inv
+1 −0 docs/_build/html/searchindex.js
+186 −0 docs/_static/css/fiware_readthedocs.css
+87 −0 docs/_static/css/fiware_readthedocs_core.css
+19 −0 docs/_static/css/fiware_readthedocs_processing.css
+178 −0 docs/conf.py
+285 −0 docs/index.md
+316 −0 docs/index.rst
+35 −0 docs/make.bat
+3 −0 docs/requirements.txt
+2 −2 pom.xml
2 changes: 1 addition & 1 deletion data-publication/idra
Submodule idra updated 19 files
+13 −0 .gitignore
+7 −0 CHANGELOG.txt
+10 −0 Idra/.gitignore
+1 −1 Idra/pom.xml
+39 −3 Idra/src/main/java/it/eng/idra/api/ckan/CKANUtils.java
+24 −8 Idra/src/main/java/it/eng/idra/cache/MetadataCacheManager.java
+4 −4 Idra/src/main/java/it/eng/idra/management/FederationCore.java
+31 −15 Idra/src/main/java/it/eng/idra/management/ODMSManager.java
+74 −60 Idra/src/main/java/it/eng/idra/scheduler/job/ODMSSynchJob.java
+123 −0 Idra/src/main/resources/configuration.properties
+10 −0 IdraPortal/.gitignore
+108 −0 IdraPortal/src/main/resources/configuration.properties
+5 −0 IdraPortal/src/main/webapp/.bowerrc
+4 −4 IdraPortal/src/main/webapp/metadata/DatasetDetail.html
+1 −1 IdraPortal/src/main/webapp/translation_en.json
+ − idra_logo.png
+11,419 −0 idra_logo.svg
+114 −0 publiccode.yml
+53 −49 roadmap.md
2 changes: 1 addition & 1 deletion iot-agents/iotagent-opcua
Submodule iotagent-opcua updated 70 files
+3 −0 .gitignore
+26 −29 .travis.yml
+40 −0 AGECONF/config.json
+40 −0 AGECONF/config.json.API
+175 −0 AGECONF/config.json.EXP
+178 −0 AGECONF/config.json.TRAD_LAZY
+175 −0 AGECONF/config.json.TRAD_ORIGINAL
+83 −0 AGECONF/config.properties
+1 −0 BUILD-INSTRUCTIONS
+8 −2 Dockerfile
+34 −151 README.md
+27 −0 certificates/PKI/own/private/private_key.pem
+181 −0 certificates/client_certificate.pem
+0 −93 conf/_config.json
+1 −94 conf/config.json
+1 −0 conf/config.json.WITH_PLACEHOLDER
+22 −14 conf/config.properties
+76 −0 conf/config.properties.WITH_PLACEHOLDER
+71 −0 docker-compose-external-server.yml
+77 −0 docker-compose.yml
+27 −28 docker-compose/docker-compose.yml
+7 −6 docker-compose/docker_compose_instructions.md
+0 −0 docker-entrypoint.sh
+34 −0 docs/docker_readme.md
+ − docs/img/opcua-logo.png
+5 −2 docs/index.md
+1 −1 docs/installation_and_administration_guide.md
+360 −111 docs/opc_ua_agent_tutorial.md
+119 −54 docs/user_and_programmers_manual.md
+3 −2 index.js
+1 −1 iot_agent_modules/run/callMethods.js
+2 −2 iot_agent_modules/run/createResponse.js
+1 −1 iot_agent_modules/run/mongoGroup.js
+1,000 −183 iot_agent_modules/run/run.js
+1 −1 iot_agent_modules/services/commandsList/commandsList.controller.js
+2 −2 iot_agent_modules/services/server.js
+ − mapping_tool.jar
+11 −8 mkdocs.yml
+7,757 −2,843 package-lock.json
+16 −12 package.json
+0 −28 test/docker-compose.yml
+0 −604 test/unit/add-test.js
+28 −0 testCommands/Activate_Sensor.sh
+36 −0 testCommands/Car_Accelerate.sh
+36 −0 testCommands/Car_Accelerate_MT.sh
+33 −0 testCommands/Car_Monitor.sh
+29 −0 testCommands/Car_Stop.sh
+28 −0 testCommands/Deactivate_Sensor.sh
+12 −0 testCommands/MultiDeviceTest/README
+77 −0 testCommands/MultiDeviceTest/add_device_lazy_attrs.json
+27 −0 testCommands/MultiDeviceTest/add_device_lazy_attrs2.json
+154 −0 testCommands/MultiDeviceTest/config.json
+42 −0 testCommands/OCB_calls.txt
+8 −0 testCommands/REST_calls.txt
+28 −0 testCommands/Toggle_Sensor_Activation.sh
+81 −0 testCommands/add_device.json
+57 −0 testCommands/add_device_no_commands.json
+0 −0 test_OLD/AGE/config.json
+0 −0 test_OLD/AGE/config.properties
+0 −0 test_OLD/CAR/car.js
+26 −0 test_OLD/docker-compose.yml
+541 −0 test_OLD/unit/add-test.js
+0 −0 test_OLD/unit/config-test.json
+0 −0 test_OLD/unit/config-test.properties.BACKUP
+4 −0 test_OLD/unit/test-file-paths.properties
+541 −0 tests/add-test.js
+62 −0 tests/docker-compose.yml
+4 −0 tests/test-file-paths.properties
+942 −0 tests/test.js
+6 −0 travis_ip.sh
2 changes: 1 addition & 1 deletion processing/cosmos/cosmos-flink
Submodule cosmos-flink updated 1 files
+2 −2 README.md
2 changes: 1 addition & 1 deletion processing/cosmos/examples-flink
Submodule examples-flink updated 4 files
+2 −2 README.md
+2 −2 doc/index.md
+2 −2 pom.xml
+1 −1 src/main/scala/org/fiware/cosmos/orion/flink/connector/examples/example1/Example1.scala
2 changes: 1 addition & 1 deletion processing/knowage/server
Submodule server updated 20039 files
2 changes: 1 addition & 1 deletion processing/kurento/media-server
Submodule media-server updated 9 files
+54 −32 CHANGELOG.md
+6 −4 CMakeLists.txt
+13 −0 debian/changelog
+30 −1 debian/control
+14 −14 debian/kurento-media-server.init
+55 −7 debian/kurento-media-server.postinst
+52 −52 server/death_handler.cpp
+29 −25 server/loadConfig.cpp
+1 −1 server/transport/websocket/WebSocketRegistrar.cpp
20 changes: 10 additions & 10 deletions release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ findRelease core/cygnus telefonicaid/fiware-cygnus 1.16.0
findRelease core/draco ging/fiware-draco 1.3.0
findRelease core/orion telefonicaid/fiware-orion 2.2.0
findRelease core/quantum-leap smartsdk/ngsi-timeseries-api 0.7.5
findRelease core/scorpio ScorpioBroker/ScorpioBroker 0.9
findRelease core/scorpio ScorpioBroker/ScorpioBroker 0.9.1
findRelease core/sth-comet telefonicaid/fiware-sth-comet 2.6.0

findRelease data-publication/apinf/apinf apinf/platform 0.60.0
Expand All @@ -71,28 +71,28 @@ findRelease data-publication/ckan-extensions/oauth2 conwetlab/ckanext-oauth2 v0.
findRelease data-publication/ckan-extensions/private-datasets conwetlab/ckanext-privatedatasets v0.4
findRelease data-publication/ckan-extensions/right-time-context conwetlab/ckanext-right_time_context v0.9
findRelease data-publication/ckan-extensions/wirecloud-dashboards conwetlab/ckanext-wirecloud_view v1.1.0
findRelease data-publication/idra opsilab/idra v2.0.1
findRelease data-publication/idra opsilab/idra v2.0.2

findRelease iot-agents/iotagent-LoRaWAN Atos-Research-and-Innovation/IoTagent-LoRaWAN v1.2.3
findRelease iot-agents/iotagent-json telefonicaid/iotagent-json 1.11.0
findRelease iot-agents/iotagent-lightweightM2M telefonicaid/lightweightm2m-iotagent 1.2.0
findRelease iot-agents/iotagent-node-lib telefonicaid/iotagent-node-lib 2.10.0
findRelease iot-agents/iotagent-opcua Engineering-Research-and-Development/iotagent-opcua 1.3.4
findRelease iot-agents/iotagent-opcua Engineering-Research-and-Development/iotagent-opcua v1.3.4
findRelease iot-agents/iotagent-ultralight telefonicaid/iotagent-ul 1.10.0
findRelease iot-agents/OpenMTC OpenMTC/OpenMTC v1.3.0
findRelease iot-agents/iotagent-sigfox telefonicaid/sigfox-iotagent 1.2.0

findRelease processing/cosmos/cosmos-flink ging/fiware-cosmos-orion-flink-connector FIWARE_7.8
findRelease processing/cosmos/cosmos-spark ging/fiware-cosmos-orion-spark-connector FIWARE_7.8
findRelease processing/cosmos/examples-flink ging/fiware-cosmos-orion-flink-connector-examples FIWARE_7.8
findRelease processing/cosmos/examples-spark ging/fiware-cosmos-orion-spark-connector-examples FIWARE_7.8
findRelease processing/cosmos/cosmos-flink ging/fiware-cosmos-orion-flink-connector 1.2.0
findRelease processing/cosmos/cosmos-spark ging/fiware-cosmos-orion-spark-connector 1.1.0
findRelease processing/cosmos/examples-flink ging/fiware-cosmos-orion-flink-connector-examples 1.2.0
findRelease processing/cosmos/examples-spark ging/fiware-cosmos-orion-spark-connector-examples 1.1.0
findRelease processing/fogflow/fogflow smartfog/fogflow v2.3
findRelease processing/knowage/documentation KnowageLabs/Knowage-Documentation "latest"
findRelease processing/knowage/server KnowageLabs/Knowage-Server v6.4.4
findRelease processing/knowage/server KnowageLabs/Knowage-Server v7.0.0
findRelease processing/knowage/server-chef KnowageLabs/Knowage-Server-Chef 6.1.1
findRelease processing/knowage/server-docker KnowageLabs/Knowage-Server-Docker "latest"
findRelease processing/kurento/documentation Kurento/doc-fiware-readthedocs "latest"
findRelease processing/kurento/media-server Kurento/kurento-media-server 6.11.0
findRelease processing/kurento/media-server Kurento/kurento-media-server 6.12.0
findRelease processing/kurento/media-server-docker Kurento/kurento-docker 6.8.0
findRelease processing/open-vidu OpenVidu/openvidu v2.11.0
findRelease processing/perseo/back-end telefonicaid/perseo-core 1.3.0
Expand All @@ -102,7 +102,7 @@ findRelease processing/wirecloud/wirecloud Wirecloud/wirecloud 1.3.1
findRelease processing/wirecloud/wirecloud-docker Wirecloud/docker-wirecloud "latest"


findRelease robotics/Fast-RTPS eProsima/Fast-RTPS v1.9.1
findRelease robotics/Fast-RTPS eProsima/Fast-RTPS v1.9.2
findRelease robotics/Micro-XRCE-DDS eProsima/Micro-XRCE-DDS v1.1.0
findRelease robotics/firos iml130/firos v0.1.0

Expand Down
2 changes: 1 addition & 1 deletion robotics/Fast-RTPS
Submodule Fast-RTPS updated from f8b36a to 46a509

0 comments on commit f2f26c1

Please sign in to comment.