Merge branch 'master' into 'master'

Merge of private repo to Master

See merge request !4

.gitlab-ci.yml.disabled → .gitlab-ci.yml

 # This file is a template, and might need editing before it works on your project.
 # Official framework image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/node/tags/
-image: node:8
+image: node::13.7-alpine
 
 # This folder is cached between builds
-# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
+# http://docs.rep.com/ce/ci/yaml/README.html#cache
 cache:
   paths:
   - node_modules/
 
-all_tests:
+before_script:
+  - yarn
+
+stages:
+  - test
+
+test:
+  stage: test
   script:
-   - npm install
-   - npm test
+   - echo "Running tests..."   
+   - yarn test
+  allow_failure: true
 

CONTRIBUTE.md

+# CONTRIBUTE
+
+## Install app
+```
+$ yarn
+```
+
+## Test
+
+### Test all scripts
+```
+$ yarn test
+```
+
+### Test scripts individually
+```
+$ yarn validate-examples
+$ yarn validate-locally
+$ yarn validate-online
+$ yarn validate-schema
+```
+
+### Bundle ngsi-ld-spec-open-api.json
+```
+$ yarn combine-files
+```
\ No newline at end of file

Readme.md → README.md

@@ -4,12 +4,14 @@ This repository contains OpenAPI descriptions for the NGSI-LD interface defined
 
 ## Online resources
 
-* [Navigate the API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/spec/updated/full_api.json).
+* [Navigate the API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/NGSI-LD/NGSI-LD/raw/master/spec/updated/full_api.json).
 
 ## Contribute
 
 To get an account on ETSI Forge and to learn how to contribute visit the [Forge Getting started wiki](https://forge.etsi.org/wiki/index.php/Get_started).
 
+More info @ [CONTIBUTE](./CONTRIBUTE.md)
+
 Change requests are managed using [Gerrit](https://forge.etsi.org/gerrit).
 
 ## Report issues

examples/ContextSourceRegistration-example_C.3.json

@@ -72,6 +72,6 @@
     "http://example.org/ngsi-ld/commonTerms.jsonld",
     "http://example.org/ngsi-ld/vehicle.jsonld",
     "http://example.org/ngsi-ld/parking.jsonld",  
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }

examples/ContextSourceRegistrationList-example.json

@@ -72,6 +72,6 @@
     "http://example.org/ngsi-ld/commonTerms.jsonld",
     "http://example.org/ngsi-ld/vehicle.jsonld",
     "http://example.org/ngsi-ld/parking.jsonld",  
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }]

examples/Entity-example.json

@@ -26,6 +26,6 @@
   },
   "@context": [
       "https://example.org/ld/vehicle.jsonld",
-      "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+      "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }

examples/EntityList-example.json

@@ -27,7 +27,7 @@
   },
   "@context": [
       "https://example.org/ld/vehicle.jsonld",
-      "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+      "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }
 ]

examples/EntityTemporal-example_C5.5.3.json

@@ -26,6 +26,6 @@
   ],
   "@context": [
     "http://example.org/ngsi-ld/vehicle.jsonld",  
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }

examples/EntityTemporalList-example.json

@@ -26,7 +26,7 @@
   ],
   "@context": [
     "http://example.org/ngsi-ld/vehicle.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }
 ]

examples/Entity_temporalValues_C.5.6.3.json

@@ -29,6 +29,6 @@
   },
   "@context": [
     "http://example.org/ngsi-ld/vehicle.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }

examples/OffStreetParking_C2.3.json

@@ -31,6 +31,6 @@
 	},
 	"@context": [
 	    "http://example.org/ngsi-ld/parking.jsonld",
-	    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+	    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
 	]
 }

examples/OffStreetParking_keyValues_C2.3.json

@@ -10,6 +10,6 @@
 	},
 	"@context": [
 		"http://example.org/ngsi-ld/parking.jsonld",
-		"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+		"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
 	]
 }

examples/Subscription-example_C.4.json

@@ -30,6 +30,6 @@
   },
   "@context": [
     "http://example.org/ngsi-ld/vehicle.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }

examples/SubscriptionList-example.json

@@ -31,7 +31,7 @@
   },
   "@context": [
     "http://example.org/cim/vehicle.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }
 ]

examples/Vehicle_C2.2.json

@@ -23,6 +23,6 @@
     "http://example.org/ngsi-ld/vehicle.jsonld",
     "http://example.org/ngsi-ld/parking.jsonld",
     "https://schema.org",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }

examples/Vehicle_MultiAttribute_C2.2.json

@@ -25,6 +25,6 @@
       "speed#2": "http://example.org/speed",
       "source": "http://example.org/hasSource"
     },
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }
\ No newline at end of file

examples/Vehicle_keyValues_C2.2.json

@@ -7,6 +7,6 @@
     "http://example.org/ngsi-ld/commonTerms.jsonld",
     "http://example.org/ngsi-ld/vehicle.jsonld",
     "http://example.org/ngsi-ld/parking.jsonld",
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
   ]
 }

jsconfig.json

+{
+  "compilerOptions": {
+    "baseUrl": "."
+  }
+}