Skip to content

Bring the 2.0.16.1 and 2.0.16.2 hotfix fixes to master - #308

Merged
vpaturet merged 4 commits into
masterfrom
merge-hotfix-2.0.16-into-master
Sep 28, 2026
Merged

vpaturet merged 4 commits into
masterfrom
merge-hotfix-2.0.16-into-master

Conversation

@vpaturet

@vpaturet vpaturet commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

Brings the NeTEx 1.16.1 hotfix work from hotfix/2.0.16.1 and hotfix/2.0.16.2 (#307) to master

Commit From Change
Pin NeTEx XSD download to entur/NeTEx tag v1.0.16.1 and set netexVersion to 1.16.1 2.0.16.1 The model is generated from a pinned tag instead of the moving master of entur/NeTEx
Align bindings.xjb schemaLocation paths with netexVersion 1.16.1 2.0.16.1 Follows the new schema folder
Add tests for ResponsibilityRoleAssignment AssociatedContract ContractRef (NeTEx 1.16.1) 2.0.16.1 Covers the element added by entur/NeTEx#63
Validate NeTEx 1.16 against the 1.16.1 schema 2.0.16.2 (#307) v1_16 validates against the 1.16.1 schema, v1_16_1 becomes a deprecated alias, LATEST is v1_16, and the old 1.16 schema is no longer shipped

…ion to 1.16.1

Includes the ContractRef / ResponsibilitySet AssociatedContract change from
entur/NeTEx#63. The 1.16 schema is still downloaded for validation.

(cherry picked from commit a23f029)
…tRef (NeTEx 1.16.1)

(cherry picked from commit 2c67705)
2.0.16.1 generated the model from the 1.16.1 schema but kept validating
NetexVersion.v1_16 against the original 1.16 schema, and added v1_16_1 for
the new one. Documents only ever declare the minor version
(1.16:NO-NeTEx-networktimetable:1.6), so every consumer maps them to
v1_16, and a document the model itself produces is rejected: an
AssociatedContract on a ResponsibilityRoleAssignment fails with
cvc-complex-type.2.4.a. Getting the 1.16.1 schema meant declaring a
1.16.1 version that no client should have to write.

1.16.1 is purely additive over 1.16: stripped of annotations, the only
differences are the optional AssociatedContract element and the
ContractRef types it needs. Anything valid against 1.16 stays valid.

- v1_16 now loads its schema from the 1.16.1 folder. toString still
  returns "1.16": consumers derive the declared version from it, and
  returning "1.16.1" would stop them accepting 1.16.
- v1_16_1 is kept as a deprecated alias for the same schema, so code
  compiled against 2.0.16.1 keeps working.
- LATEST is v1_16.
- The 1.16 schema is no longer downloaded or shipped.

(cherry picked from commit 815e140)
@sonarqubecloud

Copy link
Copy Markdown

@vpaturet
vpaturet merged commit acab444 into master Sep 28, 2026
4 checks passed
@vpaturet
vpaturet deleted the merge-hotfix-2.0.16-into-master branch September 28, 2026 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant