Update swift. Update plugins to get .Net 10 and swift 6.2 support. (#2314)

prabhu · web-flow · commit 6e85396ce19b · 2025-09-17T15:00:45.000+01:00
Update swift. Update dosai to get .Net 10 and swift 6.2 support.

Signed-off-by: Prabhu Subramanian &lt;prabhu@appthreat.com&gt;
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -2,11 +2,11 @@ FROM ghcr.io/cyclonedx/cdxgen-ruby-builder:master AS base
 
 ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubi9
-ARG SWIFT_BRANCH=swift-6.1.2-release
-ARG SWIFT_VERSION=swift-6.1.2-RELEASE
+ARG SWIFT_BRANCH=swift-6.2-release
+ARG SWIFT_VERSION=swift-6.2-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 ARG JAVA_VERSION=24.0.2-tem
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG MAVEN_VERSION=3.9.11
 ARG GRADLE_VERSION=8.14.3
 ARG GO_VERSION=1.25.0
diff --git a/ci/Dockerfile-bun b/ci/Dockerfile-bun
@@ -13,11 +13,11 @@ LABEL maintainer="cyclonedx" \
 
 ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubi9
-ARG SWIFT_BRANCH=swift-6.1.2-release
-ARG SWIFT_VERSION=swift-6.1.2-RELEASE
+ARG SWIFT_BRANCH=swift-6.2-release
+ARG SWIFT_VERSION=swift-6.2-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 ARG JAVA_VERSION=24.0.2-tem
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG MAVEN_VERSION=3.9.11
 ARG GRADLE_VERSION=8.14.3
 ARG GO_VERSION=1.25.0
diff --git a/ci/Dockerfile-deno b/ci/Dockerfile-deno
@@ -13,11 +13,11 @@ LABEL maintainer="cyclonedx" \
 
 ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubi9
-ARG SWIFT_BRANCH=swift-6.1.2-release
-ARG SWIFT_VERSION=swift-6.1.2-RELEASE
+ARG SWIFT_BRANCH=swift-6.2-release
+ARG SWIFT_VERSION=swift-6.2-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 ARG JAVA_VERSION=24.0.2-tem
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG MAVEN_VERSION=3.9.11
 ARG GRADLE_VERSION=8.14.3
 ARG GO_VERSION=1.25.0
diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64
@@ -11,7 +11,7 @@ LABEL maintainer="cyclonedx" \
       org.opencontainers.image.description="Container image for cdxgen SBOM generator" \
       org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-ppc64 -r /app --server"
 
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG MAVEN_VERSION=3.9.11
 ARG GRADLE_VERSION=8.14.3
 ARG GO_VERSION=1.25.0
diff --git a/ci/images/Dockerfile.java17 b/ci/images/Dockerfile.java17
@@ -7,7 +7,7 @@ ARG MAVEN_VERSION=3.9.11
 ARG NODEJS_DIST_URL
 ARG NPM_REPO
 ARG PIP_CONFIG
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG SCALA_VERSION=3.6.4
 ARG SDKMAN_URL=https://api.sdkman.io/2
 ARG SUSE_REPO
diff --git a/ci/images/Dockerfile.java17-slim b/ci/images/Dockerfile.java17-slim
@@ -7,7 +7,7 @@ ARG MAVEN_VERSION=3.9.11
 ARG NODEJS_DIST_URL
 ARG NPM_REPO
 ARG PIP_CONFIG
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG SDKMAN_URL=https://api.sdkman.io/2
 ARG SUSE_REPO
 
diff --git a/ci/images/debian/Dockerfile.swift6 b/ci/images/debian/Dockerfile.swift6
@@ -8,11 +8,11 @@ ARG NODE_VERSION=22.19.0
 ARG NODEJS_DIST_URL
 ARG NPM_REPO
 ARG PIP_CONFIG
-ARG SWIFT_BRANCH=swift-6.1.2-release
+ARG SWIFT_BRANCH=swift-6.2-release
 ARG SWIFT_PLATFORM=debian12
 ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_URL=https://download.swift.org
-ARG SWIFT_VERSION=swift-6.1.2-RELEASE
+ARG SWIFT_VERSION=swift-6.2-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV NVM_DIR="/root/.nvm" \
diff --git a/ci/images/temurin/Dockerfile.java21 b/ci/images/temurin/Dockerfile.java21
@@ -10,7 +10,7 @@ ARG NPM_REPO
 ARG PIP_CONFIG
 ARG PYTHON_VERSION=3.12
 ARG REDHAT_REPO
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG SCALA_VERSION=3.7.2
 ARG SDKMAN_URL=https://api.sdkman.io/2
 
diff --git a/ci/images/temurin/Dockerfile.java24 b/ci/images/temurin/Dockerfile.java24
@@ -10,7 +10,7 @@ ARG NPM_REPO
 ARG PIP_CONFIG
 ARG PYTHON_VERSION=3.12
 ARG REDHAT_REPO
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG SCALA_VERSION=3.7.2
 ARG SDKMAN_URL=https://api.sdkman.io/2
 
diff --git a/ci/images/temurin/Dockerfile.java8 b/ci/images/temurin/Dockerfile.java8
@@ -10,7 +10,7 @@ ARG NPM_REPO
 ARG PIP_CONFIG
 ARG PYTHON_VERSION=3.12
 ARG REDHAT_REPO
-ARG SBT_VERSION=1.11.5
+ARG SBT_VERSION=1.11.6
 ARG SDKMAN_URL=https://api.sdkman.io/2
 
 ENV CDXGEN_IN_CONTAINER=true \
diff --git a/contrib/cloud-init.txt b/contrib/cloud-init.txt
@@ -144,8 +144,8 @@ runcmd:
   - sed -i '$a AllowUsers ubuntu' /etc/ssh/sshd_config
   - export SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
   - export SWIFT_PLATFORM=ubuntu24.04
-  - export SWIFT_BRANCH=swift-6.1.2-release
-  - export SWIFT_VERSION=swift-6.1.2-RELEASE
+  - export SWIFT_BRANCH=swift-6.2-release
+  - export SWIFT_VERSION=swift-6.2-RELEASE
   - export SWIFT_WEBROOT=https://download.swift.org
   - export OS_ARCH_SUFFIX='-aarch64'
   - export SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX"
diff --git a/contrib/lima/cdxgen-opensuse.yaml b/contrib/lima/cdxgen-opensuse.yaml
@@ -50,7 +50,7 @@ provision:
     #!/bin/bash
     set -e -o pipefail
     export MAVEN_VERSION=3.9.11
-    export SBT_VERSION=1.11.5
+    export SBT_VERSION=1.11.6
     export GRADLE_VERSION=8.14
     export MAVEN_HOME="/.sdkman/candidates/maven/${MAVEN_VERSION}"
     export GRADLE_HOME="/.sdkman/candidates/gradle/${GRADLE_VERSION}"
diff --git a/contrib/lima/cdxgen-ubuntu.yaml b/contrib/lima/cdxgen-ubuntu.yaml
@@ -53,7 +53,7 @@ provision:
     #!/bin/bash
     set -e -o pipefail
     export MAVEN_VERSION=3.9.11
-    export SBT_VERSION=1.11.5
+    export SBT_VERSION=1.11.6
     export GRADLE_VERSION=8.14
     export MAVEN_HOME="/.sdkman/candidates/maven/${MAVEN_VERSION}"
     export GRADLE_HOME="/.sdkman/candidates/gradle/${GRADLE_VERSION}"
@@ -79,8 +79,8 @@ provision:
     cdxgen --version
     export SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
     export SWIFT_PLATFORM=ubuntu24.04
-    export SWIFT_BRANCH=swift-6.1.2-release
-    export SWIFT_VERSION=swift-6.1.2-RELEASE
+    export SWIFT_BRANCH=swift-6.2-release
+    export SWIFT_VERSION=swift-6.2-RELEASE
     export SWIFT_WEBROOT=https://download.swift.org
     export OS_ARCH_SUFFIX='-aarch64'
     export SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX"
diff --git a/lib/managers/binary.js b/lib/managers/binary.js
@@ -65,7 +65,7 @@ switch (arch) {
 }
 
 // cdxgen plugins version
-const CDXGEN_PLUGINS_VERSION = "1.6.12";
+const CDXGEN_PLUGINS_VERSION = "1.7.0";
 
 // Retrieve the cdxgen plugins directory
 let CDXGEN_PLUGINS_DIR = process.env.CDXGEN_PLUGINS_DIR;
diff --git a/package.json b/package.json
@@ -214,17 +214,17 @@
     "@appthreat/atom": "2.3.0",
     "@appthreat/cdx-proto": "1.1.4",
     "@bufbuild/protobuf": "2.6.3",
-    "@cyclonedx/cdxgen-plugins-bin": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-darwin-amd64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-darwin-arm64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-linux-amd64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-linux-arm": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-linux-arm64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-linux-ppc64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-linuxmusl-amd64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-linuxmusl-arm64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-windows-amd64": "1.6.12",
-    "@cyclonedx/cdxgen-plugins-bin-windows-arm64": "1.6.12",
+    "@cyclonedx/cdxgen-plugins-bin": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-darwin-amd64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-darwin-arm64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-linux-amd64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-linux-arm": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-linux-arm64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-linux-ppc64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-linuxmusl-amd64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-linuxmusl-arm64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-windows-amd64": "1.7.0",
+    "@cyclonedx/cdxgen-plugins-bin-windows-arm64": "1.7.0",
     "body-parser": "2.2.0",
     "compression": "1.8.1",
     "connect": "3.7.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
