From bfd72d70ef3faa352481b116d6f067bcc7febbe8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 02:14:59 +0000 Subject: [PATCH 1/2] Bump the gradle-dependencies group across 1 directory with 3 updates Bumps the gradle-dependencies group with 3 updates in the / directory: [org.apache.maven:maven-model-builder](https://github.com/apache/maven), [org.apache.maven:maven-model](https://github.com/apache/maven) and [com.google.guava:guava](https://github.com/google/guava). Updates `org.apache.maven:maven-model-builder` from 3.9.6 to 3.9.7 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.9.6...maven-3.9.7) Updates `org.apache.maven:maven-model` from 3.9.6 to 3.9.7 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.9.6...maven-3.9.7) Updates `com.google.guava:guava` from 33.1.0-jre to 33.2.1-jre - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: org.apache.maven:maven-model-builder dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-dependencies - dependency-name: org.apache.maven:maven-model dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle-dependencies - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle-dependencies ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4ce5ecd..8e2e1b6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,9 +21,9 @@ dependencies { implementation("org.spdx:java-spdx-library:1.1.11") implementation("org.spdx:spdx-jackson-store:1.1.9.1") - implementation("org.apache.maven:maven-model-builder:3.9.6") - implementation("org.apache.maven:maven-model:3.9.6") - implementation("com.google.guava:guava:33.1.0-jre") + implementation("org.apache.maven:maven-model-builder:3.9.7") + implementation("org.apache.maven:maven-model:3.9.7") + implementation("com.google.guava:guava:33.2.1-jre") testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.hamcrest:hamcrest-library:2.2") From 5182c7a8ee47e442df719c044813797c0f1129db Mon Sep 17 00:00:00 2001 From: Appu Goundan Date: Mon, 3 Jun 2024 10:57:30 -0400 Subject: [PATCH 2/2] Update maven properties access Signed-off-by: Appu Goundan --- src/main/java/org/spdx/sbom/gradle/maven/PropertiesForPom.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spdx/sbom/gradle/maven/PropertiesForPom.java b/src/main/java/org/spdx/sbom/gradle/maven/PropertiesForPom.java index 3f103c9..678fb2e 100644 --- a/src/main/java/org/spdx/sbom/gradle/maven/PropertiesForPom.java +++ b/src/main/java/org/spdx/sbom/gradle/maven/PropertiesForPom.java @@ -29,7 +29,8 @@ public abstract class PropertiesForPom { PropertiesForPom() {} - private static final List JAVA_PROP_KEYS = List.of("java.version", "java.home"); + private static final List JAVA_PROP_KEYS = + List.of("java.version", "java.home", "os.name", "os.arch", "os.version"); @Lazy public Properties get() {