Skip to content

Commit c51d5d4

Browse files
authored
Merge branch 'master' into fix-sbt-dependency-tree-html-routing
2 parents fe7b09d + 56cc319 commit c51d5d4

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
- Scala/sbt: Run the uppercase `dependencyBrowseTreeHTML` task when the project explicitly enables `addDependencyTreePlugin` on sbt 1.4+. Previously the lowercase `dependencyBrowseTreeHtml` was used unconditionally for the explicit-plugin path, which sbt 1.4+ rejects, causing deep dependencies to be silently dropped. ([TKT-15490](https://fossa.atlassian.net/browse/ANE-2718))
66

7+
## 3.17.6
8+
9+
- Licensing - Fix two bad GPL matches [No PR]
10+
711
## 3.17.5
812

913
- Vendetta: Debug bundles now include per-file component match data from Vendetta scans, making it easier to diagnose why a vendored dependency was or wasn't detected. ([#1706](https://github.com/fossas/fossa-cli/pull/1706))

integration-test/Analysis/ClojureSpec.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ import Types (DiscoveredProjectType (..), GraphBreadth (Complete))
1414
clojureEnv :: FixtureEnvironment
1515
clojureEnv = NixEnv ["openjdk11", "clojure", "leiningen"]
1616

17-
eastwood :: AnalysisTestFixture (Leiningen.LeiningenProject)
18-
eastwood =
17+
cljHttp :: AnalysisTestFixture (Leiningen.LeiningenProject)
18+
cljHttp =
1919
AnalysisTestFixture
20-
"eastwood"
20+
"clj-http"
2121
Leiningen.discover
2222
clojureEnv
2323
Nothing
2424
$ FixtureArtifact
25-
"https://github.com/jonase/eastwood/archive/refs/tags/Release-1.0.0.tar.gz"
26-
[reldir|clojure/eastwood/|]
27-
[reldir|eastwood-Release-1.0.0/|]
25+
"https://github.com/dakrone/clj-http/archive/refs/tags/3.13.1.tar.gz"
26+
[reldir|clojure/clj-http/|]
27+
[reldir|clj-http-3.13.1/|]
2828

2929
ring :: AnalysisTestFixture (Leiningen.LeiningenProject)
3030
ring =
@@ -40,5 +40,5 @@ ring =
4040

4141
spec :: Spec
4242
spec = do
43-
testSuiteDepResultSummary NonStrict eastwood LeiningenProjectType (DependencyResultsSummary 10 7 3 1 Complete)
43+
testSuiteDepResultSummary NonStrict cljHttp LeiningenProjectType (DependencyResultsSummary 71 27 44 1 Complete)
4444
testSuiteDepResultSummary NonStrict ring LeiningenProjectType (DependencyResultsSummary 23 6 17 1 Complete)

0 commit comments

Comments
 (0)