Merge pull request #8225 from mandy-chessell/oak2024

Fix merge workflow

.github/ISSUE_TEMPLATE/release.yml

@@ -20,13 +20,14 @@ body:
         - [ ] Slack post advising of upcoming release & linking to issue
         - [ ] Advance warning in developer/community call
         - [ ] Final agreement to start branch in team call & identification of outstanding issues
-        - [ ] Agree required updates/versions for additional repos including egeria-ui, egeria-reactui, connectors etc
+        - [ ] Agree required updates/versions for additional connector repos etc
 
         Branching & Correcting versions
         - [ ] Create branch (egeria-release-x.y)
         - [ ] Reassign any issues not being worked on to the next release
         - [ ] Update version for main (ie x.y-SNAPSHOT > x.y+1-SNAPSHOT)
         - [ ] Update version for release branch (ie x.y-SNAPSHOT -> x.y)
+        
 
         Final updates to the release
         - [ ] Ensure any remaining fixes are merged into branch (and vice-versa to main)
@@ -35,11 +36,11 @@ body:
         - [ ] Check security scans (ie owasp dependency check)
 
         Generate a release image for testing
-        - [ ] Start [Release](https://github.com/odpi/egeria/actions/workflows/release.yml) pipeline manually to generate container image and stage artifacts on maven central
+        - [ ] Start [Release](https://github.com/odpi/egeria/actions/workflows/release-v5.yml) pipeline manually to generate container image and stage artifacts on maven central.  Remember to select the release branch rather than `main`.
 
 
         Updating the Helm Charts (egeria-charts repo)
-        - [ ] checker correct container images are on [docker.io](https://hub.docker.com/u/odpi) & [quay.io](https://quay.io/organization/odpi) (these are built by the 'merge' build of a release)
+        - [ ] check correct container images are on [docker.io](https://hub.docker.com/u/odpi) & [quay.io](https://quay.io/organization/odpi) (these are built by the 'merge' build of a release)
         - [ ] update image versions for helm charts [egeria-charts](https://github.com/odpi/egeria-charts/) repo (using -prerelease for chart version)
           - check/update the [strimzi chart versions](https://github.com/strimzi/strimzi-kafka-operator/releases)
           - check/update supported kafka version used for the strimzi CR in each chart
@@ -53,7 +54,7 @@ body:
         - [ ] Verify egeria-base chart (pods active/ready)
         - [ ] Check notebooks (config, start, data catalog at a minimum)
         - [ ] Check Egeria UI (only possible to check it runs and run UI lab)
-        - [ ] Check React UI (rex, tex, glossary author). Some of the steps descibed [here](https://egeria-project.org/education/egeria-dojo/running-egeria/user-interfaces/ecosystem-ui/ecosystem-ui-start/)
+        - [ ] Check React UI (rex, tex, glossary author). Some of the steps described [here](https://egeria-project.org/education/egeria-dojo/running-egeria/user-interfaces/ecosystem-ui/ecosystem-ui-start/)
         - [ ] Check and validate [CTS results](https://egeria-project.org/guides/operations/kubernetes/charts/cts/)
           - CTS using in-memory
           - CTS using graph
@@ -63,14 +64,14 @@ body:
         - [ ] Update release notes in [egeria-docs](https://github.com/odpi/egeria-docs/tree/main/site/docs/release-notes)
 
         Final build and publish
-        - [ ] Check if the Release pipeline rlease artifacts are shown in staging repo in [OSS Repository Manager](https://oss.sonatype.org/#welcome)
+        - [ ] Check if the Release pipeline release artifacts are shown in staging repo in [OSS Repository Manager](https://oss.sonatype.org/#welcome)
         - [ ] Close staging repo & validate artifacts ok (number, structure, validations) on oss.sonatype.org 
         - [ ] Check 'release' repo on oss.sonatype.org has artifacts
-        - [ ] Release the repo (takes time for the operation to complete and for the arifacts to be visible in maven central repository)
+        - [ ] Release the repo (takes time for the operation to complete and for the artifacts to be visible in maven central repository)
         - [ ] Create final [github release](https://github.com/odpi/egeria/releases) (add link to egeria docs)
         - [ ] Update final versions of egeria-charts to release ie x.y
         - [ ] Publish that release is now shipped via slack #egeria-announce
-        - [ ] Post on egeria-annouce [mailing list](egeria-announce@lists.lfaidata.foundation)
+        - [ ] Post on egeria-announce [mailing list](egeria-announce@lists.lfaidata.foundation)
         - [ ] Additional posts to social media
         - [ ] Communicate to other repo owners ie for connectors so that they can be rebuilt/shipped as needed (Egeria Dev Projects etc.)
 

.github/workflows/merge-v5.yml

@@ -95,15 +95,15 @@ jobs:
         with:
           push: true
           tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:latest, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:latest
-          context: ./open-metadata-deployment/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
+          context: ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
           platforms: linux/amd64,linux/arm64
       - name: Build and push(egeria) to quay.io and docker.io (no tag latest)
         if: ${{ github.ref != 'refs/heads/main'}}
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:${{ env.VERSION }}
-          context: ./open-metadata-deployment/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
+          context: ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
           platforms: linux/amd64,linux/arm64
       # Publish container images(egeria-configure) to quay.io and docker.io
       - name: Build and push(egeria-configure) to quay.io and docker.io (tag latest)

.github/workflows/release-v5.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           push: true
           tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:stable, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:stable
-          context: ./open-metadata-deployment/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
+          context: ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
           platforms: linux/amd64,linux/arm64
       # Publish container images(egeria-configure) to quay.io and docker.io
       - name: Build and push(egeria-configure) to quay.io and docker.io

open-metadata-distribution/README.md

@@ -3,11 +3,7 @@
 
 # Open Metadata Distribution
 
-This module collects together the Egeria artifacts for different scenarios.  This includes:
-
-* The **[OMAG Server Platform Assembly](omag-server-platform)** assembles the libraries and files for the OMAG Server Platform plus optional resources for use with the platform.
-* The **[Egeria UI Application](egeria-ui-application)** contains the runtime for the Egeria's General User UI backend services.
-* The **[Open Metadata Assembly](open-metadata-assemblies)** provides a combination of the OMAG Server Platform and the Egeria UI Application.  This is a legacy and is being replaced with the more specialized assemblies described above.
+The **[OMAG Server Platform Assembly](omag-server-platform)** assembles the libraries and files for the OMAG Server Platform plus optional resources for use with the platform.
 
 
 

open-metadata-distribution/omag-server-platform/docs/docker-build/README.md

@@ -32,7 +32,7 @@ found under the images managed by that daemon.  For example, if you are using
 [Docker Desktop](https://www.docker.com/products/docker-desktop/),
 the docker image is located in the **Images** tab.
 
-To run the resulting image from the command line, use `docker run -p 9443:9443  odpi/egeria-platform:{tagName}`, again replacing `{tagName}` with your chosen tag.
+To run the resulting image from the command line, use `docker run -p 9443:9443 -p 9092:9092 odpi/egeria-platform:{tagName}`, again replacing `{tagName}` with your chosen tag.