Merge branch 'v2.1-wip' of https://github.com/TransmodelEcosystem/NeTEx into v2.1-wip

Author: ue71603

.github/workflows/check-parent-branch.yml

@@ -0,0 +1,33 @@
+# Block PRs targeting wip branches (v2.1-wip, v3.0-wip) when they are
+# behind their parent branch (v2.0 and v2.1-wip respectively).
+# This prevents unpropagated commits from accumulating, which leads to
+# costly backports of many commits generating large conflicts.
+# See https://github.com/TransmodelEcosystem/NeTEx/issues/982
+
+name: Check parent branch is up to date
+
+on:
+  pull_request:
+    branches: [v2.1-wip, v3.0-wip]
+
+jobs:
+  parent-branch-is-up-to-date:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Verify base branch contains all parent commits
+        run: |
+          case "${{ github.base_ref }}" in
+            v2.1-wip) parent=v2.0 ;;
+            v3.0-wip) parent=v2.1-wip ;;
+          esac
+
+          behind=$(git rev-list --count "origin/${{ github.base_ref }}..origin/$parent")
+          if [ "$behind" -gt 0 ]; then
+            echo "::error::${{ github.base_ref }} is $behind commit(s) behind $parent. Merge $parent into ${{ github.base_ref }} first."
+            git log --oneline "origin/${{ github.base_ref }}..origin/$parent"
+            exit 1
+          fi

.github/workflows/ci.yml

@@ -2,6 +2,9 @@ name: CI
 
 on: push
 
+permissions:
+  contents: write
+
 jobs:
   run:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -24,11 +24,11 @@ This repository contains the XML Schemas (XSD) for:
 In each branch, we have:
 - The folder `xsd` in which all the XML schemas can be found,
 - The folder `examples` in which all examples can be found,
-- At the root folder, `Siri.spp` which is the project for XMLSpy and `Siri.xpr` for Oxygen.
+- At the root folder, `NeTEx.spp` which is the project for XMLSpy and `NeTEx.xpr` for Oxygen.
 
 The `xsd` folder is sub-divided as follow:
 -  `gml` for all geometry-related elements,
-- `netex_framlework` for all shared components and frames,
+- `netex_framework` for all shared components and frames,
 - one sub-folder per NeTEx Part (from 1 to 5),
 - other complementary sub-folders.
 At the root of the `xsd` folder, the file `NeTEx_publication.xsd` should be used as the main one for production and validation purposes. It includes references to all the other XSD.
@@ -37,10 +37,10 @@ At the root of the `xsd` folder, the file `NeTEx_publication.xsd` should be used
 
 | Branch Name | Description                                             | Maintenance status                                    | Link                                            |
 | ----------- | ------------------------------------------------------- | ----------------------------------------------- |----------------------------------------------- 
-| v2.0        | The last stable branch of the XML Schema, result of the NeTEx revision made during 2022-2026 | Bug fixes only | [Direct link](https://github.com/NeTEx-CEN/NeTEx)    |
-| v1.3        | The previous branch of the XML Schema that was published prior to the 2026 revision of NeTEx, it matches the state of the XSD at the date of the publication of Part 6 (CEN/TS 16614-6:2024) with the correction of bugs and typos -- **Important note**: this branch is not longer maintained | Not maintained | [Direct link](https://github.com/NeTEx-CEN/NeTEx/tree/v1.3) |
-| v2.1-wip    | All the upcoming work to improve v2.0     | In development   | [GitHub](https://github.com/NeTEx-CEN/NeTEx/tree/v2.1-wip) |
-| v3.0-wip    | All the upcoming work preparing the migration from CEN/TS to CEN/EN for the entire NeTEx series        | In development | [GitHub](https://github.com/NeTEx-CEN/NeTEx/tree/v3.0-wip) |
+| v2.0        | The last stable branch of the XML Schema, result of the NeTEx revision made during 2022-2026 | Bug fixes only | [Direct link](https://github.com/TransmodelEcosystem/NeTEx)    |
+| v1.3        | The previous branch of the XML Schema that was published prior to the 2026 revision of NeTEx, it matches the state of the XSD at the date of the publication of Part 6 (CEN/TS 16614-6:2024) with the correction of bugs and typos -- **Important note**: this branch is not longer maintained | Not maintained | [Direct link](https://github.com/TransmodelEcosystem/NeTEx/tree/v1.3) |
+| v2.1-wip    | All the upcoming work to improve v2.0     | In development   | [GitHub](https://github.com/TransmodelEcosystem/NeTEx/tree/v2.1-wip) |
+| v3.0-wip    | All the upcoming work preparing the migration from CEN/TS to CEN/EN for the entire NeTEx series        | In development | [GitHub](https://github.com/TransmodelEcosystem/NeTEx/tree/v3.0-wip) |
 
 All other branches are considered as feature branches, meaning that they are used for development only and are to be deleted once a Pull Request is merged. See below for more details on contributions.
 
@@ -92,7 +92,7 @@ The folder contains more comprehensive NeTEx files that aim to represent either
 
 ### Starting a discussion 💬
 
-Either for a modelling question or a request for change, please start a discussion using the [GitHub issues](https://github.com/NeTEx-CEN/NeTEx/issues). 
+Either for a modelling question or a request for change, please start a discussion using the [GitHub issues](https://github.com/TransmodelEcosystem/NeTEx/issues). 
 In your issue, make sure that:
 - The title is a clear summary of your question / requst for change,
 - The content sufficiently details:
@@ -114,21 +114,21 @@ _Upcoming: templates for Pull Request_
 
 ----
 
-## Change log 📰
+## Changelog 📰
 
 ### Releases
 | Release Number | Release Date  | Description                                    | Link          |
 | -------------- | ------------- | ---------------------------------------------- | ------------- |
-| v1.2            | March 2022    | Before the extension to alternative modes of operation | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2)    |
-| v1.2.2          | August 2023   | With the inclusion of NeTEx Part 5 (Alternative modes) | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2.2)  |
-| v1.2.3          | May 2024      | Improvement on the v1.2.2 before the release of NeTEx Part 6 (EPIAP) | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2.3)  |
-| v1.3.1          | May 2024      | Release of NeTex Part 6, the European Passenger Information Accessibility Profile (EPIAP) | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.3.1) |
-| v2.0.0          | February 2026 | Matches the CEN documentation published in February 2026 for NeTEx Parts 1, 2, 3 and 5. Considered as the latest version of NeTEx to be used for production. | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v2.0.0) |
+| v1.2            | March 2022    | Before the extension to alternative modes of operation | [Code](https://github.com/TransmodelEcosystem/NeTEx/releases/tag/v1.2)    |
+| v1.2.2          | August 2023   | With the inclusion of NeTEx Part 5 (Alternative modes) | [Code](https://github.com/TransmodelEcosystem/NeTEx/releases/tag/v1.2.2)  |
+| v1.2.3          | May 2024      | Improvement on the v1.2.2 before the release of NeTEx Part 6 (EPIAP) | [Code](https://github.com/TransmodelEcosystem/NeTEx/releases/tag/v1.2.3)  |
+| v1.3.1          | May 2024      | Release of NeTex Part 6, the European Passenger Information Accessibility Profile (EPIAP) | [Code](https://github.com/TransmodelEcosystem/NeTEx/releases/tag/v1.3.1) |
+| v2.0.0          | February 2026 | Matches the CEN documentation published in February 2026 for NeTEx Parts 1, 2, 3 and 5. Considered as the latest version of NeTEx to be used for production. | [Code](https://github.com/TransmodelEcosystem/NeTEx/releases/tag/v2.0.0) |
 
 **Important notes:** 
 - Releases (and their tags) are a snapshot of the corresponding working branch in time.
 - For any official reference to a NeTEx version, it is recommended to point to a 2-digit version (e.g., v1.3, v2.0).
 - For any development work, it is recommended to use the latest 3-digit version of NeTEx XML Schema.
 
 ### Comprehensive version history
-The comprehensive versions history is available in [change_log.md](https://github.com/NeTEx-CEN/NeTEx/blob/v2.0/change_log.md)
+The comprehensive versions history is available in [CHANGELOG.md](https://github.com/TransmodelEcosystem/NeTEx/blob/v2.0/CHANGELOG.md)