Schema merge requestshttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests2024-01-11T17:05:43Zhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/631Fix gc containerize-bootstrap2024-01-11T17:05:43ZAliaksandr Ramanovich (EPAM)Fix gc containerize-bootstrapFix for containerize-bootstrap job of GC providerFix for containerize-bootstrap job of GC providerM22 - Release 0.25Aliaksandr Ramanovich (EPAM)Aliaksandr Ramanovich (EPAM)https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/626[MSCOSDU-1894] upgrade json-smart, reactor-netty2024-01-09T20:57:37ZVidyaDharani Lokam[MSCOSDU-1894] upgrade json-smart, reactor-netty# Change details
### Common code
* upgraded `json-smart` version to `2.5.0`
### Azure
* upgraded `reactor-netty` related dependencies to version `1.1.14`
# Changes in:
* [x] GCP
* [x] Azure
* [x] AWS
* [x] IBM# Change details
### Common code
* upgraded `json-smart` version to `2.5.0`
### Azure
* upgraded `reactor-netty` related dependencies to version `1.1.14`
# Changes in:
* [x] GCP
* [x] Azure
* [x] AWS
* [x] IBMM23 - Release 0.26VidyaDharani LokamVidyaDharani Lokamhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/627Cherry-pick 'Bootstrap issue fix' into release/0.252024-01-09T11:32:38ZChad LeongCherry-pick 'Bootstrap issue fix' into release/0.25**Original MR**: !620
### 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**: !620
### 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-620)M22 - Release 0.25David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/620Bootstrap issue fix2024-01-09T10:46:17ZIsha KumariBootstrap issue fixImplemented error-catching mechanisms and introduced a retry strategy to mitigate the impact of these intermittent failures.
Issue: https://community.opengroup.org/osdu/platform/system/schema-service/-/issues/144Implemented error-catching mechanisms and introduced a retry strategy to mitigate the impact of these intermittent failures.
Issue: https://community.opengroup.org/osdu/platform/system/schema-service/-/issues/144M22 - Release 0.25Isha KumariIsha Kumarihttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/618Cherry-pick 'Full Upgrade of First Party Library Dependencies for Release 0.2...2023-12-16T10:26:16ZDavid Diederichd.diederich@opengroup.orgCherry-pick 'Full Upgrade of First Party Library Dependencies for Release 0.25' into release/0.25**Original MR**: !616
### 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**: !616
### 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-616)M22 - Release 0.25David Diederichd.diederich@opengroup.orgChad LeongSrinivasan NarayananDavid Diederichd.diederich@opengroup.orghttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/616Full Upgrade of First Party Library Dependencies for Release 0.252023-12-15T19:41:13ZDavid Diederichd.diederich@opengroup.orgFull Upgrade of First Party Library Dependencies for Release 0.25This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to try to fully upgrade all dependent libraries to see if the latest code will work.
It is expected that these will ...This generated MR upgrades the first party libraries (other OSDU libraries) to utilize the latest release.
The intent is to try to fully upgrade all dependent libraries to see if the latest code will work.
It is expected that these will often fail, since the upgrades were previously rejected for failing pipelines and have not been directly addressed yet.
This 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.
This MR may co-exist with a separate, smaller upgrade MR.
If both pass, this one should be used instead.
### Dependency Information Before the Upgrade
```
Branch: master
SHA: 78ff9a023d1c473fb4e6dc795bf2333e520f60df
Maven: 0.26.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| -------------------- | ---------- | ---------- |
| apd-core | 0.24.0-rc1 | |
| core-lib-azure | 0.24.0 | 0.24.0 |
| core-lib-gc | 0.24.0 | |
| core-plus-common-lib | 0.24.0-rc2 | |
| os-core-lib-aws | 0.25.0-rc2 | 0.25.0-rc2 |
| obm | 0.24.0 | |
| oqm | 0.24.0 | |
| os-core-common | 0.25.0-rc2 | 0.24.0 |
| os-core-lib-ibm | 0.24.0 | 0.24.0 |
| os-obm-core | 0.25.0-rc1 | |
| os-oqm-core | 0.25.0-rc1 | |
| os-osm-core | 0.25.0-rc2 | |
| osm | 0.24.0 | |
### Dependency Information After the Upgrade
```
Branch: dependency-upgrade
SHA: 84203ee9fbe2fb3a08035328a55dfa2fa13d541e
Maven: 0.26.0-SNAPSHOT
```
| Maven Dependencies | testing/ | _Root_ |
| ------------------ | -------- | ------ |
| core-lib-azure | 0.25.0 | |
| os-core-lib-aws | 0.25.0 | |
| os-core-common | 0.25.0 | 0.25.0 |
| os-core-lib-ibm | 0.25.0 | |M22 - Release 0.25https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/617[MSCOSDU-1851] fix json, io.netty, reactor-netty-http vulnerabilities2023-12-14T15:16:26ZVidyaDharani Lokam[MSCOSDU-1851] fix json, io.netty, reactor-netty-http vulnerabilities# Change details
* upgrade `core-lib-azure` to `0.25.0-rc2`
* upgrade `io.netty:netty-bom` version to `4.1.101.Final`
* upgrade `reactor-netty-http` version to `1.1.13`
# Changes in:
* [ ] GCP
* [x] Azure
* [ ] AWS
* [ ] IBM# Change details
* upgrade `core-lib-azure` to `0.25.0-rc2`
* upgrade `io.netty:netty-bom` version to `4.1.101.Final`
* upgrade `reactor-netty-http` version to `1.1.13`
# Changes in:
* [ ] GCP
* [x] Azure
* [ ] AWS
* [ ] IBMM23 - Release 0.26VidyaDharani LokamVidyaDharani Lokamhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/615disable mongodb2024-01-09T14:06:36ZYunhua Koglindisable mongodbM23 - Release 0.26Yunhua KoglinYunhua Koglinhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/604Resolve "OSDU-DD-Delivery-M22 (v0.25.0)"2023-12-11T06:19:23ZThomas Gehrmann [slb]Resolve "OSDU-DD-Delivery-M22 (v0.25.0)"OSDU Data Definition M22 deliverables: 75 new schemas/schema versions with updated load_sequence, and incremental milestone _IncrementalLoadSequences/v0.25.0_load_sequence.json; schema repo SHA 256fb1f2b0edab09cfe6bf2b6c50f35d5b1c5cfd
C...OSDU Data Definition M22 deliverables: 75 new schemas/schema versions with updated load_sequence, and incremental milestone _IncrementalLoadSequences/v0.25.0_load_sequence.json; schema repo SHA 256fb1f2b0edab09cfe6bf2b6c50f35d5b1c5cfd
Closes #143M22 - Release 0.25Thomas Gehrmann [slb]Thomas Gehrmann [slb]https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/614Remove SNAPSHOT dependencies2023-12-08T23:57:34ZDavid Diederichd.diederich@opengroup.orgRemove SNAPSHOT dependenciesThis automated MR removes usage of `SNAPSHOT` versions in the first party library dependencies.
Since `SNAPSHOT` dependencies change frequently -- by their nature -- usage of them across projects is dangerous and should be avoided.
### ...This automated MR removes usage of `SNAPSHOT` versions in the first party library dependencies.
Since `SNAPSHOT` dependencies change frequently -- by their nature -- usage of them across projects is dangerous and should be avoided.
### Dependency Information Before the Upgrade
```
WARNING: The requested image's platform (linux/amd64) does not match the detected host platform (linux/arm64/v8) and no specific platform was requested
Branch: master
SHA: ae42aa8b2c987582906930dd43a4d8fad2e3d55c
Maven: 0.25.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| -------------------- | --------------- | --------------- |
| apd-core | 0.24.0-rc1 | |
| core-lib-azure | 0.24.0 | 0.24.0 |
| core-lib-gc | 0.24.0 | |
| core-plus-common-lib | 0.24.0-rc2 | |
| os-core-lib-aws | 0.25.0-SNAPSHOT | 0.25.0-SNAPSHOT |
| obm | 0.24.0 | |
| oqm | 0.24.0 | |
| os-core-common | 0.25.0-rc2 | 0.24.0 |
| os-core-lib-ibm | 0.24.0 | 0.24.0 |
| os-obm-core | 0.25.0-rc1 | |
| os-oqm-core | 0.25.0-rc1 | |
| os-osm-core | 0.25.0-rc2 | |
| osm | 0.24.0 | |
### Dependency Information After the Upgrade
```
WARNING: The requested image's platform (linux/amd64) does not match the detected host platform (linux/arm64/v8) and no specific platform was requested
Branch: snapshot-removal
SHA: bfa4983c5669fdf01f2276edaa0947e05e09d0e2
Maven: 0.25.0-SNAPSHOT
```
| Maven Dependencies | _Root_ | testing/ |
| -------------------- | ---------- | ---------- |
| apd-core | 0.24.0-rc1 | |
| core-lib-azure | 0.24.0 | 0.24.0 |
| core-lib-gc | 0.24.0 | |
| core-plus-common-lib | 0.24.0-rc2 | |
| os-core-lib-aws | 0.25.0-rc2 | 0.25.0-rc2 |
| obm | 0.24.0 | |
| oqm | 0.24.0 | |
| os-core-common | 0.25.0-rc2 | 0.24.0 |
| os-core-lib-ibm | 0.24.0 | 0.24.0 |
| os-obm-core | 0.25.0-rc1 | |
| os-oqm-core | 0.25.0-rc1 | |
| os-osm-core | 0.25.0-rc2 | |
| osm | 0.24.0 | |M22 - Release 0.25https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/613S360 Vulnerability Fix for Schema Service2023-12-08T10:43:42ZChahat KumarS360 Vulnerability Fix for Schema Servicehttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/611pull latest os-core-common version to schema-core-plus project2023-12-08T09:52:43ZSolomon Ayalewpull latest os-core-common version to schema-core-plus projectpull latest os-core-common to testing projectspull latest os-core-common to testing projectsM22 - Release 0.25https://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/612Update pom.xml to fix vulnerabilities2023-12-06T21:40:29ZVaibhavi KamaniUpdate pom.xml to fix vulnerabilitiesUpdate pom.xml to fix vulnerabilities.Update pom.xml to fix vulnerabilities.Vaibhavi KamaniVaibhavi Kamanihttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/610update os-core-lib-aws version2023-12-06T00:26:48ZYunhua Koglinupdate os-core-lib-aws versionM22 - Release 0.25Yunhua KoglinYunhua Koglinhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/607Update reactor-netty-http to latest version2023-11-29T22:58:15ZVaibhavi KamaniUpdate reactor-netty-http to latest versionUpdate reactor-netty-http to latest versionUpdate reactor-netty-http to latest versionVaibhavi KamaniVaibhavi Kamanihttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/605Fix vulnerabilities for schema repo2023-11-29T00:15:56ZVaibhavi KamaniFix vulnerabilities for schema repoFix vulnerabilities for schema repo as part of https://dev.azure.com/OpenEnergyPlatform/Open%20Energy%20Platform/_workitems/edit/31885Fix vulnerabilities for schema repo as part of https://dev.azure.com/OpenEnergyPlatform/Open%20Energy%20Platform/_workitems/edit/31885Vaibhavi KamaniVaibhavi Kamanihttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/606Update pom.xml2023-11-28T22:11:53ZYunhua KoglinUpdate pom.xmlM22 - Release 0.25Yunhua KoglinYunhua Koglinhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/600AWS - Merge from dev2023-11-27T19:30:07ZGuillaume CailletAWS - Merge from devAWS only changes.
* Add or update License header
* Add unit tests to AWS code
* Upgrade AWS core libAWS only changes.
* Add or update License header
* Add unit tests to AWS code
* Upgrade AWS core libM22 - Release 0.25Guillaume CailletGuillaume Caillethttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/591Fix content-type as application/json for system-schema api2023-11-27T12:57:48ZVidyaDharani LokamFix content-type as application/json for system-schema apiIssue Reference: https://community.opengroup.org/osdu/platform/pre-shipping/-/issues/521
- As discussed in the above issue received a response with 'application/json' Content-Type, but it is not declared in the schema for system-schema...Issue Reference: https://community.opengroup.org/osdu/platform/pre-shipping/-/issues/521
- As discussed in the above issue received a response with 'application/json' Content-Type, but it is not declared in the schema for system-schema api.
- In this MR we defined the content-type as 'application/json' in system-schema api for the respective api response.M22 - Release 0.25VidyaDharani LokamVidyaDharani Lokamhttps://community.opengroup.org/osdu/platform/system/schema-service/-/merge_requests/602Gonrg 7824 add healthcheck2023-11-24T14:33:49ZSiarhei Poliak [EPAM / GCP]Gonrg 7824 add healthcheckM22 - Release 0.25