Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge ADE 1.3.2 changes back into Develop branch #368

Merged
merged 10 commits into from
Feb 15, 2023
Merged

Conversation

cookeac
Copy link
Collaborator

@cookeac cookeac commented Feb 14, 2023

This pull request integrates the following changes:

Merging into Develop separately from the merge into ADE1.

cookeac and others added 9 commits December 9, 2022 17:07
1. Include "allOf" icarResource so the normal resource synchronisation etc works.
2. Move "statistics" array inside icarStatisticsGroupType - change made by @erwinspeybroeck
3. Add some more "description" values to explain the intent of the attributes.

Resolves #353
And added links to the other guidance markdown files in docs.
removd statistics from the required section
made unit as a string
and value just as number (without float and nullable)
And updated the description of the units field.
Revert consignment originAddress and destinationAddress to simple string types, as using "anyOf" with string and PostalAddress options did not work for Java code generation.
Return `originAddress` and `destinationAddress` to string fields to avoid breaking changes in code generation, but also mark these as deprecated.
Add `originPostalAddress` and `destinationPostalAddress` as structured addresses.
Resolves #357
Added release notes explaining 1.3 changes and linked to them from the main readme.
in the milkUrlScheme:
"operationId": "get existing milking-withdrawals",
should be
"operationId": "get-existing-milking-withdrawals",
@cookeac cookeac merged commit 298b8a2 into Develop Feb 15, 2023
@cookeac cookeac deleted the RC-for-ADE-1-3-2 branch February 15, 2023 20:16
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.

2 participants