Skip to content

Update dependencies #7716

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

Merged
labkey-adam merged 3 commits into from
Jun 2, 2026
Merged

Update dependencies #7716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06e89f6
Update dependencies
labkey-adam Jun 2, 2026
d673e3c
Merge remote-tracking branch 'origin/develop' into fb_bump_dependencies
labkey-adam Jun 2, 2026
a91fc82
Adjust TikaTestCase expectations for tgz sample file: full path used …
labkey-adam Jun 2, 2026
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
2 changes: 1 addition & 1 deletion pipeline/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
activemqVersion=5.19.6
activemqVersion=5.19.7

geronimoJ2eeConnector15SpecVersion=1.0.1

Expand Down
4 changes: 3 additions & 1 deletion search/src/org/labkey/search/model/LuceneSearchServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2132,7 +2132,9 @@ private Map<String, Pair<Integer, String[]>> getExpectations()
add(map, "sample.txt", 37, "Sample text file", "1", "2", "9");
add(map, "sql_sample.sql", 2232, "for JDBC Login support", "Container of parent, if parent has no ACLs");
add(map, "svg_sample.svg", 18, " "); // Not empty, but just a bunch of whitespace
add(map, "tgz_sample.tgz", 7823, "assertthat is an extension", "Custom failure messages");


add(map, "tgz_sample.tgz", 7682, "assertthat is an extension", "Custom failure messages");
add(map, "tif_sample.tif", 0);
add(map, "tsv_sample.tsv", 2986, "1264.5", "10JAN07_plate_1.xls");
add(map, "vsd_sample.vsd", 982, "Contoso Pharmaceuticals, Inc.", "Trial Continuation Process", "events depicted herein are fictitious");
Expand Down