From 12eca59e6df41f8a2ebbc8f71bebfb258f8ca1e0 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 22 Apr 2025 14:27:32 +1000 Subject: [PATCH 1/2] chore: disable latest purl finding for test Signed-off-by: Ben Selwyn-Smith --- .../config.ini | 5 +++++ .../test.yaml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/config.ini diff --git a/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/config.ini b/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/config.ini new file mode 100644 index 000000000..8c9ffd63e --- /dev/null +++ b/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/config.ini @@ -0,0 +1,5 @@ +# Copyright (c) 2025 - 2025, Oracle and/or its affiliates. All rights reserved. +# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/. + +[repofinder] +try_latest_purl = False diff --git a/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml b/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml index 52ad28583..3f59016d3 100644 --- a/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml +++ b/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2024 - 2024, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2024 - 2025, Oracle and/or its affiliates. All rights reserved. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/. description: | @@ -15,6 +15,7 @@ steps: - name: Run macaron analyze kind: analyze options: + ini: config.ini main_args: - -lr - ./output/git_repos/local_repos From ffd382b4cdbdf0885132e6d23a710f701dfb4c99 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 22 Apr 2025 15:35:57 +1000 Subject: [PATCH 2/2] chore: update test description Signed-off-by: Ben Selwyn-Smith --- .../test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml b/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml index 3f59016d3..f805dc5fe 100644 --- a/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml +++ b/tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/test.yaml @@ -3,6 +3,8 @@ description: | Analyzing local clone with the branch name, the commit digest and dependency resolution using cyclonedx maven plugin (default). + To keep the results from the main target's dependencies static, the Repo Finder's latest PURL finding feature is disabled for this test. + In particular, dependency commons-jxpath:commons-jxpath@1.3 has no readable SCM URL, while from versions 1.4 onwards, it does. tags: - macaron-python-package