Merge branch 'main' into ODATA-1610

.gitattributes

@@ -0,0 +1,3 @@
+*.html  text eol=lf
+*.md    text eol=lf
+*.pdf   -text

.github/workflows/nodejs.yml

@@ -11,18 +11,19 @@ jobs:
         node-version: [20.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
       - name: Setup pandoc
         uses: nikeee/setup-pandoc@v1
         with:
-          pandoc-version: 3.1.2
+          pandoc-version: 3.1.12.2
       - name: Build docs
         run: |
+          export PUPPETEER_SKIP_DOWNLOAD='true'
           npm ci
           npm run build
           git diff --exit-code docs

.gitignore

@@ -1,2 +1,6 @@
 node_modules
 coverage
+.DS_Store
+/zip/*
+!/zip/*.docx
+!/zip/*.zip

.vscode/settings.json

@@ -2,16 +2,29 @@
   "cSpell.words": [
     "ABNF",
     "asec",
+    "ccid",
+    "concat",
     "CSDL",
+    "CSDLXML",
+    "Datetimestamp",
+    "EDMX",
+    "entitytype",
     "ETag",
+    "isec",
+    "isomorphy",
     "matchespattern",
     "odata",
     "pandoc",
+    "parameterless",
+    "SRID",
     "subasec",
+    "subisec",
     "subsec",
     "subsubsec",
     "subsubsubsec",
     "subsubsubsubsec",
-    "upsert"
+    "upsert",
+    "varjson",
+    "varxml"
   ]
 }

README.md

@@ -59,3 +59,8 @@ Documents are generated from Markdown sources using Node.js modules described [h
 Title|Stage|Files|Published at
 -----|-----|-----|------------
 OData Extension for Data Aggregation Version 4.0|Committee Specification 03|[Specification](https://github.com/oasis-tcs/odata-specs/tree/odata-data-aggregation-ext/V4.0_CS03/docs/odata-data-aggregation-ext) [Vocabulary](https://github.com/oasis-tcs/odata-vocabularies/tree/odata-data-aggregation-ext/V4.0_CS03/vocabularies) [ABNF](https://github.com/oasis-tcs/odata-abnf/tree/odata-data-aggregation-ext/V4.0_CS03/abnf)|[OASIS](https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/cs03/)
+OData Version 4.02. Part 1: Protocol|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-protocol) [ABNF](https://github.com/oasis-tcs/odata-abnf/tree/core/V4.02_CSD01/abnf)|
+OData Version 4.02. Part 2: URL Conventions|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-url-conventions) [ABNF](https://github.com/oasis-tcs/odata-abnf/tree/core/V4.02_CSD01/abnf)|
+OData JSON Format Version 4.02|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-json-format)|
+OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-json-format) [Schemas](https://github.com/oasis-tcs/odata-csdl-schemas/tree/core/V4.02_CSD01/schemas)|
+OData Common Schema Definition Language (CSDL) XML Representation Version 4.02|Committee Specification Draft 01|[Specification](https://github.com/oasis-tcs/odata-specs/tree/core/V4.02_CSD01/docs/odata-xml-format) [Schemas](https://github.com/oasis-tcs/odata-csdl-schemas/tree/core/V4.02_CSD01/schemas)|

docs/index.md

@@ -2,10 +2,10 @@
 
 This repository contains working drafts for OData specifications:
 
-* [OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02 - Committee Specification Draft 01](odata-csdl-json/odata-csdl-json.html)
-* [OData Common Schema Definition Language (CSDL) XML Representation Version 4.02 - Committee Specification Draft 01](odata-csdl-xml/odata-csdl-xml.html)
+* [OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02 - Committee Specification Draft 02](odata-csdl-json/odata-csdl-json.html)
+* [OData Common Schema Definition Language (CSDL) XML Representation Version 4.02 - Committee Specification Draft 02](odata-csdl-xml/odata-csdl-xml.html)
 * [OData Extension for Data Aggregation Version 4.0 - Committee Specification 03](odata-data-aggregation-ext/odata-data-aggregation-ext.html)
 * [OData Extension for Temporal Data Version 4.0 - Committee Specification Draft 04](odata-temporal-ext/odata-temporal-ext.html)
-* [OData JSON Format Version 4.02 - Committee Specification Draft 01](odata-json-format/odata-json-format.html)
-* [OData Version 4.02. Part 1: Protocol - Committee Specification Draft 01](odata-protocol/odata-protocol.html)
-* [OData Version 4.02. Part 2: URL Conventions - Committee Specification Draft 01](odata-url-conventions/odata-url-conventions.html)
+* [OData JSON Format Version 4.02 - Committee Specification Draft 02](odata-json-format/odata-json-format.html)
+* [OData Version 4.02. Part 1: Protocol - Committee Specification Draft 02](odata-protocol/odata-protocol.html)
+* [OData Version 4.02. Part 2: URL Conventions - Committee Specification Draft 02](odata-url-conventions/odata-url-conventions.html)