diff --git a/.github/workflows/auto-back-merge.yml b/.github/workflows/auto-back-merge.yml
index 37a2b99..111d548 100644
--- a/.github/workflows/auto-back-merge.yml
+++ b/.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: |
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 135f8ff..36c84c2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -61,8 +61,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_management-node -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_management-node -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:
diff --git a/.github/workflows/oss-checker.yml b/.github/workflows/oss-checker.yml
index 80ec1a2..dc6e45f 100644
--- a/.github/workflows/oss-checker.yml
+++ b/.github/workflows/oss-checker.yml
@@ -29,7 +29,7 @@ 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 }}
@@ -37,34 +37,34 @@ jobs:
- 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 }}
diff --git a/.github/workflows/publish-github-release.yml b/.github/workflows/publish-github-release.yml
index f68b86e..3f32ba1 100644
--- a/.github/workflows/publish-github-release.yml
+++ b/.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 }}"
diff --git a/.trivyignore b/.trivyignore
index b068e71..22aa3a3 100644
--- a/.trivyignore
+++ b/.trivyignore
@@ -5,4 +5,10 @@ CVE-2026-32767
# libpng: LIBPNG has a heap buffer.
CVE-2026-25646
# zlib: Arbitrary code execution via buffer overflow
-CVE-2026-22184
\ No newline at end of file
+CVE-2026-22184
+# libexpat
+CVE-2026-56131
+CVE-2026-56407
+CVE-2026-56408
+# p11-kit and p11-kit-trust
+CVE-2026-2100
\ No newline at end of file
diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index a510a81..2de6d49 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -17,7 +17,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/your-repo/graphs/contributors).
+GitHub’s auto-generated contributor insights: [Contributors](https://github.com/National-Node-Net/your-repo/graphs/contributors).
---
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5373003..d89e112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,13 @@ This project follows **Semantic Versioning (SemVer)** ([semver.org](https://semv
---
+## [1.2.1] - 2026-07-16
+
+### Changed
+
+- Alignment of GitHub actions to new organisation.
+
+
## [1.2.0] - 2026-03-26
### Added
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e82223c..4b62b4c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ government and their suppliers.
NDTP follows an **open-source governance model** where all code is **publicly available** under open-source licences, and collaboration is invited from **approved
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/your-repo/graphs/contributors).
+contributor insights page at [Contributors](https://github.com/National-Node-Net/your-repo/graphs/contributors).
---
@@ -28,7 +28,7 @@ Public users and NDTP partners are encouraged to engage in the following ways:
---
## Reporting Issues
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/management-node/issues).
+1. Check for an existing issue under [Issues](https://github.com/National-Node-Net/management-node/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.).
@@ -45,7 +45,7 @@ If you find an error in the documentation, need more clarity, or have suggestion
- **All NDTP code is publicly available under open-source licences.**
- **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/management-node/projects). If no roadmap is currently available,
+ To see what we’re working on, check out our [Project Roadmap](https://github.com/National-Node-Net/management-node/projects). If no roadmap is currently available,
please note that it is being actively developed and will be published in due course.
---
## Branching Strategy
diff --git a/docker/keycloak/tofu/README.md b/docker/keycloak/tofu/README.md
index 0670cd3..6fdba55 100644
--- a/docker/keycloak/tofu/README.md
+++ b/docker/keycloak/tofu/README.md
@@ -252,4 +252,4 @@ Notes for local usage:
---
## Contributors
-Thanks to all contributors of this repository: https://github.com/National-Digital-Twin/management-node/graphs/contributors
+Thanks to all contributors of this repository: https://github.com/National-Node-Net/management-node/graphs/contributors
diff --git a/mkdocs.yml b/mkdocs.yml
index 47e6f0c..14b6592 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -2,7 +2,7 @@ site_name: Management-Node Documentation
site_description: Management Node is is the control plane for the National Digital Twin Programme IA Node Net.
site_author: NDTP
site_url: https://docs.ndtp.co.uk/
-#repo_url: https://github.com/National-Digital-Twin/federator
+#repo_url: https://github.com/National-Node-Net/management-node
edit_uri: edit/main/docs/
nav: []
theme:
diff --git a/pom.xml b/pom.xml
index 18fb886..a296f32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.5.11
+ 3.5.16
uk.gov.dbt.ndtp.ia.management.node
@@ -18,7 +18,7 @@
jar
management-node
Provides Management capabilities over IA Node Net
- https://github.com/National-Digital-Twin/management-node
+ https://github.com/National-Node-Net/management-node
Apache-2.0
@@ -37,16 +37,16 @@
- scm:git:git@github.com:National-Digital-Twin/management-node.git
- scm:git:git@github.com:National-Digital-Twin/management-node.git
- https://github.com/National-Digital-Twin/management-node
+ scm:git:git@github.com:National-Node-Net/management-node.git
+ scm:git:git@github.com:National-Node-Net/management-node.git
+ https://github.com/National-Node-Net/management-node
21
UTF-8
2025.0.0
- 2.21.1
- 42.7.7
+ 2.21.4
+ 42.7.11
11.10.4
2.46.1
2.11.0
@@ -56,7 +56,7 @@
3.2.0
5.10.0
2.8.13
- 1.83
+ 1.84
6.5.9
**/config/**,
**/dto/**,
diff --git a/repository-configuration/variables.tf b/repository-configuration/variables.tf
index 50fcc03..96a7b30 100644
--- a/repository-configuration/variables.tf
+++ b/repository-configuration/variables.tf
@@ -7,7 +7,7 @@ variable "token" {
variable "organisation" {
description = "The GitHub organisation name."
type = string
- default = "National-Digital-Twin"
+ default = "National-Node-Net"
}
variable "repository_description" {
diff --git a/sonar-project.properties b/sonar-project.properties
index 2d780d8..ca97e54 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,3 +1,3 @@
-sonar.projectKey=National-Digital-Twin_management-node
-sonar.organization=national-digital-twin
+sonar.projectKey=National-Node-Net_management-node
+sonar.organization=national-node-net
sonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
\ No newline at end of file