Skip to content

Commit

Permalink
Merge branch 'eclipse-thingweb:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioCasCeb authored Sep 21, 2023
2 parents 89b4237 + c83a491 commit b4dfed9
Show file tree
Hide file tree
Showing 20 changed files with 908 additions and 453 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,8 @@ All packages are licensed under the Eclipse Public License v. 2.0. You find a co
1. Run `lerna bootstrap` to install dependencies among the packages, even if a package has never been published before. Make sure you have not increased the dependency versions yet, e.g., you have a new package _newExample_ and the _oldExample_ depends on it. The _newExample_ is on version `0.0.0` (since you want to publish it as `1.0.0`) then in the _oldExample_ package.json the dependency has to be on the same version (or lower) so `"dependencies" { newExample: "^0.0.0"}}`. **Otherwise lerna will not accept linking the local _newExample_.**
2. If `lerna bootstrap` was successful you can now bump dependency versions (if required), e.g., you could now do `"dependencies" { newExample: "^1.0.0"}}` in the _oldExample_ package.json.
3. Run `lerna publish` to publish all new package versions. Lerna will then ask for every changed package whether it received a patch, minor or major update. In our example you should now select major for the _newExample_ so that it will be published as `1.0.0` version. You should login to npm via `npm login` before doing this.

## Adapting Licenses

One can use the VS Code plugin at <https://marketplace.visualstudio.com/items?itemName=angelo-breuer.license-header-manager> to updating the copyright fields on top of each file.

73 changes: 35 additions & 38 deletions packages/assertions/assertions-csv/changelog.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,45 @@

# CSV Changelog - 27/05/2023

[Old CSV Path](assertions-csv/oldManual.csv)
[New CSV Path](assertions-csv/manual.csv)


## REMOVED

- `privacy-immutable-id-as-property` was removed
- `security-context-secure-fetch` was removed

- `privacy-immutable-id-as-property` was removed
- `security-context-secure-fetch` was removed

## LINE-CHANGE

- `privacy-mutable-identifiers` was moved from Line 51 to 50
- `privacy-temp-id-metadata` was moved from Line 52 to 51
- `sec-body-name-json-pointer-type` was moved from Line 53 to 52
- `sec-inj-no-intl-markup` was moved from Line 54 to 53
- `security-jsonld-expansion` was moved from Line 56 to 54
- `security-mutual-auth-td` was moved from Line 57 to 55
- `security-no-execution` was moved from Line 58 to 56
- `security-oauth-limits` was moved from Line 59 to 57
- `security-remote-context` was moved from Line 60 to 58
- `security-server-auth-td` was moved from Line 61 to 59
- `security-static-context` was moved from Line 62 to 60
- `td-context-ns-td10-namespacev10` was moved from Line 63 to 61
- `td-default-AdditionalResponseContentType` was moved from Line 64 to 62
- `td-default-observable` was moved from Line 65 to 63
- `td-processor-bidi-isolation` was moved from Line 66 to 64
- `td-producer-mixed-direction` was moved from Line 67 to 65
- `td-security-extension` was moved from Line 68 to 66
- `td-text-direction-first-strong` was moved from Line 69 to 67
- `td-text-direction-language-tag` was moved from Line 70 to 68
- `thing-model-td-generation-processor-extends` was moved from Line 71 to 69
- `thing-model-td-generation-processor-forms` was moved from Line 72 to 70
- `thing-model-td-generation-processor-placeholder` was moved from Line 73 to 71
- `thing-model-td-generation-processor-required` was moved from Line 74 to 72
- `tm-derivation-validity` was moved from Line 75 to 73
- `tm-overwrite-interaction` was moved from Line 76 to 74
- `tm-overwrite-types` was moved from Line 77 to 75
- `tm-placeholder-replacement` was moved from Line 78 to 76
- `tm-ref-recursive-extensions` was moved from Line 79 to 77
- `tm-tmRef-overwrite-possibility` was moved from Line 80 to 78
- `tm-tmRef-overwrite-process` was moved from Line 81 to 79
- `tm-tmRef-overwrite-semantic-meaning` was moved from Line 82 to 80
- `tm-tmRef2` was moved from Line 83 to 81
- `tm-versioning-1` was moved from Line 84 to 82
- `privacy-mutable-identifiers` was moved from Line 51 to 50
- `privacy-temp-id-metadata` was moved from Line 52 to 51
- `sec-body-name-json-pointer-type` was moved from Line 53 to 52
- `sec-inj-no-intl-markup` was moved from Line 54 to 53
- `security-jsonld-expansion` was moved from Line 56 to 54
- `security-mutual-auth-td` was moved from Line 57 to 55
- `security-no-execution` was moved from Line 58 to 56
- `security-oauth-limits` was moved from Line 59 to 57
- `security-remote-context` was moved from Line 60 to 58
- `security-server-auth-td` was moved from Line 61 to 59
- `security-static-context` was moved from Line 62 to 60
- `td-context-ns-td10-namespacev10` was moved from Line 63 to 61
- `td-default-AdditionalResponseContentType` was moved from Line 64 to 62
- `td-default-observable` was moved from Line 65 to 63
- `td-processor-bidi-isolation` was moved from Line 66 to 64
- `td-producer-mixed-direction` was moved from Line 67 to 65
- `td-security-extension` was moved from Line 68 to 66
- `td-text-direction-first-strong` was moved from Line 69 to 67
- `td-text-direction-language-tag` was moved from Line 70 to 68
- `thing-model-td-generation-processor-extends` was moved from Line 71 to 69
- `thing-model-td-generation-processor-forms` was moved from Line 72 to 70
- `thing-model-td-generation-processor-placeholder` was moved from Line 73 to 71
- `thing-model-td-generation-processor-required` was moved from Line 74 to 72
- `tm-derivation-validity` was moved from Line 75 to 73
- `tm-overwrite-interaction` was moved from Line 76 to 74
- `tm-overwrite-types` was moved from Line 77 to 75
- `tm-placeholder-replacement` was moved from Line 78 to 76
- `tm-ref-recursive-extensions` was moved from Line 79 to 77
- `tm-tmRef-overwrite-possibility` was moved from Line 80 to 78
- `tm-tmRef-overwrite-process` was moved from Line 81 to 79
- `tm-tmRef-overwrite-semantic-meaning` was moved from Line 82 to 80
- `tm-tmRef2` was moved from Line 83 to 81
- `tm-versioning-1` was moved from Line 84 to 82
9 changes: 8 additions & 1 deletion packages/assertions/assertions-csv/report.json
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
{"generationDate":"Sat, 27 May 2023 01:02:28 GMT","assertionsSize":451,"implementedSize":372,"manualSize":82,"oldSize":3,"needsReviewSize":0}
{
"generationDate": "Sat, 27 May 2023 01:02:28 GMT",
"assertionsSize": 451,
"implementedSize": 372,
"manualSize": 82,
"oldSize": 3,
"needsReviewSize": 0
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"name": {
"type": "string",
"pattern": "\/-"
"pattern": "/-"
}
},
"required": ["in", "scheme", "name"]
Expand Down
2 changes: 1 addition & 1 deletion packages/core/examples/tds/invalid/emptyOpArray.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"properties": {
"status": {
"type": "string",
"forms": [{ "href": "https://mylamp.example.com/status", "op":[] }]
"forms": [{ "href": "https://mylamp.example.com/status", "op": [] }]
}
},
"actions": {
Expand Down
10 changes: 5 additions & 5 deletions packages/core/examples/tds/valid/semanticTD.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"@context": [
"https://www.w3.org/2022/wot/td/v1.1",
{
"s": "http://schema.org",
"iot": "http://iotschema.org"
}
"https://www.w3.org/2022/wot/td/v1.1",
{
"s": "http://schema.org",
"iot": "http://iotschema.org"
}
],
"@type": "Thing",
"id": "urn:semantic",
Expand Down
Loading

0 comments on commit b4dfed9

Please sign in to comment.