Promote release 1.2.1 to main

.github/dependabot.yml

@@ -21,7 +21,7 @@ version: 2
 registries:
   secure-agents-lib:
     type: maven-repository
-    url: https://maven.pkg.github.com/National-Digital-Twin/secure-agents-lib
+    url: https://maven.pkg.github.com/National-Node-Net/secure-agents-lib
     username: dependabot
     password: ${{ secrets.GH_PACKAGES_PAT }}
 updates:

.github/workflows/auto-back-merge.yml

@@ -29,15 +29,15 @@ jobs:
 
       - name: Generate Sync Token
         id: sync-token
-        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
-          app-id: ${{ secrets.NDTP_REPOSITORY_WRITER_APP_CLIENT_ID }}
-          private-key: ${{ secrets.NDTP_REPOSITORY_WRITER_APP_PRIVATE_KEY }}
+          app-id: ${{ secrets.NODE_NET_REPOSITORY_WRITER_APP_CLIENT_ID }}
+          private-key: ${{ secrets.NODE_NET_REPOSITORY_WRITER_APP_PRIVATE_KEY }}
           permission-contents: write
           permission-workflows: write
 
       - name: Merge main into develop and Generate Summary
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ steps.sync-token.outputs.token }}
           script: |

.github/workflows/docker-ghcr.yml

@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
 
       - name: Login to ghcr.io
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -68,7 +68,7 @@ jobs:
         run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
       - name: Get server and client jars
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: federator-*.jar
           path: target
@@ -89,6 +89,7 @@ jobs:
           exit-code: "1"
           ignore-unfixed: true
           severity: "CRITICAL,HIGH"
+          trivyignores: .trivyignore
         continue-on-error: true
 
       - name: Tag Server Image with tag(s) ${{ inputs.image_tag }}
@@ -113,6 +114,7 @@ jobs:
           exit-code: "1"
           ignore-unfixed: true
           severity: "CRITICAL,HIGH"
+          trivyignores: .trivyignore
         continue-on-error: true
 
       - name: Tag Client Image with tag(s) ${{ inputs.image_tag }}

.github/workflows/maven.yml

@@ -57,8 +57,8 @@ jobs:
       - name: Code Coverage
         env:
           GH_PACKAGES_PAT: ${{ secrets.GH_PACKAGES_PAT }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./mvnw $MAVEN_CLI_OPTS verify -Dsonar.projectKey=National-Digital-Twin_federator2 -Dsonar.organization=national-digital-twin -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_N3 }}
+        run: ./mvnw $MAVEN_CLI_OPTS verify -Dsonar.projectKey=National-Node-Net_federator -Dsonar.organization=national-node-net -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
       - name: Verify JaCoCo XML exists
         run: ls -l target/site/jacoco/jacoco.xml
   lint:
@@ -102,7 +102,7 @@ jobs:
         uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
 
       - name: Login to ghcr.io
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -112,7 +112,7 @@ jobs:
         run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
       - name: Get server and client jars
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: federator-*.jar
           path: target
@@ -136,6 +136,7 @@ jobs:
           exit-code: 1
           ignore-unfixed: true
           severity: "CRITICAL,HIGH"
+          trivyignores: .trivyignore
         continue-on-error: false
 
       - name: Build Client Image
@@ -151,6 +152,7 @@ jobs:
           exit-code: 1
           ignore-unfixed: true
           severity: "CRITICAL,HIGH"
+          trivyignores: .trivyignore
         continue-on-error: false
 
       - name: Clean up docker image

.github/workflows/oss-checker.yml

@@ -29,42 +29,42 @@ jobs:
     steps:
       - name: Fetch GitHub App token for target repo
         id: target_token
-        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           app-id: ${{ secrets.OSPO_WORKFLOW_APP_ID }}
           private-key: ${{ secrets.OSPO_WORKFLOW_PRIVATE_KEY }}
           permission-contents: read
 
       - name: Fetch GitHub App token for OSPO source repo (read-only)
         id: ospo_token
-        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           app-id: ${{ secrets.OSPO_WORKFLOW_APP_ID }}
           private-key: ${{ secrets.OSPO_WORKFLOW_PRIVATE_KEY }}
-          owner: National-Digital-Twin
+          owner: National-Node-Net
           repositories: ospo-resources
           permission-contents: read
 
       - name: Checkout target repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           token: ${{ steps.target_token.outputs.token }}
 
       - name: Checkout OSPO source repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
-          repository: National-Digital-Twin/ospo-resources
+          repository: National-Node-Net/ospo-resources
           path: ospo-resources
           token: ${{ steps.ospo_token.outputs.token }}
 
       - name: Checkout archetypes source repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
-          repository: National-Digital-Twin/archetypes
+          repository: National-Node-Net/archetypes
           path: archetypes
 
       - name: Fetch Repository Metadata
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
         with:
@@ -135,7 +135,7 @@ jobs:
             --output json > policy-report.json || true
 
       - name: Process Policy Results
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
              const { existsSync, readFileSync, writeFileSync } = require('fs');
@@ -202,7 +202,7 @@ jobs:
              }
 
       - name: Test for presence of OSS files and variation from templated content
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         if: success() || failure()
         with:
           script: |
@@ -301,7 +301,7 @@ jobs:
             }
 
       - name: Check GitHub template files are present
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         if: success() || failure()
         with:
           script: |
@@ -372,7 +372,7 @@ jobs:
       - name: Generate summary
         id: summarise_results
         if: always()
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const { existsSync, readFileSync } = require('fs');
@@ -466,7 +466,7 @@ jobs:
 
       - name: Upload OSS result artifacts
         if: ${{ steps.summarise_results.outputs.hasResults == 'true' }}
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: oss-checks-${{ github.run_id }}
           retention-days: 30
@@ -489,7 +489,7 @@ jobs:
 
     steps:
       - name: Comment with OSS summary
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           SUMMARY_TABLE: ${{ needs.oss-checks.outputs.summary-table }}
           JOB_RESULT: ${{ needs.oss-checks.result }}

.github/workflows/publish-github-release.yml

@@ -73,7 +73,7 @@ jobs:
     needs: [versioning]
     steps:
       - name: Checkout Code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Generate SPDX SBOM
         env:
@@ -91,7 +91,7 @@ jobs:
           echo "$api_response" | jq '.sbom' > sbom.spdx.json
 
       - name: Upload SBOM Artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: sbom
           path: sbom.spdx.json
@@ -105,7 +105,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
 
@@ -135,7 +135,7 @@ jobs:
           name: sbom
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
+        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
         with:
           tag_name: "v${{ needs.versioning.outputs.version }}"
           name: "Release v${{ needs.versioning.outputs.version }}"

.github/workflows/release.yaml

@@ -67,14 +67,14 @@ jobs:
         env:
           GH_PACKAGES_PAT: ${{ secrets.GH_PACKAGES_PAT }}
         run: ./mvnw $MAVEN_CLI_OPTS package
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         name: Persist server
         id: persist-server
         with:
           name: federator-server-${{ steps.get-version.outputs.project_version }}.jar
           path: target/federator-server-${{ steps.get-version.outputs.project_version }}.jar
           retention-days: 1
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         name: Persist client
         with:
           name: federator-client-${{ steps.get-version.outputs.project_version }}.jar
@@ -141,11 +141,11 @@ jobs:
       - verify
     if: ${{ needs.verify.result == 'success' }}
     steps:
-      - uses: geekyeggo/delete-artifact@f275313e70c08f6120db482d7a6b98377786765b # v5.1.0
+      - uses: geekyeggo/delete-artifact@176a747ab7e287e3ff4787bf8a148716375ca118 # v6.0.0
         name: Delete server artifact
         with:
           name: federator-server-${{ needs.verify.outputs.project_version }}.jar
-      - uses: geekyeggo/delete-artifact@f275313e70c08f6120db482d7a6b98377786765b # v5.1.0
+      - uses: geekyeggo/delete-artifact@176a747ab7e287e3ff4787bf8a148716375ca118 # v6.0.0
         name: Delete client artifact
         with:
           name: federator-client-${{ needs.verify.outputs.project_version }}.jar

.trivyignore

@@ -0,0 +1,15 @@
+CVE-2026-54512
+CVE-2026-54513
+CVE-2026-42583
+CVE-2026-33870
+CVE-2026-42584
+CVE-2026-42587
+CVE-2026-33871
+CVE-2026-44249
+CVE-2026-45416
+CVE-2026-50010
+CVE-2026-25681
+CVE-2026-27136
+CVE-2026-33814
+CVE-2026-39821
+CVE-2026-39822

ACKNOWLEDGEMENTS.md

@@ -21,7 +21,7 @@ We are grateful for the collaboration that has helped shape this repository.
 
 ## Individual contributions
 
-For a list of individual contributors who have made direct commits to this repository, see GitHub’s auto-generated contributor insights: [Contributors](https://github.com/National-Digital-Twin/federator/graphs/contributors).
+For a list of individual contributors who have made direct commits to this repository, see GitHub’s auto-generated contributor insights: [Contributors](https://github.com/National-Node-Net/federator/graphs/contributors).
 
 ---  
 

CHANGELOG.md

@@ -7,6 +7,13 @@
 
 --- 
 
+## 1.2.1 - 2026-07-16
+
+### Changed
+
+- Alignment of GitHub actions to new organisation.
+
+
 All notable changes to this repository will be documented in this file.
 
 This project follows **Semantic Versioning (SemVer)** ([semver.org](https://semver.org/)), using the format:

CONTRIBUTING.md

@@ -16,7 +16,7 @@ NDTP follows an **open-source governance model** where all code is **publicly av
 partners**. Contributions from the general public are not currently accepted, but **feedback, issue reporting, and documentation suggestions are encouraged**.
 
 If you want to see which suppliers and organisations have contributed to this repository in the past, refer to [ACKNOWLEDGEMENTS.md](ACKNOWLEDGEMENTS.md) and the GitHub
-contributor insights page at [Contributors](https://github.com/National-Digital-Twin/federator/graphs/contributors).
+contributor insights page at [Contributors](https://github.com/National-Node-Net/federator/graphs/contributors).
 
 ---
 
@@ -40,7 +40,7 @@ For details on repository maintainers and how to contact them, refer to [MAINTAI
 
 If you encounter a bug, error, or inconsistency, please follow these steps:
 
-1. Check for an existing issue under [Issues](https://github.com/National-Digital-Twin/federator/issues).
+1. Check for an existing issue under [Issues](https://github.com/National-Node-Net/federator/issues).
 2. Open a new issue if no one has reported it yet. Use one of the provided issue templates.
 3. Provide a clear, detailed description of the issue, including steps to reproduce it if applicable.
 4. Label the issue appropriately (bug, documentation, enhancement, etc.).
@@ -67,7 +67,7 @@ We prioritise documentation updates based on user impact and alignment with prog
 - **Development is led by approved suppliers and partners** who have been engaged through a formal process.
 - **We welcome feedback and ideas**, but implementation is subject to programme priorities.
 
-To see what we’re working on, check out our [Project Roadmap](https://github.com/National-Digital-Twin/federator/projects). If no roadmap is currently available, please note that it is being actively developed and will be published in due course.
+To see what we’re working on, check out our [Project Roadmap](https://github.com/National-Node-Net/federator/projects). If no roadmap is currently available, please note that it is being actively developed and will be published in due course.
 
 ---
 

README.md

@@ -13,15 +13,15 @@ This repository contributes to the development of **secure, scalable, and intero
 
 This repository is one of several open-source components that underpin NDTP’s **Integration Architecture (IA)**—a framework designed to allow organisations to manage and exchange data securely while maintaining control over their own information. The IA is actively deployed and tested across multiple sectors, ensuring its adaptability and alignment with real-world needs.
 
-For a complete overview of the Integration Architecture (IA) project, please see the [Integration Architecture Documentation](https://github.com/National-Digital-Twin/integration-architecture-documentation).
+For a complete overview of the Integration Architecture (IA) project, please see the [Integration Architecture Documentation](https://github.com/National-Node-Net/integration-architecture-documentation).
 
 ## Prerequisites
 
 * Java 21
 * This repo uses a maven wrapper so no installation of maven is required.
 * [Docker](https://www.docker.com/)
 * [Git](https://git-scm.com/)
-* [Management-node](https://github.com/National-Digital-Twin/management-node/)
+* [Management-node](https://github.com/National-Node-Net/management-node/)
 
 ## Quick Start
 
@@ -32,7 +32,7 @@ Follow these steps to get started quickly with this repository. For detailed ins
 To download from the github repository run the following commands:
 
 ```shell
-git clone https://github.com/National-Digital-Twin/federator.git
+git clone https://github.com/National-Node-Net/federator.git
 cd federator  
 ```
 

docker/Dockerfile.client

@@ -23,7 +23,7 @@
 
 FROM eclipse-temurin:21 AS federator
 
-LABEL org.opencontainers.image.source=https://github.com/National-Digital-Twin/federator
+LABEL org.opencontainers.image.source=https://github.com/National-Node-Net/federator
 
 RUN mkdir -p /library/ /app/ && \
 	groupadd appgroup && \

docker/Dockerfile.server

@@ -23,7 +23,7 @@
 
 FROM eclipse-temurin:21 AS federator
 
-LABEL org.opencontainers.image.source=https://github.com/National-Digital-Twin/federator
+LABEL org.opencontainers.image.source=https://github.com/National-Node-Net/federator
 
 RUN mkdir -p /library/ /app/ && \
 	groupadd appgroup && \