Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update atom and other packages #1387

Merged
merged 4 commits into from
Sep 22, 2024
Merged

Update atom and other packages #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5446324
Update atom and other packages
prabhu Sep 22, 2024
736fe5e
Update types
prabhu Sep 22, 2024
14ccf37
Update ssri
prabhu Sep 22, 2024
c7e9536
Update java version
prabhu Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ARG SWIFT_PLATFORM=ubi9
ARG SWIFT_BRANCH=swift-5.10.1-release
ARG SWIFT_VERSION=swift-5.10.1-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ARG JAVA_VERSION=22.0.2-tem
ARG SBT_VERSION=1.10.1
ARG JAVA_VERSION=23-tem
ARG SBT_VERSION=1.10.2
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.10
ARG GO_VERSION=1.23.0
Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile-bun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ARG SWIFT_PLATFORM=ubi9
ARG SWIFT_BRANCH=swift-5.10.1-release
ARG SWIFT_VERSION=swift-5.10.1-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ARG JAVA_VERSION=22.0.2-tem
ARG SBT_VERSION=1.10.1
ARG JAVA_VERSION=23-tem
ARG SBT_VERSION=1.10.2
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.10
ARG GO_VERSION=1.23.0
Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile-deno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ARG SWIFT_PLATFORM=ubi9
ARG SWIFT_BRANCH=swift-5.10.1-release
ARG SWIFT_VERSION=swift-5.10.1-RELEASE
ARG SWIFT_WEBROOT=https://download.swift.org
ARG JAVA_VERSION=22.0.2-tem
ARG SBT_VERSION=1.10.1
ARG JAVA_VERSION=23-tem
ARG SBT_VERSION=1.10.2
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.10
ARG GO_VERSION=1.23.0
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-ppc64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.1
ARG SBT_VERSION=1.10.2
ARG MAVEN_VERSION=3.9.9
ARG GRADLE_VERSION=8.10
ARG GO_VERSION=1.23.0
Expand Down
6 changes: 3 additions & 3 deletions deno.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"gen-types": "npx -p typescript tsc"
},
"imports": {
"@appthreat/atom": "npm:@appthreat/[email protected].20",
"@appthreat/atom": "npm:@appthreat/[email protected].21",
"@appthreat/cdx-proto": "npm:@appthreat/[email protected]",
"@babel/parser": "npm:@babel/parser@^7.24.8",
"@babel/traverse": "npm:@babel/traverse@^7.24.8",
Expand All @@ -71,7 +71,7 @@
"prettify-xml": "npm:prettify-xml@^1.2.0",
"properties-reader": "npm:properties-reader@^2.3.0",
"semver": "npm:semver@^7.6.3",
"ssri": "npm:ssri@^10.0.6",
"ssri": "npm:ssri@^11.0.0",
"table": "npm:table@^6.8.2",
"tar": "npm:tar@^6.2.1",
"uuid": "npm:uuid@^10.0.0",
Expand All @@ -81,7 +81,7 @@
"@jest/globals": "npm:@jest/globals@^29.7.0",
"sequelize": "npm:sequelize@^6.37.3",
"sqlite3": "npm:sqlite3@^5.1.7",
"body-parser": "npm:body-parser@^1.20.2",
"body-parser": "npm:body-parser@^2.0.1",
"compression": "npm:compression@^1.7.4",
"connect": "npm:connect@^3.7.0",
"jsonata": "npm:jsonata@^2.0.5"
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ export async function createJavaBom(path, options) {
);
} else {
console.log(
"1. Java version requirement: cdxgen container image bundles Java 21 with maven 3.9 which might be incompatible. Try running cdxgen with the unofficial JDK11-based image `ghcr.io/appthreat/cdxgen-java:v10`.",
"1. Java version requirement: cdxgen container image bundles Java 23 with maven 3.9 which might be incompatible. Try running cdxgen with the unofficial JDK11-based image `ghcr.io/appthreat/cdxgen-java:v10`.",
);
}
console.log(
Expand Down
1 change: 1 addition & 0 deletions lib/helpers/envcontext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const SDKMAN_TOOL_ALIASES = {
java17: "17.0.12-tem",
java21: "21.0.4-tem",
java22: "22.0.2-tem",
java23: "23-tem",
};

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/helpers/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3014,7 +3014,7 @@ export function executeParallelGradleProperties(dir, allProjectsStr) {
if (result.stderr) {
console.error(result.stdout, result.stderr);
console.log(
"1. Check if the correct version of java and gradle are installed and available in PATH. For example, some project might require Java 11 with gradle 7.\n cdxgen container image bundles Java 21 with gradle 8 which might be incompatible.",
"1. Check if the correct version of java and gradle are installed and available in PATH. For example, some project might require Java 11 with gradle 7.\n cdxgen container image bundles Java 23 with gradle 8 which might be incompatible.",
);
console.log(
"2. Try running cdxgen with the unofficial JDK11-based image `ghcr.io/appthreat/cdxgen-java:v10`.",
Expand Down Expand Up @@ -3072,7 +3072,7 @@ export function executeGradleProperties(dir, subProject) {
}
console.error(result.stdout, result.stderr);
console.log(
"1. Check if the correct version of java and gradle are installed and available in PATH. For example, some project might require Java 11 with gradle 7.\n cdxgen container image bundles Java 21 with gradle 8 which might be incompatible.",
"1. Check if the correct version of java and gradle are installed and available in PATH. For example, some project might require Java 11 with gradle 7.\n cdxgen container image bundles Java 23 with gradle 8 which might be incompatible.",
);
console.log(
"2. Try running cdxgen with the unofficial JDK11-based image `ghcr.io/appthreat/cdxgen-java:v10`.",
Expand Down
4 changes: 2 additions & 2 deletions lib/helpers/utils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3214,8 +3214,8 @@ test("parsePnpmLock", async () => {
expect(parsedList.dependenciesList).toHaveLength(462);
expect(parsedList.pkgList.filter((pkg) => !pkg.scope)).toHaveLength(3);
parsedList = await parsePnpmLock("./pnpm-lock.yaml");
expect(parsedList.pkgList.length).toEqual(655);
expect(parsedList.dependenciesList.length).toEqual(655);
expect(parsedList.pkgList.length).toEqual(648);
expect(parsedList.dependenciesList.length).toEqual(648);
expect(parsedList.pkgList[0]).toEqual({
group: "@ampproject",
name: "remapping",
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"prettify-xml": "^1.2.0",
"properties-reader": "^2.3.0",
"semver": "^7.6.3",
"ssri": "^10.0.6",
"ssri": "^11.0.0",
"table": "^6.8.2",
"tar": "^6.2.1",
"toml": "^3.0.0",
Expand All @@ -99,7 +99,7 @@
"yargs": "^17.7.2"
},
"optionalDependencies": {
"@appthreat/atom": "2.0.20",
"@appthreat/atom": "2.0.21",
"@appthreat/cdx-proto": "1.0.1",
"@cyclonedx/cdxgen-plugins-bin": "1.6.3",
"@cyclonedx/cdxgen-plugins-bin-arm64": "1.6.3",
Expand All @@ -108,7 +108,7 @@
"@cyclonedx/cdxgen-plugins-bin-ppc64": "1.6.3",
"@cyclonedx/cdxgen-plugins-bin-windows-amd64": "1.6.3",
"@cyclonedx/cdxgen-plugins-bin-windows-arm64": "1.6.3",
"body-parser": "^1.20.2",
"body-parser": "^2.0.1",
"compression": "^1.7.4",
"connect": "^3.7.0",
"jsonata": "^2.0.5",
Expand Down
Loading
Loading