Merge branch 'main' into dependabot/docker/open-metadata-resources/op…

…en-metadata-deployment/docker/configure/library/alpine-3.20.0

.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

@@ -84,26 +84,27 @@ jobs:
       - name: Set Release version env variable
         run: |
           echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
-      # Publish container images(egeria) to quay.io and docker.io
+      # Publish container images(egeria-platform) to quay.io and docker.io
       - name: Copy the distribution content to be used in docker copy command
         run: |
-          cp -f release.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
-          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data
+          cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
+          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
       - name: Build and push(egeria) to quay.io and docker.io (tag latest only for main!)
         if: ${{ github.ref == 'refs/heads/main'}}
         uses: docker/build-push-action@v5
         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
+          tags: odpi/egeria-platform:${{ env.VERSION }}, odpi/egeria-platform:latest, quay.io/odpi/egeria-platform:${{ env.VERSION }}, quay.io/odpi/egeria-platform:latest
+          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)
+      - name: Build and push(egeria-platform) 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
+          tags: odpi/egeria-platform:${{ env.VERSION }}, quay.io/odpi/egeria-platform:${{ env.VERSION }}
+          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

@@ -66,17 +66,18 @@ jobs:
       - name: Set Release version env variable
         run: |
           echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
-      # Publish container images(egeria) to quay.io and docker.io
+      # Publish container images(egeria-platform) to quay.io and docker.io
       - name: Copy the distribution content to be used in docker copy command
         run: |
-          cp -f release.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
-          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data
-      - name: Build and push(egeria) to quay.io and docker.io
+          cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
+          cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
+      - name: Build and push(egeria-platform) to quay.io and docker.io
         uses: docker/build-push-action@v5
         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
+          tags: odpi/egeria-platform:${{ env.VERSION }}, odpi/egeria-platform:stable, quay.io/odpi/egeria-platform:${{ env.VERSION }}, quay.io/odpi/egeria-platform:stable
+          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

.github/workflows/scorecards.yml

@@ -35,7 +35,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031  # tag=v2.2.0
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534  # tag=v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif

application.properties

@@ -59,7 +59,8 @@ server.port=9443
 ################################################
 platform.placeholder.variables=\
   {\
-    "kafkaEndpoint" : "localhost:9092"\
+    "kafkaEndpoint" : "localhost:9092",\
+    "egeriaEndpoint" : "https://localhost:9443"\
   }
 
 ################################################

bom/build.gradle

@@ -43,15 +43,15 @@ ext {
     gremlinVersion = '3.5.6'
     // TODO: Version 4 under new package name. 3.0.13 is held to be compat with gradle tests (fvt)
     groovyVersion = '3.0.15'
-    guavaVersion = '33.0.0-jre'
+    guavaVersion = '33.2.1-jre'
     hamcrestVersion = '2.2'
     hdrhistogramVersion = '2.1.12'
     hibernatevalidatorVersion = '8.0.1.Final'
     // TODO There is now a version 5 codestream of the next 2 http dependencies
     httpclientVersion = '4.5.14'
     httpcoreVersion = '4.4.16'
     jacksonVersion = '2.15.0'
-    jacksonDatabindVersion = '2.16.1'
+    jacksonDatabindVersion = '2.17.1'
     jacksonaslVersion = '1.9.14-atlassian-6'
     jakartaannotationVersion = '2.1.1'
     jakartapersistenceVersion = '3.1.0'
@@ -81,7 +81,7 @@ ext {
     mockitoVersion = '4.11.0'
     plexusVersion = '4.0.0'
     postgresVersion = '42.7.2'
-    nettyVersion = '4.1.107.Final'
+    nettyVersion = '4.1.111.Final'
     prometheusVersion = '1.12.4'
     quartzVersion = '2.3.2'
     reflectionsVersion = '0.10.2'
@@ -102,7 +102,7 @@ ext {
     swaggerVersion = '2.2.22'
     thriftVersion = '0.19.0'
     springwebVersion = '6.0.6'
-    tinkVersion = '1.12.0'
+    tinkVersion = '1.13.0'
     tomcatVersion = '10.1.13'
     validationVersion = '2.0.1.Final'
     gsonVersion = '2.10.1'
@@ -112,7 +112,7 @@ ext {
     protobufVersion = '3.25.3'
     osgiVersion = '8.0.0'
     log4jVersion = '2.23.1'
-    jacksonjdk8Version = '2.16.1'
+    jacksonjdk8Version = '2.17.1'
     reactivestreamsVersion = '1.0.4'
     springdocStarterVersion = '2.2.0'
     jacocoVersion = '0.8.8'

release.application.properties → container.application.properties

@@ -59,7 +59,8 @@ platform.security.name=Coco Pharmaceuticals Platform
 ################################################
 platform.placeholder.variables=\
   {\
-    "kafkaEndpoint" : "localhost:9092"\
+    "kafkaEndpoint" : "host.docker.internal:9092",\
+    "egeriaEndpoint" : "https://host.docker.internal:9443"\
   }
 
 ################################################
@@ -88,7 +89,7 @@ server.ssl.trust-store-password=egeria
 # certificates from the servers it is calling.
 # Alternate you can import self-signed certificates into java truststore or set up a truststore only for this app
 # by adding the store into server.ssl.trust-store parameter
-strict.ssl=true
+strict.ssl=false
 
 
 ################################################