Schema merge requestshttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests2023-08-18T14:30:28Zhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/539AWS Merge Dev Into Master2023-08-18T14:30:28ZGuillaume CailletAWS Merge Dev Into MasterM20 - Release 0.23Guillaume CailletGuillaume Caillethttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/538Updated readme2023-08-18T11:06:18ZDmitrii Novikov (EPAM)Updated readmeAdded pubsub configuration descriptionAdded pubsub configuration descriptionM20 - Release 0.23Dmitrii Novikov (EPAM)Dmitrii Novikov (EPAM)https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/537Resolve "OSDU-DD-Delivery-M20 (v0.23.0)"2023-08-21T19:11:40ZThomas Gehrmann [slb]Resolve "OSDU-DD-Delivery-M20 (v0.23.0)"Resources to bootstrap M20 v0.23.0 schemas provided by OSDU Data Definitions.
Now with incremental load_sequences for each milestone ([example M20](https://community.opengroup.org/osdu/platform/system/schema-service/-/blob/2da3996a94904...Resources to bootstrap M20 v0.23.0 schemas provided by OSDU Data Definitions.
Now with incremental load_sequences for each milestone ([example M20](https://community.opengroup.org/osdu/platform/system/schema-service/-/blob/2da3996a94904d81ed36795242eec46639eee265/deployments/shared-schemas/osdu/_IncrementalLoadSequences/v0.23.0_load_sequence.json)). The [conventional load_sequence.1.0.0 is delivered updated as usual](https://community.opengroup.org/osdu/platform/system/schema-service/-/blob/2da3996a94904d81ed36795242eec46639eee265/deployments/shared-schemas/osdu/load_sequence.1.0.0.json).
DD schema repo commit SHA [9dbd128af59d446ff6624a9a084a2dc5db910a3f](https://gitlab.opengroup.org/osdu/subcommittees/data-def/work-products/schema/-/tree/9dbd128af59d446ff6624a9a084a2dc5db910a3f).
Closes #134M20 - Release 0.23Thomas Gehrmann [slb]Thomas Gehrmann [slb]https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/536Fixde NOTICE file's name2023-08-18T21:55:01ZMahsa HanifiFixde NOTICE file's nameThe NOTICE file had an extra space after the name with the previous merge, and that caused failure in cloning the repo.The NOTICE file had an extra space after the name with the previous merge, and that caused failure in cloning the repo.M20 - Release 0.23Mahsa HanifiMahsa Hanifihttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/535Fixing vulnerabilities2023-08-29T15:53:18ZHarsheet ShahFixing vulnerabilitieshttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/534Bump up certifi to trusted version2023-08-08T11:48:50ZAryaan SinghBump up certifi to trusted versionBump up certifi to trusted version as per recommendationBump up certifi to trusted version as per recommendationAryaan SinghAryaan Singhhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/533Schema-test project -> Improving HTTP client resiliency using spring-retry2023-09-18T07:51:48ZAbhiram BondadaSchema-test project -> Improving HTTP client resiliency using spring-retryAbhiram BondadaAbhiram Bondadahttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/529Schema test refactoring2023-08-18T21:55:02ZShreya ShahSchema test refactoring# Overview
Added some changes to the test class
# References
https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/510#note_233959# Overview
Added some changes to the test class
# References
https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/510#note_233959M20 - Release 0.23Shreya ShahShreya Shahhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/526JDK 17 migration2024-01-25T13:47:34ZGuillaume CailletJDK 17 migration# Description:
Migration from Java 8 to Java 17.
# How to test:
Via Unit and Integration tests.
# Changes include:
* [ ] Breaking change (a change that is not backward-compatible and/or changes current functionality).
# Changes in:...# Description:
Migration from Java 8 to Java 17.
# How to test:
Via Unit and Integration tests.
# Changes include:
* [ ] Breaking change (a change that is not backward-compatible and/or changes current functionality).
# Changes in:
* [ ] Common code
# Dev Checklist:
* [ ] Added Unit Tests, wherever applicable.
* [ ] Updated the Readme, if applicable.
* [ ] Existing Tests pass
* [ ] Verified functionality locally
* [ ] Self Reviewed my code for formatting and complex business logic.
# Other comments:
* Upgraded 'lombok' plugin version
* Upgraded 'cucumber' for Java 17 supportM20 - Release 0.23https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/525Fixed vulnerability2023-07-20T06:14:20ZVineeth Guna [Microsoft]Fixed vulnerabilityhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/524Cherry-pick 'Upgrade First Party Library Dependencies for Release 0.22' into ...2023-07-18T07:40:24ZDavid Diederichd.diederich@opengroup.orgCherry-pick 'Upgrade First Party Library Dependencies for Release 0.22' into release/0.22**Original MR**: !522
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporati...**Original MR**: !522
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporating all changes in the default branch.
These MRs must be approved by the PMC before they are merged, since they alter the scope of the release.
To see more details about the change itself, look at the Original MR listed above.
#### Skipped Pipeline
Normally, pipelines are not executed on the cherry pick branch/MR prior to merging.
This optimization is accepted because the code was tested when it merged into the default branch, and will be tested again in the release branch prior to tagging.
However, if anybody feels that the MR requires further scrutiny -- whether because it had conflicts in the cherry-picking, it interfaces with some drastically altered logic between the branches, or any other reason -- we can run the pipeline here prior to merging.
#### If There's Reason to Run a Pipeline
If you want to see a pipeline result before this merges, first add a comment explaining why you'd like to see the pipeline results so the PMC and others know your thinking.
Then, mark the MR as a Draft MR (using the vertical ellipsis above, choose 'Mark as Draft').
This prevents the MR from being approved & merged accidentally by a busy release coordinator who didn't see your comment.
Finally, if you are a maintainer on the project, launch a pipeline on this branch.
Since this branch is a protected branch and the MR has ~no-detached-pipeline set, all integration tests will run and there's no need for any `trusted-*` branches.
[Launch a Pipeline for this Branch](https://community.opengroup.org/osdu/platform/system/schema-service/-/pipelines/new?ref=cherry-pick-for-522)M19 - Release 0.22David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/523Add missing commit from previous Cherry Pick2023-07-17T19:36:57ZDavid Diederichd.diederich@opengroup.orgAdd missing commit from previous Cherry PickOne commit was omitted by mistake from !520, which was a cherry-pick of !504.
This adds that commit to the release branch (already present on the default branch, thus why this is a direct patch to the release rather than a cherry-pick).One commit was omitted by mistake from !520, which was a cherry-pick of !504.
This adds that commit to the release branch (already present on the default branch, thus why this is a direct patch to the release rather than a cherry-pick).M19 - Release 0.22David Diederichd.diederich@opengroup.orgDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/522Upgrade First Party Library Dependencies for Release 0.222023-07-18T03:24:53ZChad LeongUpgrade First Party Library Dependencies for Release 0.22This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to keep the OSDU projects utilizing the latest available code to ensure widespread usage and stability.
However, any...This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to keep the OSDU projects utilizing the latest available code to ensure widespread usage and stability.
However, any library that is older than the previous release will be left as-is, since the upgrade is likely to be more complicated.
Furthermore, the upgrade should only be merged in the CI pipeline reports success.
If this MR has failed, we can spend a little time investigating to see if a trivial upgrade could achieve compatiblity to the new library.
But significant upgrade efforts should not occur on this MR, as part of the release tagging process.
Instead, significant work should be scheduled for a subsequent milestone.
### Dependency Information Before the Upgrade
```
Branch: master
SHA: 0f06f9b0f997ca293d88e64b6bdcef72ab0b8361
Maven: 0.23.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| ----------------------------------------------------- | ------------------ | ---------- |
| core-lib-azure | 0.14.0-rc2 | 0.6.1 |
| core-lib-gc | 0.21.0 | |
| os-core-lib-aws | 0.21.0 | 0.21.0 |
| obm | 0.22.0-rc3 | |
| oqm | 0.21.0 | |
| os-core-common | 0.19.0-rc6, 0.21.0 | 0.19.0-rc6 |
| os-core-lib-ibm | 0.16.0-rc1 | 0.15.2 |
| osm | 0.21.0 | |
| (3rd Party) net.minidev.json-smart | 2.4.9 | 2.3 |
| (3rd Party) org.apache.logging.log4j.log4j-api | 2.17.1, 2.17.2 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-core | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-jul | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-slf4j-impl | 2.17.1 | 2.13.3 |
| (3rd Party) org.springframework.spring-webflux | 5.3.12 | |
```
Critical: Found Vulnerable Spring WebFlux dependency (<5.2.20 || >=5.3.0 <5.3.18)
└─ _Root_
└─ org.opengroup.osdu.os-schema-azure == 0.23.0-SNAPSHOT
└─ org.springframework.boot.spring-boot-starter-webflux == 2.6.6
└─ org.springframework.spring-webflux == 5.3.12
```
### Dependency Information After the Upgrade
```
Branch: dependency-upgrade-2
SHA: a73113e7b7c55634254c92e83ede0f1ee2244d42
Maven: 0.23.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| ----------------------------------------------------- | ------------------ | ---------- |
| core-lib-azure | 0.14.0-rc2 | 0.6.1 |
| core-lib-gc | 0.22.1 | |
| os-core-lib-aws | 0.22.0 | 0.22.0 |
| obm | 0.22.0 | |
| oqm | 0.22.0 | |
| os-core-common | 0.19.0-rc6, 0.22.0 | 0.19.0-rc6 |
| os-core-lib-ibm | 0.16.0-rc1 | 0.15.2 |
| osm | 0.22.0 | |
| (3rd Party) net.minidev.json-smart | 2.4.9 | 2.3 |
| (3rd Party) org.apache.logging.log4j.log4j-api | 2.17.1, 2.17.2 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-core | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-jul | 2.17.1 | 2.13.3 |
| (3rd Party) org.apache.logging.log4j.log4j-slf4j-impl | 2.17.1 | 2.13.3 |
| (3rd Party) org.springframework.spring-webflux | 5.3.12 | |
```
Critical: Found Vulnerable Spring WebFlux dependency (<5.2.20 || >=5.3.0 <5.3.18)
└─ _Root_
└─ org.opengroup.osdu.os-schema-azure == 0.23.0-SNAPSHOT
└─ org.springframework.boot.spring-boot-starter-webflux == 2.6.6
└─ org.springframework.spring-webflux == 5.3.12
```M19 - Release 0.22https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/521Cherry-pick 'Resolve "OSDU-DD-Delivery-M19 (v0.22.0)"' into release/0.222023-07-14T14:12:34ZChad LeongCherry-pick 'Resolve "OSDU-DD-Delivery-M19 (v0.22.0)"' into release/0.22**Original MR**: !515
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporati...**Original MR**: !515
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporating all changes in the default branch.
These MRs must be approved by the PMC before they are merged, since they alter the scope of the release.
To see more details about the change itself, look at the Original MR listed above.
#### Skipped Pipeline
Normally, pipelines are not executed on the cherry pick branch/MR prior to merging.
This optimization is accepted because the code was tested when it merged into the default branch, and will be tested again in the release branch prior to tagging.
However, if anybody feels that the MR requires further scrutiny -- whether because it had conflicts in the cherry-picking, it interfaces with some drastically altered logic between the branches, or any other reason -- we can run the pipeline here prior to merging.
#### If There's Reason to Run a Pipeline
If you want to see a pipeline result before this merges, first add a comment explaining why you'd like to see the pipeline results so the PMC and others know your thinking.
Then, mark the MR as a Draft MR (using the vertical ellipsis above, choose 'Mark as Draft').
This prevents the MR from being approved & merged accidentally by a busy release coordinator who didn't see your comment.
Finally, if you are a maintainer on the project, launch a pipeline on this branch.
Since this branch is a protected branch and the MR has ~no-detached-pipeline set, all integration tests will run and there's no need for any `trusted-*` branches.
[Launch a Pipeline for this Branch](https://community.opengroup.org/osdu/platform/system/schema-service/-/pipelines/new?ref=cherry-pick-for-515)M19 - Release 0.22David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/520Cherry-pick 'ws-fixes for schema service' into release/0.222023-07-17T19:34:56ZChad LeongCherry-pick 'ws-fixes for schema service' into release/0.22**Original MR**: !504
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporati...**Original MR**: !504
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporating all changes in the default branch.
These MRs must be approved by the PMC before they are merged, since they alter the scope of the release.
To see more details about the change itself, look at the Original MR listed above.
#### Skipped Pipeline
Normally, pipelines are not executed on the cherry pick branch/MR prior to merging.
This optimization is accepted because the code was tested when it merged into the default branch, and will be tested again in the release branch prior to tagging.
However, if anybody feels that the MR requires further scrutiny -- whether because it had conflicts in the cherry-picking, it interfaces with some drastically altered logic between the branches, or any other reason -- we can run the pipeline here prior to merging.
#### If There's Reason to Run a Pipeline
If you want to see a pipeline result before this merges, first add a comment explaining why you'd like to see the pipeline results so the PMC and others know your thinking.
Then, mark the MR as a Draft MR (using the vertical ellipsis above, choose 'Mark as Draft').
This prevents the MR from being approved & merged accidentally by a busy release coordinator who didn't see your comment.
Finally, if you are a maintainer on the project, launch a pipeline on this branch.
Since this branch is a protected branch and the MR has ~no-detached-pipeline set, all integration tests will run and there's no need for any `trusted-*` branches.
[Launch a Pipeline for this Branch](https://community.opengroup.org/osdu/platform/system/schema-service/-/pipelines/new?ref=cherry-pick-for-504)M19 - Release 0.22David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/519Cherry-pick 'Fixed Preship Issue #521 - Azure PUT /api/schema-service/v1/sche...2023-07-14T13:04:03ZChad LeongCherry-pick 'Fixed Preship Issue #521 - Azure PUT /api/schema-service/v1/schemas/system' into release/0.22**Original MR**: !510
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporati...**Original MR**: !510
### This MR is a Cherry Pick into a Release Branch.
After the release branch is first created, any subsequent changes use this process to update the release (often resulting in a new patch tag) without incorporating all changes in the default branch.
These MRs must be approved by the PMC before they are merged, since they alter the scope of the release.
To see more details about the change itself, look at the Original MR listed above.
#### Skipped Pipeline
Normally, pipelines are not executed on the cherry pick branch/MR prior to merging.
This optimization is accepted because the code was tested when it merged into the default branch, and will be tested again in the release branch prior to tagging.
However, if anybody feels that the MR requires further scrutiny -- whether because it had conflicts in the cherry-picking, it interfaces with some drastically altered logic between the branches, or any other reason -- we can run the pipeline here prior to merging.
#### If There's Reason to Run a Pipeline
If you want to see a pipeline result before this merges, first add a comment explaining why you'd like to see the pipeline results so the PMC and others know your thinking.
Then, mark the MR as a Draft MR (using the vertical ellipsis above, choose 'Mark as Draft').
This prevents the MR from being approved & merged accidentally by a busy release coordinator who didn't see your comment.
Finally, if you are a maintainer on the project, launch a pipeline on this branch.
Since this branch is a protected branch and the MR has ~no-detached-pipeline set, all integration tests will run and there's no need for any `trusted-*` branches.
[Launch a Pipeline for this Branch](https://community.opengroup.org/osdu/platform/system/schema-service/-/pipelines/new?ref=cherry-pick-for-510)M19 - Release 0.22David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/516Updated Maven Dependency2023-07-05T18:12:03ZShreya ShahUpdated Maven Dependency# Fixes :
https://community.opengroup.org/osdu/platform/system/schema-service/-/security/vulnerabilities/19973 https://community.opengroup.org/osdu/platform/system/schema-service/-/security/vulnerabilities/21551
# Issues :
https://com...# Fixes :
https://community.opengroup.org/osdu/platform/system/schema-service/-/security/vulnerabilities/19973 https://community.opengroup.org/osdu/platform/system/schema-service/-/security/vulnerabilities/21551
# Issues :
https://community.opengroup.org/osdu/platform/security-and-compliance/home/-/issues/166 https://community.opengroup.org/osdu/platform/security-and-compliance/home/-/issues/167M19 - Release 0.22Shreya ShahShreya Shahhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/515Resolve "OSDU-DD-Delivery-M19 (v0.22.0)"2023-07-14T14:07:40ZThomas Gehrmann [slb]Resolve "OSDU-DD-Delivery-M19 (v0.22.0)"Resources to bootstrap M19 v0.22 schemas provided by OSDU Data Definitions.
Now with incremental load_sequences for each milestone ([example M19](https://community.opengroup.org/osdu/platform/system/schema-service/-/blob/1434f43fb60fb...Resources to bootstrap M19 v0.22 schemas provided by OSDU Data Definitions.
Now with incremental load_sequences for each milestone ([example M19](https://community.opengroup.org/osdu/platform/system/schema-service/-/blob/1434f43fb60fbb47b4cd53ab163884bc946b8235/deployments/shared-schemas/osdu/_IncrementalLoadSequences/v0.22.0_load_sequence.json)). The [conventional load_sequence.1.0.0 is delivered updated as usual](https://community.opengroup.org/osdu/platform/system/schema-service/-/blob/1434f43fb60fbb47b4cd53ab163884bc946b8235/deployments/shared-schemas/osdu/load_sequence.1.0.0.json).
DD schema repo commit SHA e09c0b42e510f9893c386654ec9a117520501d5d
Closes #131M19 - Release 0.22Thomas Gehrmann [slb]Thomas Gehrmann [slb]https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/514Fix instance name2023-06-29T16:51:16ZAleh Shubko [EPAM]Fix instance nameM19 - Release 0.22Madalyn MarabellaMadalyn Marabellahttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/512[GONRG-7404] Fix schema bootstrap2023-06-30T10:06:42ZOleksandr Kosse (EPAM)[GONRG-7404] Fix schema bootstrapM19 - Release 0.22