From caaa81f496246d10f79c00e5658f87acbd323c29 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 5 Oct 2024 07:21:32 -0400 Subject: [PATCH 1/2] docs: reformat javadoc per https://github.com/jeremylong/DependencyCheck/pull/7003#pullrequestreview-2348619930 --- .../dependencycheck/analyzer/CarthageAnalyzer.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java index b21e6b944f9..3ed1307fa2d 100644 --- a/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java +++ b/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java @@ -90,12 +90,14 @@ public class CarthageAnalyzer extends AbstractFileTypeAnalyzer { * dependency version. The version can be a commit ref, so we can't assume * it's a number * - * Example values: - binary "https://dl.google.com/geosdk/GoogleMaps.json" - * "7.2.0" - git "https://gitlab.matrix.org/matrix-org/olm.git" "3.2.16" - - * github "alinradut/SwiftEntryKit" - * "95f4a08f41ddcf2c02e2b22789038774c8c94df5"" - github - * "CocoaLumberjack/CocoaLumberjack" "3.8.5" - github "realm/realm-swift" - * "v10.44.0" + * Example values: + * */ private static final Pattern CARTFILE_RESOLVED_DEPENDENCY_PATTERN = Pattern.compile("(github|git|binary) \"([^\"]+)\" \"([^\"]+)\""); From 2eb95399b9030e8e1569f4c98318274ed603a388 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 7 Oct 2024 06:56:34 -0400 Subject: [PATCH 2/2] fix: javadoc --- .../analyzer/CarthageAnalyzer.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java index 3ed1307fa2d..05d711a49d3 100644 --- a/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java +++ b/core/src/main/java/org/owasp/dependencycheck/analyzer/CarthageAnalyzer.java @@ -94,7 +94,8 @@ public class CarthageAnalyzer extends AbstractFileTypeAnalyzer { * @@ -109,8 +110,11 @@ public class CarthageAnalyzer extends AbstractFileTypeAnalyzer { /** * Capture group #1 is the dependency name. * - * Example values: - robbiehanson/XMPPFramework - - * CocoaLumberjack/CocoaLumberjack + * Example values: + * */ private static final Pattern CARTFILE_RESOLVED_GITHUB_DEPENDENCY = Pattern.compile("[a-zA-Z0-9-_]+/([a-zA-Z0-9\\-_\\.]+)"); @@ -122,9 +126,13 @@ public class CarthageAnalyzer extends AbstractFileTypeAnalyzer { /** * Capture group #1 is the dependency name. * - * Example values: - https://my.domain.com/release/MyFramework.json - - * file:///some/Path/MyFramework.json - relative/path/MyFramework.json - - * /absolute/path/MyFramework.json + * Example values: + * */ private static final Pattern CARTFILE_RESOLVED_BINARY_DEPENDENCY = Pattern.compile("([a-zA-Z0-9\\-_\\.]+).json");