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

Fix issues with querying Maven artifacts from different repositories #6489

Merged
merged 5 commits into from
Feb 21, 2023
Merged

Fix issues with querying Maven artifacts from different repositories #6489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ad46ef
refactor(MavenDependencyHandler): Replace a `let` to reduce nesting
sschuberth Feb 21, 2023
ed4c21a
fix(MavenSupport): Correct querying of artifact repos declared in POMs
sschuberth Feb 15, 2023
ae43b4a
refactor(MavenSupport): Move some variables closer to their use
sschuberth Feb 20, 2023
65be79a
fix(MavenSupport): Also use the list of repos for the artifact cache key
sschuberth Feb 20, 2023
4879ca5
style(MavenSupport): Simplify logging of local repositories
sschuberth Feb 20, 2023
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
124 changes: 62 additions & 62 deletions analyzer/src/funTest/assets/projects/external/sbt-multi-project-example-expected-output.yml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions analyzer/src/funTest/assets/projects/synthetic/maven-expected-output-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ packages:
description: ""
homepage_url: "http://jenkins-ci.org/version-number/"
binary_artifact:
url: "http://repo.jenkins-ci.org/public/org/jenkins-ci/version-number/1.4/version-number-1.4.jar"
url: "https://repo.jenkins-ci.org/releases/org/jenkins-ci/version-number/1.4/version-number-1.4.jar"
hash:
value: "5d0f2ea16514c0ec8de86c102ce61a7837e45eb8"
algorithm: "SHA-1"
source_artifact:
url: "http://repo.jenkins-ci.org/public/org/jenkins-ci/version-number/1.4/version-number-1.4-sources.jar"
url: "https://repo.jenkins-ci.org/releases/org/jenkins-ci/version-number/1.4/version-number-1.4-sources.jar"
hash:
value: "ab4e04d731d43157f66d80e4a5daef33ce24f0c2"
algorithm: "SHA-1"
Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/funTest/assets/projects/synthetic/maven-expected-output-lib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ packages:
description: ""
homepage_url: "http://jenkins-ci.org/version-number/"
binary_artifact:
url: "http://repo.jenkins-ci.org/public/org/jenkins-ci/version-number/1.4/version-number-1.4.jar"
url: "https://repo.jenkins-ci.org/releases/org/jenkins-ci/version-number/1.4/version-number-1.4.jar"
hash:
value: "5d0f2ea16514c0ec8de86c102ce61a7837e45eb8"
algorithm: "SHA-1"
source_artifact:
url: "http://repo.jenkins-ci.org/public/org/jenkins-ci/version-number/1.4/version-number-1.4-sources.jar"
url: "https://repo.jenkins-ci.org/releases/org/jenkins-ci/version-number/1.4/version-number-1.4-sources.jar"
hash:
value: "ab4e04d731d43157f66d80e4a5daef33ce24f0c2"
algorithm: "SHA-1"
Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/funTest/assets/projects/synthetic/maven-expected-output-scope-excludes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@ packages:
description: ""
homepage_url: "http://jenkins-ci.org/version-number/"
binary_artifact:
url: "http://repo.jenkins-ci.org/public/org/jenkins-ci/version-number/1.4/version-number-1.4.jar"
url: "https://repo.jenkins-ci.org/releases/org/jenkins-ci/version-number/1.4/version-number-1.4.jar"
hash:
value: "5d0f2ea16514c0ec8de86c102ce61a7837e45eb8"
algorithm: "SHA-1"
source_artifact:
url: "http://repo.jenkins-ci.org/public/org/jenkins-ci/version-number/1.4/version-number-1.4-sources.jar"
url: "https://repo.jenkins-ci.org/releases/org/jenkins-ci/version-number/1.4/version-number-1.4-sources.jar"
hash:
value: "ab4e04d731d43157f66d80e4a5daef33ce24f0c2"
algorithm: "SHA-1"
Expand Down
56 changes: 28 additions & 28 deletions analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@ packages:
description: "Java Native Access"
homepage_url: "https://github.com/java-native-access/jna"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar"
url: "https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar"
hash:
value: "330f2244e9030119ab3030fc3fededc86713d9cc"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0-sources.jar"
url: "https://jcenter.bintray.com/net/java/dev/jna/jna/5.6.0/jna-5.6.0-sources.jar"
hash:
value: "754dbdc797e1decd2cb1f1a26104e2460c414768"
algorithm: "SHA-1"
Expand All @@ -231,12 +231,12 @@ packages:
description: "A set of annotations used for code inspection support and code documentation."
homepage_url: "http://www.jetbrains.org"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.jar"
url: "https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0.jar"
hash:
value: "919f0dfe192fb4e063e7dacadee7f8bb9a2672a9"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar"
hash:
value: "5991ca87ef1fb5544943d9abc5a9a37583fabe03"
algorithm: "SHA-1"
Expand All @@ -263,12 +263,12 @@ packages:
description: "Fork of trove4j library used in IntelliJ Platform."
homepage_url: "https://github.com/JetBrains/intellij-deps-trove4j"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.jar"
url: "https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.jar"
hash:
value: "3afb14d5f9ceb459d724e907a21145e8ff394f02"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330-sources.jar"
hash:
value: "5fc2da70caaebed24734161c6c33648a15396917"
algorithm: "SHA-1"
Expand All @@ -295,12 +295,12 @@ packages:
description: "Kotlin Compiler (embeddable)"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.20/kotlin-compiler-embeddable-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.20/kotlin-compiler-embeddable-1.7.20.jar"
hash:
value: "8db18559a581dd2c36ddfd5046af145650f5b126"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.20/kotlin-compiler-embeddable-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.20/kotlin-compiler-embeddable-1.7.20-sources.jar"
hash:
value: "f5c5882a804210d420dfc79620946ac9c7758503"
algorithm: "SHA-1"
Expand All @@ -327,12 +327,12 @@ packages:
description: "Kotlin Daemon (for using with embeddable compiler)"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.20/kotlin-daemon-embeddable-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.20/kotlin-daemon-embeddable-1.7.20.jar"
hash:
value: "1e24355adad8d529d75d5b19eab55484057431ba"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.20/kotlin-daemon-embeddable-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.20/kotlin-daemon-embeddable-1.7.20-sources.jar"
hash:
value: "ff4d7412cc8b4757b24f7b06cbddc47579bc8ddb"
algorithm: "SHA-1"
Expand All @@ -359,12 +359,12 @@ packages:
description: "Kotlin KLIB Library Commonizer (for using with embeddable compiler)"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.20/kotlin-klib-commonizer-embeddable-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.20/kotlin-klib-commonizer-embeddable-1.7.20.jar"
hash:
value: "aacfcd32be9b403a37e8435a4b08edfba241ea59"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.20/kotlin-klib-commonizer-embeddable-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.20/kotlin-klib-commonizer-embeddable-1.7.20-sources.jar"
hash:
value: "5b8f86fea035328fc9e8c660773037a3401ce25f"
algorithm: "SHA-1"
Expand All @@ -391,12 +391,12 @@ packages:
description: "Kotlin Full Reflection Library"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.20/kotlin-reflect-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.7.20/kotlin-reflect-1.7.20.jar"
hash:
value: "12b2501e33bb6373e8e347c86d85481863629381"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.20/kotlin-reflect-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.7.20/kotlin-reflect-1.7.20-sources.jar"
hash:
value: "855e2c1a097a0a845d382eed1136e2f650d4a7ea"
algorithm: "SHA-1"
Expand All @@ -423,12 +423,12 @@ packages:
description: "Kotlin Script Runtime"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.7.20/kotlin-script-runtime-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.7.20/kotlin-script-runtime-1.7.20.jar"
hash:
value: "0bcd1cc6f865e632550357fcc59f5ffd532615a8"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.7.20/kotlin-script-runtime-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.7.20/kotlin-script-runtime-1.7.20-sources.jar"
hash:
value: "abc7ecfd92ea677825899180807736acdfbb89b6"
algorithm: "SHA-1"
Expand All @@ -455,12 +455,12 @@ packages:
description: "Kotlin Scripting Common"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.20/kotlin-scripting-common-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-common/1.7.20/kotlin-scripting-common-1.7.20.jar"
hash:
value: "88ed4f0a92a48e12d2d4596f26967400e390648c"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.20/kotlin-scripting-common-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-common/1.7.20/kotlin-scripting-common-1.7.20-sources.jar"
hash:
value: "9a3d8c1f7657df2adf3fc58a32a82a6ef5b535c1"
algorithm: "SHA-1"
Expand All @@ -487,12 +487,12 @@ packages:
description: "Kotlin Scripting Compiler Plugin for embeddable compiler"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.20/kotlin-scripting-compiler-embeddable-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.20/kotlin-scripting-compiler-embeddable-1.7.20.jar"
hash:
value: "a7f1cf58156c0e066411f4f7fd26cb8c63e11aca"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.20/kotlin-scripting-compiler-embeddable-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.20/kotlin-scripting-compiler-embeddable-1.7.20-sources.jar"
hash:
value: "cf914e97219efe1f1db1964a30c16190c9b4ac6f"
algorithm: "SHA-1"
Expand All @@ -519,12 +519,12 @@ packages:
description: "Kotlin Compiler Infrastructure for Scripting for embeddable compiler"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.20/kotlin-scripting-compiler-impl-embeddable-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.20/kotlin-scripting-compiler-impl-embeddable-1.7.20.jar"
hash:
value: "9a40e21c6710aca281217963ef137c7df945e1bc"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.20/kotlin-scripting-compiler-impl-embeddable-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.20/kotlin-scripting-compiler-impl-embeddable-1.7.20-sources.jar"
hash:
value: "691afe60d8554ac40e881a374bcf2feb17a9e779"
algorithm: "SHA-1"
Expand All @@ -551,12 +551,12 @@ packages:
description: "Kotlin Scripting Jvm"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.20/kotlin-scripting-jvm-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.20/kotlin-scripting-jvm-1.7.20.jar"
hash:
value: "c79de17329ea8f7c7d200063145d5694ca3f6786"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.20/kotlin-scripting-jvm-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.20/kotlin-scripting-jvm-1.7.20-sources.jar"
hash:
value: "644b7c49cea4581e4a1d1bcb4b50a86640055c17"
algorithm: "SHA-1"
Expand All @@ -583,12 +583,12 @@ packages:
description: "Kotlin Standard Library for JVM"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.20/kotlin-stdlib-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.7.20/kotlin-stdlib-1.7.20.jar"
hash:
value: "726594ea9ba2beb2ee113647fefa9a10f9fabe52"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.20/kotlin-stdlib-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.7.20/kotlin-stdlib-1.7.20-sources.jar"
hash:
value: "e31859676e9dfc3dda0d830fdf759eaf237bd86d"
algorithm: "SHA-1"
Expand All @@ -615,12 +615,12 @@ packages:
description: "Kotlin Common Standard Library"
homepage_url: "https://kotlinlang.org/"
binary_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.20/kotlin-stdlib-common-1.7.20.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.20/kotlin-stdlib-common-1.7.20.jar"
hash:
value: "e15351bdaf9fa06f009be5da7a202e4184f00ae3"
algorithm: "SHA-1"
source_artifact:
url: "https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.20/kotlin-stdlib-common-1.7.20-sources.jar"
url: "https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.20/kotlin-stdlib-common-1.7.20-sources.jar"
hash:
value: "0bbe07d9cf0399e1ec51de98f86c22da6aee0d5b"
algorithm: "SHA-1"
Expand Down
Loading