Skip to content

[bot] Merge 26.7 to 26.9 #1496

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
github-actions merged 3 commits into from
Sep 1, 2026
+27 −8
Merged

[bot] Merge 26.7 to 26.9 #1496

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
0f7929b
Suppress false-positive for pgvector (#1489)
labkey-tchad Aug 25, 2026
28c128b
Update dependencies and CVE suppressions (#1494)
labkey-tchad Aug 29, 2026
7ee5927
Merge 26.7 to 26.9
labkey-teamcity Sep 1, 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
33 changes: 26 additions & 7 deletions dependencyCheckSuppression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,21 +481,40 @@
</suppress>

<!--
CVE in example code. New version not yet available.
[FP]: pgvector java library matching CPE for pgvector postgres extension
https://github.com/dependency-check/DependencyCheck/issues/8769
-->
<suppress>
<notes><![CDATA[
file name: tomcat-*-11.0.24.jar
file name: pgvector-0.1.6.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.tomcat/tomcat-.*@.*$</packageUrl>
<cve>CVE-2026-66299</cve>
<packageUrl regex="true">^pkg:maven/com\.pgvector/pgvector@.*$</packageUrl>
<cpe>cpe:/a:pgvector_project:pgvector</cpe>
</suppress>

<!--
[FP]: opentelemetry-js is the OpenTelemetry JavaScript Client, not the Java client we pull in.
-->
<suppress>
<notes><![CDATA[
file name: opentelemetry-api-1.60.1.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/io\.opentelemetry/opentelemetry-api@.*$</packageUrl>
<cpe>cpe:/a:opentelemetry:opentelemetry</cpe>
</suppress>
<suppress>
<notes><![CDATA[
file name: opentelemetry-common-1.60.1.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/io\.opentelemetry/opentelemetry-common@.*$</packageUrl>
<cpe>cpe:/a:opentelemetry:opentelemetry</cpe>
</suppress>
<suppress>
<notes><![CDATA[
file name: tomcat-embed-*-11.0.24.jar
file name: opentelemetry-context-1.60.1.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.tomcat\.embed/tomcat-embed-.*@.*$</packageUrl>
<cve>CVE-2026-66299</cve>
<packageUrl regex="true">^pkg:maven/io\.opentelemetry/opentelemetry-context@.*$</packageUrl>
<cpe>cpe:/a:opentelemetry:opentelemetry</cpe>
</suppress>


Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ apacheDirectoryVersion=2.1.8
apacheMinaVersion=2.2.9

# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
apacheTomcatVersion=11.0.24
apacheTomcatVersion=11.0.25

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand Down
Loading