Merge commit '7e0e7d500426b6d943446305735df9ab0f6ea5ac' into yo-h/java17-options

2026-08-01 16:02:57 +02:00 · 2022-03-19 15:28:23 -04:00
parent 2e24f39d5f 7e0e7d5004
commit 687ef87e56
5246 changed files with 609338 additions and 209219 deletions
--- a/java/change-notes/2021-11-15-overrides.md
+++ b/java/change-notes/2021-11-15-overrides.md
@@ -1,2 +0,0 @@
-lgtm,codescanning
-* The predicate `Method.overrides(Method)` was accidentally transitive. This has been fixed. This fix also affects `Method.overridesOrInstantiates(Method)` and `Method.getASourceOverriddenMethod()`.
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -1,102 +1,112 @@
-package,sink,source,summary,sink:bean-validation,sink:create-file,sink:groovy,sink:header-splitting,sink:information-leak,sink:intent-start,sink:jexl,sink:jndi-injection,sink:ldap,sink:mvel,sink:ognl-injection,sink:open-url,sink:set-hostname-verifier,sink:sql,sink:url-open-stream,sink:url-redirect,sink:xpath,sink:xslt,sink:xss,source:contentprovider,source:remote,summary:taint,summary:value
-android.app,7,,,,,,,,7,,,,,,,,,,,,,,,,,
-android.content,24,27,96,,,,,,16,,,,,,,,8,,,,,,27,,31,65
-android.database,59,,30,,,,,,,,,,,,,,59,,,,,,,,30,
-android.net,,,60,,,,,,,,,,,,,,,,,,,,,,45,15
-android.os,,,122,,,,,,,,,,,,,,,,,,,,,,41,81
-android.util,,16,,,,,,,,,,,,,,,,,,,,,,16,,
-android.webkit,3,2,,,,,,,,,,,,,,,,,,,,3,,2,,
-cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-com.fasterxml.jackson.databind,,,6,,,,,,,,,,,,,,,,,,,,,,6,
-com.google.common.base,,,85,,,,,,,,,,,,,,,,,,,,,,62,23
-com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,17
-com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,2,551
-com.google.common.io,6,,73,,,,,,,,,,,,,,,6,,,,,,,72,1
-com.opensymphony.xwork2.ognl,3,,,,,,,,,,,,,3,,,,,,,,,,,,
-com.unboundid.ldap.sdk,17,,,,,,,,,,,17,,,,,,,,,,,,,,
-flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,1
-groovy.lang,26,,,,,26,,,,,,,,,,,,,,,,,,,,
-groovy.util,5,,,,,5,,,,,,,,,,,,,,,,,,,,
-jakarta.faces.context,2,7,,,,,,,,,,,,,,,,,,,,2,,7,,
-jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,100,23
-jakarta.ws.rs.client,1,,,,,,,,,,,,,,1,,,,,,,,,,,
-jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,9,,
-jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,2,,,,,,94,55
-java.beans,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-java.io,3,,31,,3,,,,,,,,,,,,,,,,,,,,30,1
-java.lang,,,52,,,,,,,,,,,,,,,,,,,,,,42,10
-java.net,10,3,7,,,,,,,,,,,,10,,,,,,,,,3,7,
-java.nio,10,,4,,10,,,,,,,,,,,,,,,,,,,,4,
-java.sql,7,,,,,,,,,,,,,,,,7,,,,,,,,,
-java.util,,,429,,,,,,,,,,,,,,,,,,,,,,15,414
-javax.faces.context,2,7,,,,,,,,,,,,,,,,,,,,2,,7,,
-javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,100,23
-javax.management.remote,2,,,,,,,,,,2,,,,,,,,,,,,,,,
-javax.naming,7,,,,,,,,,,6,1,,,,,,,,,,,,,,
-javax.net.ssl,2,,,,,,,,,,,,,,,2,,,,,,,,,,
-javax.script,1,,,,,,,,,,,,1,,,,,,,,,,,,,
-javax.servlet,4,21,2,,,,3,1,,,,,,,,,,,,,,,,21,2,
-javax.validation,1,1,,1,,,,,,,,,,,,,,,,,,,,1,,
-javax.ws.rs.client,1,,,,,,,,,,,,,,1,,,,,,,,,,,
-javax.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,9,,
-javax.ws.rs.core,3,,149,,,,1,,,,,,,,,,,,2,,,,,,94,55
-javax.xml.transform,1,,6,,,,,,,,,,,,,,,,,,1,,,,6,
-javax.xml.xpath,3,,,,,,,,,,,,,,,,,,,3,,,,,,
-jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,10
-net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,5,,,,,
-ognl,6,,,,,,,,,,,,,6,,,,,,,,,,,,
-org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,6,
-org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,17,783
-org.apache.commons.collections4,,,800,,,,,,,,,,,,,,,,,,,,,,17,783
-org.apache.commons.io,,,22,,,,,,,,,,,,,,,,,,,,,,22,
-org.apache.commons.jexl2,15,,,,,,,,,15,,,,,,,,,,,,,,,,
-org.apache.commons.jexl3,15,,,,,,,,,15,,,,,,,,,,,,,,,,
-org.apache.commons.lang3,,,423,,,,,,,,,,,,,,,,,,,,,,292,131
-org.apache.commons.ognl,6,,,,,,,,,,,,,6,,,,,,,,,,,,
-org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,220,52
-org.apache.directory.ldap.client.api,1,,,,,,,,,,,1,,,,,,,,,,,,,,
-org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.hc.core5.http,1,2,39,,,,,,,,,,,,,,,,,,,1,,2,39,
-org.apache.hc.core5.net,,,2,,,,,,,,,,,,,,,,,,,,,,2,
-org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,18,6
-org.apache.http,27,3,70,,,,,,,,,,,,25,,,,,,,2,,3,62,8
-org.apache.ibatis.jdbc,6,,,,,,,,,,,,,,,,6,,,,,,,,,
-org.apache.shiro.codec,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-org.apache.shiro.jndi,1,,,,,,,,,,1,,,,,,,,,,,,,,,
-org.codehaus.groovy.control,1,,,,,1,,,,,,,,,,,,,,,,,,,,
-org.dom4j,20,,,,,,,,,,,,,,,,,,,20,,,,,,
-org.hibernate,7,,,,,,,,,,,,,,,,7,,,,,,,,,
-org.jooq,1,,,,,,,,,,,,,,,,1,,,,,,,,,
-org.json,,,236,,,,,,,,,,,,,,,,,,,,,,198,38
-org.mvel2,16,,,,,,,,,,,,16,,,,,,,,,,,,,
-org.springframework.beans,,,26,,,,,,,,,,,,,,,,,,,,,,,26
-org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,13
-org.springframework.http,14,,70,,,,,,,,,,,,14,,,,,,,,,,60,10
-org.springframework.jdbc.core,10,,,,,,,,,,,,,,,,10,,,,,,,,,
-org.springframework.jdbc.object,9,,,,,,,,,,,,,,,,9,,,,,,,,,
-org.springframework.jndi,1,,,,,,,,,,1,,,,,,,,,,,,,,,
-org.springframework.ldap,42,,,,,,,,,,28,14,,,,,,,,,,,,,,
-org.springframework.security.web.savedrequest,,6,,,,,,,,,,,,,,,,,,,,,,6,,
-org.springframework.ui,,,32,,,,,,,,,,,,,,,,,,,,,,,32
-org.springframework.util,,,139,,,,,,,,,,,,,,,,,,,,,,87,52
-org.springframework.validation,,,13,,,,,,,,,,,,,,,,,,,,,,13,
-org.springframework.web.client,13,3,,,,,,,,,,,,,13,,,,,,,,,3,,
-org.springframework.web.context.request,,8,,,,,,,,,,,,,,,,,,,,,,8,,
-org.springframework.web.multipart,,12,13,,,,,,,,,,,,,,,,,,,,,12,13,
-org.springframework.web.reactive.function.client,2,,,,,,,,,,,,,,2,,,,,,,,,,,
-org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,138,25
-org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,1,
-org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,3,,
-play.mvc,,4,,,,,,,,,,,,,,,,,,,,,,4,,
-ratpack.core.form,,,3,,,,,,,,,,,,,,,,,,,,,,3,
-ratpack.core.handling,,6,4,,,,,,,,,,,,,,,,,,,,,6,4,
-ratpack.core.http,,10,10,,,,,,,,,,,,,,,,,,,,,10,10,
-ratpack.exec,,,26,,,,,,,,,,,,,,,,,,,,,,,26
-ratpack.form,,,3,,,,,,,,,,,,,,,,,,,,,,3,
-ratpack.func,,,5,,,,,,,,,,,,,,,,,,,,,,,5
-ratpack.handling,,6,4,,,,,,,,,,,,,,,,,,,,,6,4,
-ratpack.http,,10,10,,,,,,,,,,,,,,,,,,,,,10,10,
-ratpack.util,,,5,,,,,,,,,,,,,,,,,,,,,,,5
+package,sink,source,summary,sink:bean-validation,sink:create-file,sink:groovy,sink:header-splitting,sink:information-leak,sink:intent-start,sink:jexl,sink:jndi-injection,sink:ldap,sink:logging,sink:mvel,sink:ognl-injection,sink:open-url,sink:pending-intent-sent,sink:set-hostname-verifier,sink:sql,sink:url-open-stream,sink:url-redirect,sink:write-file,sink:xpath,sink:xslt,sink:xss,source:android-widget,source:contentprovider,source:remote,summary:taint,summary:value
+android.app,16,,103,,,,,,7,,,,,,,,9,,,,,,,,,,,,18,85
+android.content,24,27,100,,,,,,16,,,,,,,,,,8,,,,,,,,27,,31,69
+android.database,59,,30,,,,,,,,,,,,,,,,59,,,,,,,,,,30,
+android.net,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,45,15
+android.os,,,122,,,,,,,,,,,,,,,,,,,,,,,,,,41,81
+android.util,6,16,,,,,,,,,,,6,,,,,,,,,,,,,,,16,,
+android.webkit,3,2,,,,,,,,,,,,,,,,,,,,,,,3,,,2,,
+android.widget,,1,1,,,,,,,,,,,,,,,,,,,,,,,1,,,1,
+androidx.slice,2,5,88,,,,,,,,,,,,,,2,,,,,,,,,,5,,27,61
+cn.hutool.core.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.kryo.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.esotericsoftware.kryo5.io,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.fasterxml.jackson.core,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+com.fasterxml.jackson.databind,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+com.google.common.base,,,85,,,,,,,,,,,,,,,,,,,,,,,,,,62,23
+com.google.common.cache,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,17
+com.google.common.collect,,,553,,,,,,,,,,,,,,,,,,,,,,,,,,2,551
+com.google.common.flogger,29,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,
+com.google.common.io,6,,73,,,,,,,,,,,,,,,,,6,,,,,,,,,72,1
+com.opensymphony.xwork2.ognl,3,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+com.unboundid.ldap.sdk,17,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,
+flexjson,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+groovy.lang,26,,,,,26,,,,,,,,,,,,,,,,,,,,,,,,
+groovy.util,5,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,
+jakarta.faces.context,2,7,,,,,,,,,,,,,,,,,,,,,,,2,,,7,,
+jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
+jakarta.ws.rs.client,1,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
+jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
+jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,2,,,,,,,,94,55
+java.beans,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+java.io,37,,31,,15,,,,,,,,,,,,,,,,,22,,,,,,,31,
+java.lang,8,,58,,,,,,,,,,8,,,,,,,,,,,,,,,,46,12
+java.net,10,3,7,,,,,,,,,,,,,10,,,,,,,,,,,,3,7,
+java.nio,15,,6,,13,,,,,,,,,,,,,,,,,2,,,,,,,6,
+java.sql,7,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,
+java.util,34,,438,,,,,,,,,,34,,,,,,,,,,,,,,,,24,414
+javax.faces.context,2,7,,,,,,,,,,,,,,,,,,,,,,,2,,,7,,
+javax.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
+javax.management.remote,2,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
+javax.naming,7,,,,,,,,,,6,1,,,,,,,,,,,,,,,,,,
+javax.net.ssl,2,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,
+javax.script,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+javax.servlet,4,21,2,,,,3,1,,,,,,,,,,,,,,,,,,,,21,2,
+javax.validation,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,1,,
+javax.ws.rs.client,1,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
+javax.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
+javax.ws.rs.core,3,,149,,,,1,,,,,,,,,,,,,,2,,,,,,,,94,55
+javax.xml.transform,1,,6,,,,,,,,,,,,,,,,,,,,,1,,,,,6,
+javax.xml.xpath,3,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,
+jodd.json,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,10
+net.sf.saxon.s9api,5,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,
+ognl,6,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
+org.apache.commons.codec,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,6,
+org.apache.commons.collections,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
+org.apache.commons.collections4,,,800,,,,,,,,,,,,,,,,,,,,,,,,,,17,783
+org.apache.commons.io,93,2,565,,78,,,,,,,,,,,15,,,,,,,,,,,,2,551,14
+org.apache.commons.jexl2,15,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.jexl3,15,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,
+org.apache.commons.lang3,,,424,,,,,,,,,,,,,,,,,,,,,,,,,,293,131
+org.apache.commons.logging,6,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,
+org.apache.commons.ognl,6,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,
+org.apache.commons.text,,,272,,,,,,,,,,,,,,,,,,,,,,,,,,220,52
+org.apache.directory.ldap.client.api,1,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+org.apache.hc.core5.function,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.hc.core5.http,1,2,39,,,,,,,,,,,,,,,,,,,,,,1,,,2,39,
+org.apache.hc.core5.net,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,2,
+org.apache.hc.core5.util,,,24,,,,,,,,,,,,,,,,,,,,,,,,,,18,6
+org.apache.http,27,3,70,,,,,,,,,,,,,25,,,,,,,,,2,,,3,62,8
+org.apache.ibatis.jdbc,6,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,
+org.apache.log4j,11,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,
+org.apache.logging.log4j,359,,8,,,,,,,,,,359,,,,,,,,,,,,,,,,4,4
+org.apache.shiro.codec,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.apache.shiro.jndi,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+org.codehaus.groovy.control,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
+org.dom4j,20,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,
+org.hibernate,7,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,
+org.jboss.logging,324,,,,,,,,,,,,324,,,,,,,,,,,,,,,,,
+org.jooq,1,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
+org.json,,,236,,,,,,,,,,,,,,,,,,,,,,,,,,198,38
+org.mvel2,16,,,,,,,,,,,,,16,,,,,,,,,,,,,,,,
+org.scijava.log,13,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,
+org.slf4j,55,,6,,,,,,,,,,55,,,,,,,,,,,,,,,,2,4
+org.springframework.beans,,,26,,,,,,,,,,,,,,,,,,,,,,,,,,,26
+org.springframework.cache,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,13
+org.springframework.context,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+org.springframework.http,14,,70,,,,,,,,,,,,,14,,,,,,,,,,,,,60,10
+org.springframework.jdbc.core,10,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,
+org.springframework.jdbc.object,9,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,
+org.springframework.jndi,1,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+org.springframework.ldap,47,,,,,,,,,,33,14,,,,,,,,,,,,,,,,,,
+org.springframework.security.web.savedrequest,,6,,,,,,,,,,,,,,,,,,,,,,,,,,6,,
+org.springframework.ui,,,32,,,,,,,,,,,,,,,,,,,,,,,,,,,32
+org.springframework.util,,,139,,,,,,,,,,,,,,,,,,,,,,,,,,87,52
+org.springframework.validation,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,13,
+org.springframework.web.client,13,3,,,,,,,,,,,,,,13,,,,,,,,,,,,3,,
+org.springframework.web.context.request,,8,,,,,,,,,,,,,,,,,,,,,,,,,,8,,
+org.springframework.web.multipart,,12,13,,,,,,,,,,,,,,,,,,,,,,,,,12,13,
+org.springframework.web.reactive.function.client,2,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,
+org.springframework.web.util,,,163,,,,,,,,,,,,,,,,,,,,,,,,,,138,25
+org.xml.sax,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+org.xmlpull.v1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,,
+play.mvc,,4,,,,,,,,,,,,,,,,,,,,,,,,,,4,,
+ratpack.core.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+ratpack.core.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
+ratpack.core.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
+ratpack.exec,,,48,,,,,,,,,,,,,,,,,,,,,,,,,,,48
+ratpack.form,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,3,
+ratpack.func,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,35
+ratpack.handling,,6,4,,,,,,,,,,,,,,,,,,,,,,,,,6,4,
+ratpack.http,,10,10,,,,,,,,,,,,,,,,,,,,,,,,,10,10,
+ratpack.util,,,35,,,,,,,,,,,,,,,,,,,,,,,,,,,35
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -7,17 +7,17 @@ Java framework & library support
   :widths: auto

   Framework / library,Package,Flow sources,Taint & value steps,Sinks (total),`CWE‑022` :sub:`Path injection`,`CWE‑036` :sub:`Path traversal`,`CWE‑079` :sub:`Cross-site scripting`,`CWE‑089` :sub:`SQL injection`,`CWE‑090` :sub:`LDAP injection`,`CWE‑094` :sub:`Code injection`,`CWE‑319` :sub:`Cleartext transmission`
-   Android,``android.*``,45,308,93,,,3,67,,,
+   Android,``android.*``,46,416,108,,,3,67,,,
   `Apache Commons Collections <https://commons.apache.org/proper/commons-collections/>`_,"``org.apache.commons.collections``, ``org.apache.commons.collections4``",,1600,,,,,,,,
-   `Apache Commons IO <https://commons.apache.org/proper/commons-io/>`_,``org.apache.commons.io``,,22,,,,,,,,
-   `Apache Commons Lang <https://commons.apache.org/proper/commons-lang/>`_,``org.apache.commons.lang3``,,423,,,,,,,,
+   `Apache Commons IO <https://commons.apache.org/proper/commons-io/>`_,``org.apache.commons.io``,2,565,93,78,,,,,,15
+   `Apache Commons Lang <https://commons.apache.org/proper/commons-lang/>`_,``org.apache.commons.lang3``,,424,,,,,,,,
   `Apache Commons Text <https://commons.apache.org/proper/commons-text/>`_,``org.apache.commons.text``,,272,,,,,,,,
   `Apache HttpComponents <https://hc.apache.org/>`_,"``org.apache.hc.core5.*``, ``org.apache.http``",5,136,28,,,3,,,,25
-   `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,6,,6,,,,,
+   `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,35,,6,,,,,
   `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,,
-   Java Standard Library,``java.*``,3,524,30,13,,,7,,,10
+   Java Standard Library,``java.*``,3,541,111,28,,,7,,,10
   Java extensions,"``javax.*``, ``jakarta.*``",54,552,32,,,4,,1,1,2
-   `Spring <https://spring.io/>`_,``org.springframework.*``,29,469,91,,,,19,14,,29
-   Others,"``cn.hutool.core.codec``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.opensymphony.xwork2.ognl``, ``com.unboundid.ldap.sdk``, ``flexjson``, ``groovy.lang``, ``groovy.util``, ``jodd.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.apache.commons.codec``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.ognl``, ``org.apache.directory.ldap.client.api``, ``org.apache.ibatis.jdbc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.hibernate``, ``org.jooq``, ``org.mvel2``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``",39,99,151,,,,14,18,,
-   Totals,,175,5369,431,13,6,10,107,33,1,66
+   `Spring <https://spring.io/>`_,``org.springframework.*``,29,472,96,,,,19,14,,29
+   Others,"``androidx.slice``, ``cn.hutool.core.codec``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.opensymphony.xwork2.ognl``, ``com.unboundid.ldap.sdk``, ``flexjson``, ``groovy.lang``, ``groovy.util``, ``jodd.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.apache.commons.codec``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.logging``, ``org.apache.commons.ognl``, ``org.apache.directory.ldap.client.api``, ``org.apache.ibatis.jdbc``, ``org.apache.log4j``, ``org.apache.logging.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.hibernate``, ``org.jboss.logging``, ``org.jooq``, ``org.mvel2``, ``org.scijava.log``, ``org.slf4j``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``",44,283,921,,,,14,18,,
+   Totals,,183,6225,1424,106,6,10,107,33,1,81

--- a/java/old-change-notes/2020-05-21-mongodb-sql-injection-sinks.md
+++ b/java/old-change-notes/2020-05-21-mongodb-sql-injection-sinks.md
--- a/java/old-change-notes/2020-05-21-websocket-taintsource.md
+++ b/java/old-change-notes/2020-05-21-websocket-taintsource.md
--- a/java/old-change-notes/2020-06-30-jooq-sql-injection-sinks.md
+++ b/java/old-change-notes/2020-06-30-jooq-sql-injection-sinks.md
--- a/java/old-change-notes/2020-07-03-more-pathcreations.md
+++ b/java/old-change-notes/2020-07-03-more-pathcreations.md
--- a/java/old-change-notes/2020-07-09-untrusted-data-to-external-api.md
+++ b/java/old-change-notes/2020-07-09-untrusted-data-to-external-api.md
--- a/java/old-change-notes/2020-07-13-stacktraceexposure-fp-fix.md
+++ b/java/old-change-notes/2020-07-13-stacktraceexposure-fp-fix.md
--- a/java/old-change-notes/2020-08-11-printwriter-format-xss-sink.md
+++ b/java/old-change-notes/2020-08-11-printwriter-format-xss-sink.md
--- a/java/old-change-notes/2020-08-14-dataflow-dispatch-instance-arg-ctx.md
+++ b/java/old-change-notes/2020-08-14-dataflow-dispatch-instance-arg-ctx.md
--- a/java/old-change-notes/2020-08-17-string-formatted.md
+++ b/java/old-change-notes/2020-08-17-string-formatted.md
--- a/java/old-change-notes/2020-08-24-records-flow.md
+++ b/java/old-change-notes/2020-08-24-records-flow.md
--- a/java/old-change-notes/2020-08-31-extensible-security-queries.md
+++ b/java/old-change-notes/2020-08-31-extensible-security-queries.md
--- a/java/old-change-notes/2020-09-08-blockstmt.md
+++ b/java/old-change-notes/2020-09-08-blockstmt.md
--- a/java/old-change-notes/2020-09-17-exectainted-array.md
+++ b/java/old-change-notes/2020-09-17-exectainted-array.md
--- a/java/old-change-notes/2020-09-21-jhipster-gen-prng-query.md
+++ b/java/old-change-notes/2020-09-21-jhipster-gen-prng-query.md
--- a/java/old-change-notes/2020-09-22-hibernate-sql-sinks.md
+++ b/java/old-change-notes/2020-09-22-hibernate-sql-sinks.md
--- a/java/old-change-notes/2020-09-23-spring-multipart-request-sources.md
+++ b/java/old-change-notes/2020-09-23-spring-multipart-request-sources.md
--- a/java/old-change-notes/2020-10-03-android-intent-taintsource.md
+++ b/java/old-change-notes/2020-10-03-android-intent-taintsource.md
--- a/java/old-change-notes/2020-10-07-fastjson-deserialization-sink.md
+++ b/java/old-change-notes/2020-10-07-fastjson-deserialization-sink.md
--- a/java/old-change-notes/2020-10-16-guava-flow-steps.md
+++ b/java/old-change-notes/2020-10-16-guava-flow-steps.md
--- a/java/old-change-notes/2020-10-27-insecure-bean-validation.md
+++ b/java/old-change-notes/2020-10-27-insecure-bean-validation.md
--- a/java/old-change-notes/2020-11-04-commonslang-unsafe-deserialization-sinks.md
+++ b/java/old-change-notes/2020-11-04-commonslang-unsafe-deserialization-sinks.md
--- a/java/old-change-notes/2020-12-09-xxe-fp-fix.md
+++ b/java/old-change-notes/2020-12-09-xxe-fp-fix.md
--- a/java/old-change-notes/2021-01-12-unsafe-hostname-verification.md
+++ b/java/old-change-notes/2021-01-12-unsafe-hostname-verification.md
--- a/java/old-change-notes/2021-01-14-java-15-support.md
+++ b/java/old-change-notes/2021-01-14-java-15-support.md
--- a/java/old-change-notes/2021-01-19-struts-xml-extraction.md
+++ b/java/old-change-notes/2021-01-19-struts-xml-extraction.md
--- a/java/old-change-notes/2021-02-09-commons-string-utils.md
+++ b/java/old-change-notes/2021-02-09-commons-string-utils.md
--- a/java/old-change-notes/2021-02-15-commons-array-utils.md
+++ b/java/old-change-notes/2021-02-15-commons-array-utils.md
--- a/java/old-change-notes/2021-02-15-snakeyaml-fn-fix.md
+++ b/java/old-change-notes/2021-02-15-snakeyaml-fn-fix.md
--- a/java/old-change-notes/2021-02-17-apache-http.md
+++ b/java/old-change-notes/2021-02-17-apache-http.md
--- a/java/old-change-notes/2021-02-23-deprecated-jcenter-bintray.md
+++ b/java/old-change-notes/2021-02-23-deprecated-jcenter-bintray.md
--- a/java/old-change-notes/2021-03-01-fluent-interface-data-flow.md
+++ b/java/old-change-notes/2021-03-01-fluent-interface-data-flow.md
--- a/java/old-change-notes/2021-03-02-apache-text-misc.md
+++ b/java/old-change-notes/2021-03-02-apache-text-misc.md
--- a/java/old-change-notes/2021-03-02-guava-io.md
+++ b/java/old-change-notes/2021-03-02-guava-io.md
--- a/java/old-change-notes/2021-03-05-commons-lang-randomutils.md
+++ b/java/old-change-notes/2021-03-05-commons-lang-randomutils.md
--- a/java/old-change-notes/2021-03-05-commons-object-utils.md
+++ b/java/old-change-notes/2021-03-05-commons-object-utils.md
--- a/java/old-change-notes/2021-03-05-play-framework.md
+++ b/java/old-change-notes/2021-03-05-play-framework.md
--- a/java/old-change-notes/2021-03-05-regex-utils.md
+++ b/java/old-change-notes/2021-03-05-regex-utils.md
--- a/java/old-change-notes/2021-03-10-guava-base.md
+++ b/java/old-change-notes/2021-03-10-guava-base.md
--- a/java/old-change-notes/2021-03-11-commons-strbuilder.md
+++ b/java/old-change-notes/2021-03-11-commons-strbuilder.md
--- a/java/old-change-notes/2021-03-18-commons-tostring-builder.md
+++ b/java/old-change-notes/2021-03-18-commons-tostring-builder.md
--- a/java/old-change-notes/2021-03-22-jax-rs-improvements.md
+++ b/java/old-change-notes/2021-03-22-jax-rs-improvements.md
--- a/java/old-change-notes/2021-03-23-guava-collections-and-preconditions.md
+++ b/java/old-change-notes/2021-03-23-guava-collections-and-preconditions.md
--- a/java/old-change-notes/2021-03-25-remove-legacy-code-duplication-library.md
+++ b/java/old-change-notes/2021-03-25-remove-legacy-code-duplication-library.md
--- a/java/old-change-notes/2021-03-25-remove-legacy-filter-queries.md
+++ b/java/old-change-notes/2021-03-25-remove-legacy-filter-queries.md
--- a/java/old-change-notes/2021-04-02-add-spring-validation-errors.md
+++ b/java/old-change-notes/2021-04-02-add-spring-validation-errors.md
--- a/java/old-change-notes/2021-04-06-ssrf-query.md
+++ b/java/old-change-notes/2021-04-06-ssrf-query.md
--- a/java/old-change-notes/2021-04-14-membertype.md
+++ b/java/old-change-notes/2021-04-14-membertype.md
--- a/java/old-change-notes/2021-04-26-xpath-injection-query.md
+++ b/java/old-change-notes/2021-04-26-xpath-injection-query.md
--- a/java/old-change-notes/2021-05-03-guava-first-non-null.md
+++ b/java/old-change-notes/2021-05-03-guava-first-non-null.md
--- a/java/old-change-notes/2021-05-03-jackson-dataflow-deserialization.md
+++ b/java/old-change-notes/2021-05-03-jackson-dataflow-deserialization.md
--- a/java/old-change-notes/2021-05-04-jexl-injection-query.md
+++ b/java/old-change-notes/2021-05-04-jexl-injection-query.md
--- a/java/old-change-notes/2021-05-05-kryo-improvements.md
+++ b/java/old-change-notes/2021-05-05-kryo-improvements.md
--- a/java/old-change-notes/2021-05-06-unsafe-android-access-query.md
+++ b/java/old-change-notes/2021-05-06-unsafe-android-access-query.md
--- a/java/old-change-notes/2021-05-11-apache-tuples.md
+++ b/java/old-change-notes/2021-05-11-apache-tuples.md
--- a/java/old-change-notes/2021-05-11-ratpack-support.md
+++ b/java/old-change-notes/2021-05-11-ratpack-support.md
--- a/java/old-change-notes/2021-05-12-hardcoded-azure-credentials-in-api-call.md
+++ b/java/old-change-notes/2021-05-12-hardcoded-azure-credentials-in-api-call.md
--- a/java/old-change-notes/2021-05-12-xxe-fp-fix.md
+++ b/java/old-change-notes/2021-05-12-xxe-fp-fix.md
--- a/java/old-change-notes/2021-05-13-ognl-injection-query.md
+++ b/java/old-change-notes/2021-05-13-ognl-injection-query.md
--- a/java/old-change-notes/2021-05-14-close-resource-leaks-improvements.md
+++ b/java/old-change-notes/2021-05-14-close-resource-leaks-improvements.md
--- a/java/old-change-notes/2021-05-17-add-unsafe-deserialization-sinks.md
+++ b/java/old-change-notes/2021-05-17-add-unsafe-deserialization-sinks.md
--- a/java/old-change-notes/2021-05-17-jackson-deserialization-sink.md
+++ b/java/old-change-notes/2021-05-17-jackson-deserialization-sink.md
--- a/java/old-change-notes/2021-05-17-missing-jwt-signature-check-query.md
+++ b/java/old-change-notes/2021-05-17-missing-jwt-signature-check-query.md
--- a/java/old-change-notes/2021-05-20-jndi-injection-query.md
+++ b/java/old-change-notes/2021-05-20-jndi-injection-query.md
--- a/java/old-change-notes/2021-05-20-savedrequest-taintsources.md
+++ b/java/old-change-notes/2021-05-20-savedrequest-taintsources.md
--- a/java/old-change-notes/2021-05-24-hardcoded-shiro-key-in-api-call.md
+++ b/java/old-change-notes/2021-05-24-hardcoded-shiro-key-in-api-call.md
--- a/java/old-change-notes/2021-05-28-remove-senderror-xss-sink.md
+++ b/java/old-change-notes/2021-05-28-remove-senderror-xss-sink.md
--- a/java/old-change-notes/2021-05-31-add-spring-stringutils.md
+++ b/java/old-change-notes/2021-05-31-add-spring-stringutils.md
--- a/java/old-change-notes/2021-06-01-collection-flow.md
+++ b/java/old-change-notes/2021-06-01-collection-flow.md
--- a/java/old-change-notes/2021-06-01-insecure-basic-auth-query.md
+++ b/java/old-change-notes/2021-06-01-insecure-basic-auth-query.md
--- a/java/old-change-notes/2021-06-01-statement-toString.md
+++ b/java/old-change-notes/2021-06-01-statement-toString.md
--- a/java/old-change-notes/2021-06-02-mvel-injection-query.md
+++ b/java/old-change-notes/2021-06-02-mvel-injection-query.md
--- a/java/old-change-notes/2021-06-08-spel-injection-query.md
+++ b/java/old-change-notes/2021-06-08-spel-injection-query.md
--- a/java/old-change-notes/2021-06-08-spring-http.md
+++ b/java/old-change-notes/2021-06-08-spring-http.md
--- a/java/old-change-notes/2021-06-08-spring-propertyvalues.md
+++ b/java/old-change-notes/2021-06-08-spring-propertyvalues.md
--- a/java/old-change-notes/2021-06-11-tainted-key-read-steps.md
+++ b/java/old-change-notes/2021-06-11-tainted-key-read-steps.md
--- a/java/old-change-notes/2021-06-14-groovy-code-injection-query.md
+++ b/java/old-change-notes/2021-06-14-groovy-code-injection-query.md
--- a/java/old-change-notes/2021-06-16-xslt-injection-query.md
+++ b/java/old-change-notes/2021-06-16-xslt-injection-query.md
--- a/java/old-change-notes/2021-06-18-apache-mutable.md
+++ b/java/old-change-notes/2021-06-18-apache-mutable.md
--- a/java/old-change-notes/2021-06-18-insecure-java-mail-query.md
+++ b/java/old-change-notes/2021-06-18-insecure-java-mail-query.md
--- a/java/old-change-notes/2021-06-22-more-steps-for-bytebuffer-inputstream.md
+++ b/java/old-change-notes/2021-06-22-more-steps-for-bytebuffer-inputstream.md
--- a/java/old-change-notes/2021-06-22-util-optional.md
+++ b/java/old-change-notes/2021-06-22-util-optional.md
--- a/java/old-change-notes/2021-06-23-generic-type-names.md
+++ b/java/old-change-notes/2021-06-23-generic-type-names.md
--- a/java/old-change-notes/2021-06-24-dataflow-implicit-reads.md
+++ b/java/old-change-notes/2021-06-24-dataflow-implicit-reads.md
--- a/java/old-change-notes/2021-06-25-apache-collections-maputils-keyvalue.md
+++ b/java/old-change-notes/2021-06-25-apache-collections-maputils-keyvalue.md
--- a/java/old-change-notes/2021-06-25-jax-rs-content-types.md
+++ b/java/old-change-notes/2021-06-25-jax-rs-content-types.md
--- a/java/old-change-notes/2021-06-29-javax-json-models.md
+++ b/java/old-change-notes/2021-06-29-javax-json-models.md
--- a/java/old-change-notes/2021-07-01-spring-collections.md
+++ b/java/old-change-notes/2021-07-01-spring-collections.md
--- a/java/old-change-notes/2021-07-01-spring-webmultipart.md
+++ b/java/old-change-notes/2021-07-01-spring-webmultipart.md
--- a/java/old-change-notes/2021-07-01-spring-webutil.md
+++ b/java/old-change-notes/2021-07-01-spring-webutil.md
--- a/java/old-change-notes/2021-07-01-url-classloader-reactive-webclient.md
+++ b/java/old-change-notes/2021-07-01-url-classloader-reactive-webclient.md
--- a/java/old-change-notes/2021-07-02-split-queries.md
+++ b/java/old-change-notes/2021-07-02-split-queries.md
--- a/java/old-change-notes/2021-07-14-spring-jdbc.md
+++ b/java/old-change-notes/2021-07-14-spring-jdbc.md
--- a/java/old-change-notes/2021-07-19-json-java.md
+++ b/java/old-change-notes/2021-07-19-json-java.md
--- a/java/old-change-notes/2021-07-22-model-collection-constructors.md
+++ b/java/old-change-notes/2021-07-22-model-collection-constructors.md
--- a/java/old-change-notes/2021-07-27-apache-collections-base-package.md
+++ b/java/old-change-notes/2021-07-27-apache-collections-base-package.md
--- a/java/old-change-notes/2021-07-28-guava-cache.md
+++ b/java/old-change-notes/2021-07-28-guava-cache.md
--- a/java/old-change-notes/2021-08-02-android-intent-redirect-query.md
+++ b/java/old-change-notes/2021-08-02-android-intent-redirect-query.md
--- a/Show More
+++ b/Show More