Skip to content

Commit 8766365

Browse files
ralfhandlralfhandl
committed
Merge branch 'main' into ODATA-1610
2 parents 52876d1 + 41b946e commit 8766365

File tree

89 files changed

+9214
-5861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+9214
-5861
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.html text eol=lf
2+
*.md text eol=lf
3+
*.pdf -text

‎.github/workflows/nodejs.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@ jobs:
1111
node-version: [20.x]
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Use Node.js ${{ matrix.node-version }}
16-
uses: actions/setup-node@v3
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: ${{ matrix.node-version }}
1919
cache: 'npm'
2020
- name: Setup pandoc
2121
uses: nikeee/setup-pandoc@v1
2222
with:
23-
pandoc-version: 3.1.2
23+
pandoc-version: 3.1.12.2
2424
- name: Build docs
2525
run: |
26+
export PUPPETEER_SKIP_DOWNLOAD='true'
2627
npm ci
2728
npm run build
2829
git diff --exit-code docs

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
node_modules
22
coverage
3+
.DS_Store
4+
/zip/*
5+
!/zip/*.docx
6+
!/zip/*.zip

‎.vscode/settings.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,29 @@
22
"cSpell.words": [
33
"ABNF",
44
"asec",
5+
"ccid",
6+
"concat",
57
"CSDL",
8+
"CSDLXML",
9+
"Datetimestamp",
10+
"EDMX",
11+
"entitytype",
612
"ETag",
13+
"isec",
14+
"isomorphy",
715
"matchespattern",
816
"odata",
917
"pandoc",
18+
"parameterless",
19+
"SRID",
1020
"subasec",
21+
"subisec",
1122
"subsec",
1223
"subsubsec",
1324
"subsubsubsec",
1425
"subsubsubsubsec",
15-
"upsert"
26+
"upsert",
27+
"varjson",
28+
"varxml"
1629
]
1730
}

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,8 @@ Documents are generated from Markdown sources using Node.js modules described [h
5959
Title|Stage|Files|Published at
6060
-----|-----|-----|------------
6161
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/)
62+
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)|
63+
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)|
64+
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)|
65+
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)|
66+
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‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
This repository contains working drafts for OData specifications:
44

5-
* [OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02 - Committee Specification Draft 01](odata-csdl-json/odata-csdl-json.html)
6-
* [OData Common Schema Definition Language (CSDL) XML Representation Version 4.02 - Committee Specification Draft 01](odata-csdl-xml/odata-csdl-xml.html)
5+
* [OData Common Schema Definition Language (CSDL) JSON Representation Version 4.02 - Committee Specification Draft 02](odata-csdl-json/odata-csdl-json.html)
6+
* [OData Common Schema Definition Language (CSDL) XML Representation Version 4.02 - Committee Specification Draft 02](odata-csdl-xml/odata-csdl-xml.html)
77
* [OData Extension for Data Aggregation Version 4.0 - Committee Specification 03](odata-data-aggregation-ext/odata-data-aggregation-ext.html)
88
* [OData Extension for Temporal Data Version 4.0 - Committee Specification Draft 04](odata-temporal-ext/odata-temporal-ext.html)
9-
* [OData JSON Format Version 4.02 - Committee Specification Draft 01](odata-json-format/odata-json-format.html)
10-
* [OData Version 4.02. Part 1: Protocol - Committee Specification Draft 01](odata-protocol/odata-protocol.html)
11-
* [OData Version 4.02. Part 2: URL Conventions - Committee Specification Draft 01](odata-url-conventions/odata-url-conventions.html)
9+
* [OData JSON Format Version 4.02 - Committee Specification Draft 02](odata-json-format/odata-json-format.html)
10+
* [OData Version 4.02. Part 1: Protocol - Committee Specification Draft 02](odata-protocol/odata-protocol.html)
11+
* [OData Version 4.02. Part 2: URL Conventions - Committee Specification Draft 02](odata-url-conventions/odata-url-conventions.html)

0 commit comments

Comments
 (0)