Skip to content

Commit

Permalink
Merge master into releases
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-fox committed Jan 1, 2021
2 parents dc452e9 + 60243a7 commit 5185688
Show file tree
Hide file tree
Showing 12 changed files with 67 additions and 10 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/chron-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: "Update Tagged Releases"
on:
schedule:
- cron: "30 8 1 * *"

jobs:
refresh-modules:
name: Refresh Submodules
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
with:
persist-credentials: false
fetch-depth: 0
ref: releases
- name: Merge changes to releases
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git merge origin/master --strategy-option theirs
git submodule foreach 'git reset HEAD $path'
git submodule foreach 'git checkout `git describe --tags $(git rev-list --tags --max-count=1)`'
git add -A .
git commit -m "Merge master into releases" -a
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: releases
28 changes: 28 additions & 0 deletions .github/workflows/chron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "Refresh Submodules"
on:
schedule:
- cron: "0 8 * * 1"

jobs:
refresh-modules:
name: Refresh Submodules
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
- name: Create local changes
run: |
git submodule update --init --recursive
git submodule update --recursive --remote
- name: Commit files
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git commit -m "Update Submodules" -a
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: ${{ github.ref }}
2 changes: 1 addition & 1 deletion core/stellio
Submodule stellio updated 60 files
+29 −0 .github/pull_request_template.md
+8 −7 .github/workflows/cla.yml
+101 −0 CODE_OF_CONDUCT.md
+42 −0 CONTRIBUTING.md
+15 −0 Jenkinsfile
+6 −4 README.md
+0 −106 docs/CONTRIBUTING.md
+0 −46 docs/cla/cla.md
+3 −2 entity-service/src/main/kotlin/com/egm/stellio/entity/service/EntityEventService.kt
+2 −0 entity-service/src/main/kotlin/com/egm/stellio/entity/service/EntityOperationService.kt
+3 −2 entity-service/src/main/kotlin/com/egm/stellio/entity/service/EntityService.kt
+1 −2 entity-service/src/main/kotlin/com/egm/stellio/entity/service/IAMListener.kt
+36 −7 entity-service/src/main/kotlin/com/egm/stellio/entity/web/EntityHandler.kt
+49 −8 entity-service/src/main/kotlin/com/egm/stellio/entity/web/EntityOperationHandler.kt
+5 −1 entity-service/src/test/kotlin/com/egm/stellio/entity/service/EntityEventServiceTests.kt
+91 −12 entity-service/src/test/kotlin/com/egm/stellio/entity/web/EntityHandlerTests.kt
+141 −90 entity-service/src/test/kotlin/com/egm/stellio/entity/web/EntityOperationHandlerTests.kt
+5 −1 entity-service/src/test/resources/ngsild/authorization/ClientCreateEvent.json
+5 −1 entity-service/src/test/resources/ngsild/authorization/ClientDeleteEvent.json
+5 −1 entity-service/src/test/resources/ngsild/authorization/GroupCreateEvent.json
+5 −1 entity-service/src/test/resources/ngsild/authorization/GroupDeleteEvent.json
+1 −1 entity-service/src/test/resources/ngsild/authorization/GroupMembershipAppendEvent.json
+1 −1 entity-service/src/test/resources/ngsild/authorization/GroupUpdateEvent.json
+1 −1 entity-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventNoRole.json
+1 −1 entity-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventOneRole.json
+1 −1 entity-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventTwoRoles.json
+1 −1 entity-service/src/test/resources/ngsild/authorization/RealmRoleAppendToClient.json
+5 −1 entity-service/src/test/resources/ngsild/authorization/UserCreateEvent.json
+5 −1 entity-service/src/test/resources/ngsild/authorization/UserDeleteEvent.json
+5 −1 entity-service/src/test/resources/ngsild/events/listened/notificationCreateEvent.jsonld
+5 −1 entity-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld
+17 −9 search-service/src/main/kotlin/com/egm/stellio/search/service/EntityEventListenerService.kt
+2 −2 search-service/src/main/kotlin/com/egm/stellio/search/service/TemporalEntityAttributeService.kt
+7 −5 search-service/src/test/kotlin/com/egm/stellio/search/service/EntityEventListenerServiceTest.kt
+16 −7 search-service/src/test/kotlin/com/egm/stellio/search/service/TemporalEntityAttributeServiceTests.kt
+5 −1 search-service/src/test/resources/ngsild/events/listened/notificationCreateEvent.jsonld
+5 −1 search-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld
+1 −1 shared/config/detekt/baseline.xml
+34 −18 shared/src/main/kotlin/com/egm/stellio/shared/model/EntityEvent.kt
+9 −2 shared/src/main/kotlin/com/egm/stellio/shared/model/JsonLdEntity.kt
+27 −2 shared/src/main/kotlin/com/egm/stellio/shared/util/JsonLdUtils.kt
+63 −0 shared/src/test/kotlin/com/egm/stellio/shared/model/JsonLdEntityTests.kt
+72 −21 shared/src/test/kotlin/com/egm/stellio/shared/util/JsonUtilsTests.kt
+9 −0 shared/src/test/resources/ngsild/events/attributeDeleteAllInstancesEvent.jsonld
+10 −0 shared/src/test/resources/ngsild/events/attributeDeleteEvent.jsonld
+1 −1 shared/src/test/resources/ngsild/events/attributeReplaceEvent.jsonld
+5 −2 shared/src/test/resources/ngsild/events/entityCreateEvent.jsonld
+4 −1 shared/src/test/resources/ngsild/events/entityDeleteEvent.jsonld
+4 −1 shared/src/test/resources/ngsild/events/entityReplaceEvent.jsonld
+1 −1 shared/src/test/resources/ngsild/events/entityUpdateEvent.jsonld
+14 −5 subscription-service/src/main/kotlin/com/egm/stellio/subscription/service/EntityEventListenerService.kt
+19 −8 subscription-service/src/main/kotlin/com/egm/stellio/subscription/service/NotificationService.kt
+18 −5 subscription-service/src/main/kotlin/com/egm/stellio/subscription/web/SubscriptionHandler.kt
+2 −2 subscription-service/src/test/kotlin/com/egm/stellio/subscription/service/EntityEventListenerServiceTests.kt
+29 −6 subscription-service/src/test/kotlin/com/egm/stellio/subscription/service/NotificationServiceTests.kt
+11 −2 subscription-service/src/test/kotlin/com/egm/stellio/subscription/service/SubscriptionEventServiceTests.kt
+11 −3 subscription-service/src/test/kotlin/com/egm/stellio/subscription/web/SubscriptionHandlerTests.kt
+1 −1 subscription-service/src/test/resources/ngsild/events/listened/AttributeReplaceEvent.json
+25 −0 subscription-service/src/test/resources/ngsild/events/sent/subscription_create_event_payload.json
+17 −0 subscription-service/src/test/resources/ngsild/events/sent/subscription_update_event_payload.json
2 changes: 1 addition & 1 deletion data-publication/business-api/logic-proxy
Submodule logic-proxy updated 42 files
+1 −1 README.md
+3 −2 config.js
+4 −4 controllers/versionInfo.js
+4 −0 default_locales/en.json
+5 −1 default_locales/es.json
+4 −7 docker-dev/docker-compose.yml
+4 −7 docker/Dockerfile
+1 −1 docker/docker-compose.yml
+22 −12 fill_indexes.js
+57 −21 lib/elastic_indexes.js
+11 −4 lib/indexes.js
+2 −2 lib/utils.js
+0 −7,236 package-lock.json
+1 −1 package.json
+222 −47 public/resources/core/js/controllers/product-offering.controller.js
+1 −1 public/resources/core/js/controllers/user.controller.js
+10 −1 public/resources/core/js/services/product-offering.service.js
+17 −8 server.js
+7 −3 test/controllers/tmf-apis/catalog.js
+14 −15 test/lib/elastic_indexes.js
+2 −2 test/lib/local_indexes.js
+5 −1 test/lib/utils.js
+1 −1 views/base.jade
+2 −2 views/partials/admin/product-category/create-form.jade
+2 −2 views/partials/admin/product-category/update-form.jade
+5 −2 views/partials/offering/detail-content.jade
+4 −2 views/partials/offering/detail-license-sla.jade
+6 −2 views/partials/offering/search-grid.jade
+2 −2 views/partials/settings/contact/telephone-number-fields.jade
+4 −4 views/partials/settings/general/update-profile.jade
+2 −3 views/partials/stock/product-catalogue/create-form.jade
+2 −3 views/partials/stock/product-catalogue/update-form.jade
+6 −1 views/partials/stock/product-offering/create-form-priceplan.jade
+1 −1 views/partials/stock/product-offering/create-form.jade
+1 −1 views/partials/stock/product-offering/directives/priceplan-table.jade
+27 −17 views/partials/stock/product-offering/update-category.jade
+6 −1 views/partials/stock/product-offering/update-priceplan.jade
+2 −2 views/partials/stock/product/create-form-characteristic-form.jade
+0 −1 views/partials/stock/product/create-form-finish.jade
+7 −8 views/partials/stock/product/create-form.jade
+2 −2 views/partials/stock/product/import-form.jade
+7 −9 views/partials/stock/product/update-form.jade
2 changes: 1 addition & 1 deletion processing/kurento/documentation
Submodule documentation updated 48 files
+0 −2 .gitignore
+458 −202 LICENSE
+199 −91 Makefile
+8 −8 Makefile.jenkins
+22 −48 README.md
+0 −1 VERSION
+2 −2 apib/stream_oriented_open_api.apib
+5 −173 conf.py
+0 −358 doc/admin/configure.rst
+0 −14 doc/admin/index.rst
+0 −184 doc/admin/install.rst
+357 −0 doc/admin_guide.rst
+525 −0 doc/architecture.rst
+0 −25 doc/developers/index.rst
+0 −243 doc/developers/integration_orion.rst
+0 −168 doc/developers/kurento_apps.rst
+0 −169 doc/developers/kurento_modules.rst
+0 −394 doc/glossary.rst
+0 −60 doc/index.rst
+1 −0 doc/open_spec.rst
+0 −69 doc/quick_start_guide.rst
+ doc/resources/AgnosticMediaAdaptor.png
+ doc/resources/Applications_Layered_Architecture.png
+ doc/resources/Generic_interactions.png
+ doc/resources/Magicmirror-pipeline.png
+ doc/resources/Magicmirror-screenshot.png
+ doc/resources/Media_element.png
+ doc/resources/Media_pipeline_example.png
+ doc/resources/RTC_session.png
+ doc/resources/RTC_session_pipeline.png
+ doc/resources/Recorder_session.png
+ doc/resources/Stream-oriented_GE.png
+0 −45 doc/tutorials/index.rst
+0 −221 doc/tutorials/orion_integration.rst
+471 −0 doc/user_guide.rst
+0 −30 extensions/examplecode.css
+0 −39 extensions/examplecode.js
+0 −57 extensions/examplecode.py
+ extensions/examplecode.pyc
+0 −47 extensions/wikipedia.py
+ extensions/wikipedia.pyc
+ images/Architecture.png
+ images/WebRTC-platedetector-noOut.png
+ images/favicon.ico
+ images/kurento-black.png
+ images/kurento-white.png
+ images/orion-platedetector.png
+9 −22 index.rst
2 changes: 1 addition & 1 deletion processing/wirecloud/wirecloud
Submodule wirecloud updated 355 files
2 changes: 1 addition & 1 deletion security/keyrock
Submodule keyrock updated 84 files
+29 −0 .github/pull_request_template.md
+99 −0 .github/workflows/ci.yml
+34 −0 .github/workflows/cla.yml
+0 −90 .travis.yml
+128 −0 CODE_OF_CONDUCT.md
+42 −0 CONTRIBUTING.md
+1 −1 CREDITS
+2 −1 README.md
+1 −1 app.js
+46 −29 config.js
+46 −29 config.js.template
+101 −145 controllers/api/applications.js
+18 −28 controllers/api/authzforces.js
+29 −44 controllers/api/check_permissions.js
+1 −1 controllers/api/index.js
+35 −35 controllers/api/iot_agents.js
+67 −83 controllers/api/organizations.js
+38 −38 controllers/api/pep_proxies.js
+43 −45 controllers/api/role_organization_assignments.js
+42 −42 controllers/api/role_user_assignments.js
+68 −93 controllers/api/roles.js
+7 −7 controllers/api/service_provider.js
+39 −46 controllers/api/trusted_applications.js
+34 −34 controllers/api/user_organization_assignments.js
+47 −38 controllers/api/users.js
+27 −31 controllers/web/admins.js
+40 −63 controllers/web/authorize_org_apps.js
+39 −62 controllers/web/authorize_user_apps.js
+18 −31 controllers/web/check_permissions.js
+18 −32 controllers/web/homes.js
+1 −1 controllers/web/index.js
+26 −56 controllers/web/iot_agents.js
+21 −27 controllers/web/manage_members.js
+32 −40 controllers/web/notifies.js
+113 −175 controllers/web/organizations.js
+36 −71 controllers/web/pep_proxies.js
+62 −95 controllers/web/sessions.js
+28 −39 controllers/web/trusted_apps.js
+17 −19 controllers/web/usage_policies.js
+48 −39 controllers/web/users.js
+110 −44 doc.ja/installation_and_administration_guide/configuration.md
+8 −8 doc.ja/installation_and_administration_guide/installation.md
+1 −1 doc.ja/usage_control/server_configuration.md
+103 −0 doc.ja/user_and_programmers_guide/user_guide.md
+27 −2 doc/installation_and_administration_guide/configuration.md
+159 −0 external_auth/authentication_driver_ldap.js
+ extras/.DS_Store
+141 −4 extras/docker/Dockerfile
+18 −0 extras/docker/hooks/build
+4 −0 extras/docker/hooks/post_push
+ keyrock-individual-cla.pdf
+7 −2 lib/configService.js
+4 −8 models/helpers/sequelize_functions.js
+25 −24 models/model_oauth_server.js
+5 −0 models/models.js
+6 −8 models/oauth2/oauth_access_token.js
+6 −8 models/oauth2/oauth_authorization_code.js
+7 −9 models/oauth2/oauth_refresh_token.js
+4 −4 models/oauth2/oauth_scope.js
+658 −35 package-lock.json
+7 −5 package.json
+19 −74 routes/api/applications.js
+1 −2 routes/api/authenticate.js
+7 −13 routes/api/index.js
+4 −20 routes/api/organizations.js
+3 −10 routes/api/role_organization_assignments.js
+4 −14 routes/api/role_permission_assignments.js
+2 −6 routes/api/role_user_assignments.js
+2 −7 routes/api/service_providers.js
+5 −18 routes/api/user_organization_assignments.js
+3 −15 routes/api/users.js
+3 −3 routes/oauth2/oauth2.js
+2 −2 routes/saml2/saml2.js
+10 −47 routes/web/admins.js
+6 −27 routes/web/applications.js
+4 −23 routes/web/authenticate.js
+1 −1 routes/web/homes.js
+8 −19 routes/web/index.js
+6 −26 routes/web/not_authenticate.js
+9 −37 routes/web/organizations.js
+2 −12 routes/web/settings.js
+6 −24 routes/web/users.js
+20 −0 signatures/version1/cla.json
+14 −12 test/config/config_database.js
2 changes: 1 addition & 1 deletion third-party/domibus
Submodule domibus updated from e9f749 to deb1a9

0 comments on commit 5185688

Please sign in to comment.