From a5789263fcfe72e0c6193cc9edcca4527f781ea0 Mon Sep 17 00:00:00 2001
From: asya-vorobeva <asya-vorobeva@users.noreply.github.com>
Date: Thu, 22 Oct 2026 11:55:39 +0000
Subject: [PATCH 1/3] Update rule metadata

---
 .../org/sonar/l10n/java/rules/java/S106.html  |   2 +-
 .../org/sonar/l10n/java/rules/java/S1166.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S1313.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S1989.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2053.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2068.html |   7 +-
 .../org/sonar/l10n/java/rules/java/S2077.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2092.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2115.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S2119.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2245.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2254.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2257.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2612.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S2647.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S2658.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S3329.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S3330.html |   3 +-
 .../org/sonar/l10n/java/rules/java/S3751.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S3752.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4036.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4288.html |   1 +
 .../org/sonar/l10n/java/rules/java/S4288.json |   7 +-
 .../org/sonar/l10n/java/rules/java/S4347.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4423.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S4426.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S4433.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4434.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4502.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4507.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4512.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4544.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4601.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4684.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S4790.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S4830.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S5042.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S5122.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5247.html |   3 +-
 .../org/sonar/l10n/java/rules/java/S5301.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5332.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5344.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5443.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S5527.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S5542.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S5547.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S5659.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5679.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5689.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5693.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5804.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5808.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S5838.html |  61 +++++------
 .../org/sonar/l10n/java/rules/java/S5876.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S6301.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S6362.html |   5 +-
 .../org/sonar/l10n/java/rules/java/S6363.html |   4 +-
 .../org/sonar/l10n/java/rules/java/S6418.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S6432.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S6437.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S6809.html |  73 ++++++-------
 .../org/sonar/l10n/java/rules/java/S6862.html |   1 +
 .../org/sonar/l10n/java/rules/java/S6862.json |   6 +-
 .../org/sonar/l10n/java/rules/java/S7158.html |  30 ++++++
 .../org/sonar/l10n/java/rules/java/S7158.json |   2 +-
 .../org/sonar/l10n/java/rules/java/S9352.html |  21 ++--
 .../org/sonar/l10n/java/rules/java/S9387.json |   3 +-
 .../org/sonar/l10n/java/rules/java/S9390.html |   2 +-
 .../org/sonar/l10n/java/rules/java/S9412.json |   2 +-
 .../org/sonar/l10n/java/rules/java/S9413.html |  82 ++++++--------
 .../org/sonar/l10n/java/rules/java/S9428.html |   6 +-
 .../org/sonar/l10n/java/rules/java/S9428.json |   2 +-
 .../org/sonar/l10n/java/rules/java/S9433.html | 101 ++++++++++++++----
 .../resources/profiles/Sonar_agentic_AI/S6862 |   0
 .../main/resources/profiles/Sonar_way/S6862   |   0
 .../main/resources/profiles/Sonar_way/S9391   |   0
 sonarpedia.json                               |   2 +-
 77 files changed, 311 insertions(+), 245 deletions(-)
 delete mode 100644 sonar-java-plugin/src/main/resources/profiles/Sonar_agentic_AI/S6862
 delete mode 100644 sonar-java-plugin/src/main/resources/profiles/Sonar_way/S6862
 delete mode 100644 sonar-java-plugin/src/main/resources/profiles/Sonar_way/S9391

diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S106.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S106.html
index 7b01700531a..c5fdcf0e340 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S106.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S106.html
@@ -39,7 +39,7 @@ <h3>Documentation</h3>
   <li><a href="https://docs.oracle.com/javase/7/docs/api/java/util/logging/Logger.html">Java SE 7 API Specification: java.util.logging.Logger</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/">Top 10 2021 Category A9 - Security Logging and
   Monitoring Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li><a
   href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err02-j">CERT,
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1166.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1166.html
index dddaeb9d984..2b5accbd4e3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1166.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1166.html
@@ -82,8 +82,8 @@ <h2>Resources</h2>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/">Top 10 2021 Category A9 - Security Logging and
   Monitoring Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">Top 10 2017 Category A10 -
-  Insufficient Logging &amp; Monitoring</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xaa-logging-detection-response.md">Top 10 2017 Category A10 - Insufficient
+  Logging &amp; Monitoring</a></li>
   <li><a
   href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err00-j">CERT,
   ERR00-J.</a> - Do not suppress or ignore checked exceptions</li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.html
index a94f0644a77..09f02cbaaaf 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.html
@@ -47,7 +47,7 @@ <h3>Standards</h3>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/547">CWE-547 - Use of Hard-coded, Security-relevant Constants</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1989.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1989.html
index 8cb24a12f92..a3139351224 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1989.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1989.html
@@ -43,7 +43,7 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <h3>Articles &amp; blog posts</h3>
 <ul>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/600">CWE-600 - Uncaught Exception in Servlet</a></li>
   <li><a
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html
index 08c9a14e73c..0424ebb7972 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html
@@ -66,7 +66,7 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://www.owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2023-risks/m10-insufficient-cryptography.html">Mobile Top 10 2024 Category
   M10 - Insufficient Cryptography</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.html
index 6dd7dc915d9..ad1b41bc703 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.html
@@ -8,6 +8,9 @@ <h2>Why is this an issue?</h2>
   <li><a href="https://www.cve.org/CVERecord?id=CVE-2019-13466">CVE-2019-13466</a></li>
   <li><a href="https://www.cve.org/CVERecord?id=CVE-2018-15389">CVE-2018-15389</a></li>
 </ul>
+<p>This rule also examines the credential value itself: a value that is recognizable as something other than a real credential is not reported, even
+when the variable name or the connection string parameter matches one of the configured words. Placeholders, references to an environment variable or
+to a secrets manager, encrypted values, and obvious example or test values are therefore not flagged.</p>
 <h2>How to fix it</h2>
 <p>Credentials should be stored in a configuration file that is not committed to the code repository, in a database, or managed by your cloud
 provider’s secrets management service. If a password is exposed in the source code, it must be changed immediately.</p>
@@ -15,7 +18,7 @@ <h3>Code Examples</h3>
 <h4>Noncompliant code example</h4>
 <pre data-diff-id="1" data-diff-type="noncompliant">
 String username = "steve";
-String password = "blue";
+String password = "Xk9mP2vL8qR4";
 Connection conn = DriverManager.getConnection("jdbc:mysql://localhost/test?" +
                   "user=" + username + "&amp;password=" + password); // Noncompliant
 </pre>
@@ -30,7 +33,7 @@ <h2>Resources</h2>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/798">CWE-798 - Use of Hard-coded Credentials</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/259">CWE-259 - Use of Hard-coded Password</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
index 00f6d99b765..19d0fcd99b6 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
@@ -75,7 +75,7 @@ <h3>Articles &amp; blog posts</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A03_2021-Injection/">Top 10 2021 Category A3 - Injection</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A1_2017-Injection">Top 10 2017 Category A1 - Injection</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa1-injection.md">Top 10 2017 Category A1 - Injection</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/89">CWE-89 - Improper Neutralization of Special Elements used in an SQL Command</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/943">CWE-943 - Improper Neutralization of Special Elements in Data Query Logic</a></li>
   <li><a
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html
index b6811fa8c40..687a0c03813 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.html
@@ -37,7 +37,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/311">CWE-311 - Missing Encryption of Sensitive Data</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/315">CWE-315 - Cleartext Storage of Sensitive Information in a Cookie</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2115.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2115.html
index 569463b2e72..66eea71c384 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2115.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2115.html
@@ -62,9 +62,9 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/521">CWE-521 - Weak Password Requirements</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2119.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2119.html
index 8a5b50de79a..064ac70d5ee 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2119.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2119.html
@@ -37,7 +37,7 @@ <h3>Documentation</h3>
 </ul>
 <h3>Articles &amp; blog posts</h3>
 <ul>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li><a href="https://www.baeldung.com/java-generating-random-numbers">Baeldung - generating random number</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2245.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2245.html
index fda245ce119..6feba441fb5 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2245.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2245.html
@@ -38,7 +38,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/338">CWE-338 - Use of Cryptographically Weak Pseudo-Random Number Generator
   (PRNG)</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html
index 2ef8f741f05..39a2299d725 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.html
@@ -46,7 +46,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/807">CWE-807 - Reliance on Untrusted Inputs in a Security Decision</a></li>
   <li>STIG Viewer - <a href="https://stigviewer.com/stigs/application_security_and_development/2024-12-06/finding/V-222582">Application Security and
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2257.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2257.html
index c9e8bb7ae92..90799ad52f0 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2257.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2257.html
@@ -30,7 +30,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/327">CWE-327 - Use of a Broken or Risky Cryptographic Algorithm</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html
index cebcd0f6617..e7872eeb606 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.html
@@ -74,8 +74,8 @@ <h3>Standards</h3>
   Development: V-222430</a> - The application must execute without excessive account permissions</li>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A5_2017-Broken_Access_Control">Top 10 2017 Category A5 - Broken Access Control -
-  OWASP Top 10 2017</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa5-broken-access-control.md">Top 10 2017 Category A5 - Broken Access
+  Control - OWASP Top 10 2017</a></li>
   <li>CERT FIO01-J - <a
   href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/input-output-fio/fio01-j">CERT guideline for
   creating files with appropriate access permissions in Java</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html
index 1b398e5ae44..f0827955bee 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.html
@@ -100,7 +100,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li><a href="https://cheatsheetseries.owasp.org/cheatsheets/Web_Service_Security_Cheat_Sheet.html#user-authentication">OWASP Web Service Security
   Cheat Sheet</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2658.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2658.html
index be30a3aff57..3405da943be 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2658.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2658.html
@@ -10,7 +10,7 @@ <h3>Noncompliant code example</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A1_2017-Injection">Top 10 2017 Category A1 - Injection</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa1-injection.md">Top 10 2017 Category A1 - Injection</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/470">CWE-470 - Use of Externally-Controlled Input to Select Classes or Code ('Unsafe
   Reflection')</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3329.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3329.html
index 3e4e334beb6..f7c1bc69ffe 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3329.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3329.html
@@ -112,9 +112,9 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography.html">Mobile Top 10 2016 Category M5
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html
index 5032c95c2c5..c4f34d0bf0c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.html
@@ -32,8 +32,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A7_2017-Cross-Site_Scripting_(XSS)">Top 10 2017 Category A7 - Cross-Site Scripting
-  (XSS)</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa7-xss.md">Top 10 2017 Category A7 - Cross-Site Scripting (XSS)</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/1004">CWE-1004 - Sensitive Cookie Without 'HttpOnly' Flag</a></li>
   <li>STIG Viewer - <a href="https://stigviewer.com/stigs/application_security_and_development/2024-12-06/finding/V-222575">Application Security and
   Development: V-222575</a> - The application must set the HTTPOnly flag on session cookies.</li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3751.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3751.html
index 2ebee66991b..bcecadccbfc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3751.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3751.html
@@ -20,7 +20,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3752.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3752.html
index 707a8fa3e86..f5f8c24a2be 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3752.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3752.html
@@ -42,7 +42,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A5_2017-Broken_Access_Control">Top 10 2017 Category A5 - Broken Access
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa5-broken-access-control.md">Top 10 2017 Category A5 - Broken Access
   Control</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/352">CWE-352 - Cross-Site Request Forgery (CSRF)</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4036.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4036.html
index 45265ad706b..35156d77755 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4036.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4036.html
@@ -38,7 +38,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">Top 10 2021 Category A8 - Software and Data Integrity
   Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A1_2017-Injection">Top 10 2017 Category A1 - Injection</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa1-injection.md">Top 10 2017 Category A1 - Injection</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/426">CWE-426 - Untrusted Search Path</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/427">CWE-427 - Uncontrolled Search Path Element</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.html
index d00bb15943d..a118100da81 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.html
@@ -1,3 +1,4 @@
+<p>This rule is deprecated; use {rule:java:S6813} instead.</p>
 <h2>Why is this an issue?</h2>
 <p>Spring <code>@Controller</code>, <code>@Service</code>, and <code>@Repository</code> classes are singletons by default, meaning only one instance
 of the class is ever instantiated in the application. Typically such a class might have a few <code>static</code> members, such as a logger, but all
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.json
index c70a6818f60..ee419381154 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4288.json
@@ -7,16 +7,13 @@
     },
     "attribute": "CONVENTIONAL"
   },
-  "status": "ready",
+  "status": "deprecated",
   "remediation": {
     "func": "Linear",
     "linearDesc": "2min by injected field",
     "linearFactor": "2min"
   },
-  "tags": [
-    "spring",
-    "design"
-  ],
+  "tags": [],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-4288",
   "sqKey": "S4288",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4347.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4347.html
index 0cfd315392c..ca4954a4539 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4347.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4347.html
@@ -64,7 +64,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2023-risks/m10-insufficient-cryptography.html">Mobile Top 10 2024 Category
   M10 - Insufficient Cryptography</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4423.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4423.html
index 03085df7a47..de2d7ad3bc2 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4423.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4423.html
@@ -134,9 +134,9 @@ <h3>Standards</h3>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography.html">Mobile Top 10 2016 Category M5
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4426.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4426.html
index ed6d601f015..8c821af9b15 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4426.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4426.html
@@ -171,9 +171,9 @@ <h3>Articles &amp; blog posts</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://www.owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography.html">Mobile Top 10 2016 Category M5
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4433.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4433.html
index ef39a87f81c..556dc6fc2aa 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4433.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4433.html
@@ -68,7 +68,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/521">CWE-521 - Weak Password Requirements</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4434.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4434.html
index 96795934208..80928b912c3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4434.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4434.html
@@ -41,7 +41,7 @@ <h3>Standards</h3>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/502">CWE-502 - Deserialization of Untrusted Data</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">Top 10 2021 Category A8 - Software and Data Integrity
   Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A8_2017-Insecure_Deserialization">Top 10 2017 Category A8 - Insecure
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa8-insecure-deserialization.md">Top 10 2017 Category A8 - Insecure
   Deserialization</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html
index 26de1555c7e..9efeb3181f4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html
@@ -54,7 +54,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/352">CWE-352 - Cross-Site Request Forgery (CSRF)</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>STIG Viewer - <a href="https://stigviewer.com/stigs/application_security_and_development/2024-12-06/finding/V-222603">Application Security and
   Development: V-222603</a> - The application must protect from Cross-Site Request Forgery (CSRF) vulnerabilities.</li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.html
index 2264cf176b1..b95bcf538a5 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.html
@@ -91,7 +91,7 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/489">CWE-489 - Active Debug Code</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/215">CWE-215 - Information Exposure Through Debug Information</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.html
index 6138c4c4717..1c7353b5475 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.html
@@ -49,6 +49,6 @@ <h3>Standards</h3>
   <li>OWASP - <a href="https://owasp.org/Top10/A03_2021-Injection/">Top 10 2021 Category A3 - Injection</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">Top 10 2021 Category A8 - Software and Data Integrity
   Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A1_2017-Injection">Top 10 2017 Category A1 - Injection</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa1-injection.md">Top 10 2017 Category A1 - Injection</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4544.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4544.html
index a07e7557db4..12b675dd8ae 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4544.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4544.html
@@ -46,7 +46,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">Top 10 2021 Category A8 - Software and Data Integrity
   Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A8_2017-Insecure_Deserialization">Top 10 2017 Category A8 - Insecure
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa8-insecure-deserialization.md">Top 10 2017 Category A8 - Insecure
   Deserialization</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/502">CWE-502 - Deserialization of Untrusted Data</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4601.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4601.html
index 95ae62319aa..2ace98cf0df 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4601.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4601.html
@@ -61,7 +61,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 - Category A1 - Broken Access Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 - Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 - Category A6 - Security
   Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/285">CWE-285 - Improper Authorization</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/287">CWE-287 - Improper Authentication</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4684.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4684.html
index d08dc6b06c4..56fd11dc93a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4684.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4684.html
@@ -89,7 +89,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">Top 10 2021 - Category A8 - Software and Data Integrity
   Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A5_2017-Broken_Access_Control">Top 10 2017 - Category A5 - Broken Access
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa5-broken-access-control.md">Top 10 2017 - Category A5 - Broken Access
   Control</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/915">CWE-915 - Improperly Controlled Modification of Dynamically-Determined Object
   Attributes</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4790.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4790.html
index 83046a4af38..6066cb7eb5a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4790.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4790.html
@@ -38,9 +38,9 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/1240">CWE-1240 - Use of a Risky Cryptographic Primitive</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html
index a8ecd3304d5..65164ffec1e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html
@@ -61,9 +61,9 @@ <h3>Standards</h3>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2016-risks/m3-insecure-communication.html">Mobile Top 10 2016 Category M3 -
   Insecure Communication</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.html
index 5c728b672bb..da3ce8e546c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.html
@@ -83,9 +83,9 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A5_2017-Broken_Access_Control">Top 10 2017 Category A5 - Broken Access
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa5-broken-access-control.md">Top 10 2017 Category A5 - Broken Access
   Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/409">CWE-409 - Improper Handling of Highly Compressed Data (Data Amplification)</a></li>
   <li>CERT - <a
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5122.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5122.html
index e33048598bf..a6b390c06bc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5122.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5122.html
@@ -141,7 +141,7 @@ <h3>Standards</h3>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/346">CWE-346 - Origin Validation Error</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/942">CWE-942 - Permissive Cross-domain Security Policy with Untrusted Domains</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5247.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5247.html
index 08c0d2849ac..aa406fd7fc3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5247.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5247.html
@@ -48,7 +48,6 @@ <h3>Standards</h3>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/79">CWE-79 - Improper Neutralization of Input During Web Page Generation ('Cross-site
   Scripting')</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A03_2021-Injection/">Top 10 2021 Category A3 - Injection</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A7_2017-Cross-Site_Scripting_(XSS)">Top 10 2017 Category A7 - Cross-Site Scripting
-  (XSS)</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa7-xss.md">Top 10 2017 Category A7 - Cross-Site Scripting (XSS)</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5301.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5301.html
index 9d9045a5889..4db160aa69a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5301.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5301.html
@@ -60,7 +60,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">Top 10 2021 - Category A8 - Software and Data Integrity
   Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A8_2017-Insecure_Deserialization">Top 10 2017 - Category A8 - Insecure
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa8-insecure-deserialization.md">Top 10 2017 - Category A8 - Insecure
   Deserialization</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/502">CWE-502 - Deserialization of Untrusted Data</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html
index 6bcb93b6666..beb8f5308ab 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html
@@ -105,7 +105,7 @@ <h3>Articles &amp; blog posts</h3>
 </ul>
 <h3>Standards</h3>
 <ul>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-NETWORK/">Mobile AppSec Verification Standard - Network Communication
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html
index e2f0cad1cc2..ffb38771d4e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.html
@@ -133,7 +133,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2023-risks/m10-insufficient-cryptography.html">Mobile Top 10 2024 Category
   M10 - Insufficient Cryptography</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html
index 3abb4405e93..f466843eec9 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.html
@@ -77,9 +77,9 @@ <h3>Articles &amp; blog posts</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A5_2017-Broken_Access_Control">Top 10 2017 Category A5 - Broken Access
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa5-broken-access-control.md">Top 10 2017 Category A5 - Broken Access
   Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/377">CWE-377 - Insecure Temporary File</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/379">CWE-379 - Creation of Temporary File in Directory with Incorrect Permissions</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html
index 3af6e7bc439..63b4b2b097f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html
@@ -195,9 +195,9 @@ <h3>Standards</h3>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-NETWORK/">Mobile AppSec Verification Standard - Network Communication
   Requirements</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5542.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5542.html
index 14889a70cc1..9e45d94f6c6 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5542.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5542.html
@@ -126,9 +126,9 @@ <h3>Articles &amp; blog posts</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography.html">Mobile Top 10 2016 Category M5
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html
index 1255b0bd9dc..4b184db3ad1 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.html
@@ -63,9 +63,9 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography.html">Mobile Top 10 2016 Category M5
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5659.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5659.html
index 7c33e8dcb0f..b0e0a121036 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5659.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5659.html
@@ -178,7 +178,7 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/347">CWE-347 - Improper Verification of Cryptographic Signature</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5679.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5679.html
index b81931a70dc..4360d34355b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5679.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5679.html
@@ -88,7 +88,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5689.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5689.html
index dc188af34fb..8c6a06c75df 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5689.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5689.html
@@ -40,7 +40,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/200">CWE-200 - Information Exposure</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5693.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5693.html
index 89609b7738c..16215b2378c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5693.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5693.html
@@ -51,7 +51,7 @@ <h3>Articles &amp; blog posts</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/770">CWE-770 - Allocation of Resources Without Limits or Throttling</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/400">CWE-400 - Uncontrolled Resource Consumption</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5804.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5804.html
index 57510f94e2e..8cb5ef6945c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5804.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5804.html
@@ -85,7 +85,7 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/200">CWE-200 - Exposure of Sensitive Information to an Unauthorized Actor</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/203">CWE-203 - Observable Discrepancy</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5808.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5808.html
index 7d1efdf5a0d..0401d3c8466 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5808.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5808.html
@@ -103,7 +103,7 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A5_2017-Broken_Access_Control">Top 10 2017 Category A5 - Broken Access
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa5-broken-access-control.md">Top 10 2017 Category A5 - Broken Access
   Control</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/285">CWE-285 - Improper Authorization</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5838.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5838.html
index 85152013790..ac6c4331021 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5838.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5838.html
@@ -1,9 +1,22 @@
 <h2>Why is this an issue?</h2>
-<p>AssertJ contains many assertions methods specific to common types. Both versions will test the same things, but the dedicated one will provide a
-better error message, simplifying the debugging process.</p>
-<p>This rule reports an issue when an assertion can be simplified to a dedicated one.</p>
-<p>The array below gives a non-exhaustive list of assertion reported by the rule. Code behaving similarly, or with a negation will also be
-reported.</p>
+<p>A dedicated AssertJ assertion receives the value under test, so its failure message can show that value. For example, when
+<code>assertThat(names).contains("Ada")</code> fails, it shows the collection and the missing element.
+<code>assertThat(names.contains("Ada")).isTrue()</code> only reports that <code>false</code> was not <code>true</code>.</p>
+<h3>Noncompliant code example</h3>
+<pre data-diff-id="1" data-diff-type="noncompliant">
+assertThat(names.contains("Ada")).isTrue(); // Noncompliant
+</pre>
+<h3>Compliant solution</h3>
+<pre data-diff-id="1" data-diff-type="compliant">
+assertThat(names).contains("Ada");
+</pre>
+<h3>Dedicated assertions by type</h3>
+<p>The following catalog is not exhaustive. Similar assertions and negated forms may also be reported. Choose a matcher that expresses the intended
+test, and check the AssertJ version used by the project.</p>
+<p>The object-identity mapping for <code>x == y</code> applies to reference values. Check null and edge-case behavior when replacing a derived
+expression: for example, <code>map.get(key)</code> can return <code>null</code> for a missing key, whereas <code>containsEntry(key, null)</code>
+requires the key to exist. For floating-point values, check NaN and signed-zero behavior rather than assuming a relational-expression rewrite is
+equivalent.</p>
 <table>
   <colgroup>
     <col style="width: 50%;">
@@ -210,14 +223,6 @@ <h2>Why is this an issue?</h2>
         <p><code>assertThat(getString()).matches(expected)</code></p>
       </td>
     </tr>
-    <tr>
-      <td>
-        <p><code>assertThat(getString().trim()).isEmpty()</code></p>
-      </td>
-      <td>
-        <p><code>assertThat(getString()).isBlank()</code></p>
-      </td>
-    </tr>
     <tr>
       <td>
         <p><code>assertThat(getString().length()).isEqualTo(length)</code></p>
@@ -228,7 +233,7 @@ <h2>Why is this an issue?</h2>
     </tr>
     <tr>
       <td>
-        <p><code>assertThat(getString().length()).hasSize(expected.length())</code></p>
+        <p><code>assertThat(getString().length()).isEqualTo(expected.length())</code></p>
       </td>
       <td>
         <p><code>assertThat(getString()).hasSameSizeAs(expected)</code></p>
@@ -376,10 +381,10 @@ <h2>Why is this an issue?</h2>
     </tr>
     <tr>
       <td>
-        <p><code>assertThat(getPath().getParent()).isEqualTo(name)</code></p>
+        <p><code>assertThat(getPath().getParent()).isEqualTo(path)</code></p>
       </td>
       <td>
-        <p><code>assertThat(getPath()).hasParentRaw(name)</code></p>
+        <p><code>assertThat(getPath()).hasParentRaw(path)</code></p>
       </td>
     </tr>
     <tr>
@@ -514,7 +519,7 @@ <h2>Why is this an issue?</h2>
     </tr>
     <tr>
       <td>
-        <p><code>assertThat(getMap().size()).isEqualTo(otherMap().size()</code></p>
+        <p><code>assertThat(getMap().size()).isEqualTo(otherMap().size())</code></p>
       </td>
       <td>
         <p><code>assertThat(getMap()).hasSameSizeAs(otherMap())</code></p>
@@ -538,10 +543,10 @@ <h2>Why is this an issue?</h2>
     </tr>
     <tr>
       <td>
-        <p><code>assertThat(getMap().keySet()).containsOnlyKey(key)</code></p>
+        <p><code>assertThat(getMap().keySet()).containsOnly(key)</code></p>
       </td>
       <td>
-        <p><code>assertThat(getMap()).containsOnlyKey(key)</code></p>
+        <p><code>assertThat(getMap()).containsOnlyKeys(key)</code></p>
       </td>
     </tr>
     <tr>
@@ -600,22 +605,4 @@ <h2>Why is this an issue?</h2>
     </tr>
   </tbody>
 </table>
-<h3>Noncompliant code example</h3>
-<pre>
-assertThat(getObject()).isEqualTo(null); // Noncompliant
-assertThat(getObject()).isNotEqualTo(null); // Noncompliant - not listed above but also supported
-
-assertThat(getString().trim()).isEmpty();
-assertThat(getFile().canRead()).isTrue();
-assertThat(getPath().getParent()).isNull();
-</pre>
-<h3>Compliant solution</h3>
-<pre>
-assertThat(getObject()).isNull();
-assertThat(getObject()).isNotNull();
-
-assertThat(getString()).isBlank();
-assertThat(getFile()).canRead();
-assertThat(getPath()).hasNoParentRaw();
-</pre>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html
index bc4ecf48b1f..3319bec3777 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.html
@@ -78,7 +78,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
   <li><a href="https://owasp.org/www-community/attacks/Session_fixation">OWASP Session Fixation</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/384">CWE-384 - Session Fixation</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html
index f22c9e44253..ab65279c7ac 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html
@@ -89,9 +89,9 @@ <h3>Documentation</h3>
 </ul>
 <h3>Standards</h3>
 <ul>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
   <li>OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6362.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6362.html
index 9d1e837a5c0..927860ef69c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6362.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6362.html
@@ -30,10 +30,9 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A03_2021-Injection/">Top 10 2021 Category A3 - Injection</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A7_2017-Cross-Site_Scripting_(XSS)">Top 10 2017 Category A7 - Cross-Site Scripting
-  (XSS)</a></li>
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa7-xss.md">Top 10 2017 Category A7 - Cross-Site Scripting (XSS)</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2023-risks/m8-security-misconfiguration.html">Mobile Top 10 2024 Category M8
   - Security Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/79">CWE-79 - Improper Neutralization of Input During Web Page Generation ('Cross-site
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6363.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6363.html
index 22859bb64c4..5668a1749cb 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6363.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6363.html
@@ -74,9 +74,9 @@ <h3>Documentation</h3>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">Top 10 2021 Category A1 - Broken Access Control</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa6-security-misconfiguration.md">Top 10 2017 Category A6 - Security
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2023-risks/m8-security-misconfiguration.html">Mobile Top 10 2024 Category M8
   - Security Misconfiguration</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html
index cfe38b13df0..c5c06152ac5 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html
@@ -70,7 +70,7 @@ <h2>Resources</h2>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 Category A2 - Broken
   Authentication</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/798">CWE-798 - Use of Hard-coded Credentials</a></li>
   <li>MSC - <a
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html
index 0fe9e47c8a0..ce6bcc45422 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html
@@ -125,7 +125,7 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa3-sensitive-data-disclosure.md">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a></li>
   <li>OWASP - <a href="https://owasp.github.io/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography.html">Mobile Top 10 2016 Category M5
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6437.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6437.html
index 1aaed23f41a..cf221376a84 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6437.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6437.html
@@ -70,7 +70,7 @@ <h3>Standards</h3>
 <ul>
   <li>OWASP - <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">Top 10 2021 - Category A7 - Identification and
   Authentication Failures</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">Top 10 2017 - Category A2 - Broken
+  <li>OWASP - <a href="https://github.com/OWASP/Top10/blob/master/2017/en/0xa2-broken-authentication.md">Top 10 2017 - Category A2 - Broken
   Authentication</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/798">CWE-798 - Use of Hard-coded Credentials</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/259">CWE-259 - Use of Hard-coded Password</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6809.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6809.html
index aae91d8a73d..4f6c4a1f3e0 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6809.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6809.html
@@ -1,62 +1,63 @@
 <h2>Why is this an issue?</h2>
-<p>A method annotated with Spring’s <code>@Async</code>, <code>@Cacheable</code> or <code>@Transactional</code> annotations will not work as expected
-if invoked directly from within its class.</p>
-<p>This is because Spring generates a proxy class with wrapper code to manage the method’s asynchronicity (<code>@Async</code>), to cache methods
-invocations (<code>@Cacheable</code>), or to handle the transaction (<code>@Transactional</code>). However, when called using <code>this</code>, the
-proxy instance is bypassed, and the method is invoked directly without the required wrapper code.</p>
+<p>With Spring’s proxy-based configuration, calling an <code>@Async</code>, <code>@Cacheable</code>, or <code>@Transactional</code> method from its
+own class bypasses the proxy that applies the annotation’s behavior. For example, an <code>@Async</code> method runs on the calling thread instead of
+being scheduled asynchronously. Move the annotated operation to a separate Spring-managed bean and call it through an injected reference.</p>
 <h2>How to fix it</h2>
-<p>Replace calls to <code>@Async</code>, <code>@Cacheable</code> or <code>@Transactional</code> methods via <code>this</code> with calls on an
-instance that was injected by Spring (<code>@Autowired</code>, <code>@Resource</code> or <code>@Inject</code>). The injected instance is a proxy on
-which the methods can be invoked safely.</p>
+<p>The example assumes asynchronous method execution is enabled with <code>@EnableAsync</code> and both services are discovered by component scanning.
+Constructor injection gives the calling service a reference to the managed bean, allowing Spring’s proxy to intercept the call.</p>
 <h3>Code examples</h3>
 <h4>Noncompliant code example</h4>
 <pre data-diff-id="1" data-diff-type="noncompliant">
 @Service
-public class AsyncNotificationProcessor implements NotificationProcessor {
-
-  @Override
-  public void process(Notification notification) {
-    processAsync(notification); // Noncompliant, call bypasses proxy
-    retrieveNotification(notification.id); // Noncompliant, call bypasses proxy and will not be cached
+public class NotificationProcessor {
+  public void process(String message) {
+    sendAsync(message); // Noncompliant: call bypasses the proxy
   }
 
   @Async
-  public processAsync(Notification notification) {
-    // ...
-  }
-
-  @Cacheable
-  public Notification retrieveNotification(Long id) {
-    // ...
+  public void sendAsync(String message) {
+    System.out.println(message);
   }
-
 }
 </pre>
 <h4>Compliant solution</h4>
+<p>Put these services in separate source files.</p>
 <pre data-diff-id="1" data-diff-type="compliant">
 @Service
-public class AsyncNotificationProcessor implements NotificationProcessor {
-
-  @Resource
-  private AsyncNotificationProcessor asyncNotificationProcessor;
+public class NotificationProcessor {
+  private final NotificationSender sender;
 
-  @Override
-  public void process(Notification notification) {
-    asyncNotificationProcessor.processAsync(notification); // Compliant, call via injected proxy
-    asyncNotificationProcessor.retrieveNotification(notification.id); // Compliant, the call will be cached
+  public NotificationProcessor(NotificationSender sender) {
+    this.sender = sender;
   }
 
-  @Async
-  public processAsync(Notification notification) {
-    // ...
+  public void process(String message) {
+    sender.sendAsync(message);
   }
+}
 
-  @Cacheable
-  public Notification retrieveNotification(Long id) {
-    // ...
+@Service
+public class NotificationSender {
+  @Async
+  public void sendAsync(String message) {
+    System.out.println(message);
   }
 }
 </pre>
+<p>The annotations are <code>org.springframework.stereotype.Service</code>, <code>org.springframework.scheduling.annotation.Async</code>, and
+<code>org.springframework.scheduling.annotation.EnableAsync</code>.</p>
+<h3>Other annotations and configuration</h3>
+<p>The same call boundary matters for caching and transactions:</p>
+<ul>
+  <li><code>@Cacheable</code>: self-invocation bypasses the cache lookup and population that would wrap the call.</li>
+  <li><code>@Transactional</code>: self-invocation does not apply the called method’s transaction settings. The method may still run in a transaction
+  already started by its caller.</li>
+</ul>
+<p>Enable the relevant Spring feature and use a method that the configured proxy can intercept. Creating the collaborator with <code>new</code>
+bypasses Spring management and does not fix the problem. This explanation concerns proxy mode; AspectJ weaving has different self-invocation
+behavior.</p>
+<p>Avoid using self-injection as the default solution. It introduces a circular dependency and depends on configuration that may reject circular
+references. Separating the operation into a collaborating bean makes the intercepted call explicit.</p>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.html
index a101d30ac22..ecf0825b538 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.html
@@ -1,3 +1,4 @@
+<p>This rule is deprecated; use {rule:java:S9352} instead.</p>
 <h2>Why is this an issue?</h2>
 <p>Naming conventions play a crucial role in maintaining code clarity and readability. The uniqueness of bean names in Spring configurations is vital
 to the clarity and readability of the code. When two beans share the same name within a configuration, it is not obvious to the reader which bean is
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.json
index a6e9129323f..01461fc1ab2 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6862.json
@@ -1,14 +1,12 @@
 {
   "title": "Beans in \"@Configuration\" class should have different names",
   "type": "BUG",
-  "status": "ready",
+  "status": "deprecated",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "spring"
-  ],
+  "tags": [],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-6862",
   "sqKey": "S6862",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.html
index cc3db143ea2..4d8900d7075 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.html
@@ -2,6 +2,14 @@ <h2>Why is this an issue?</h2>
 <p>Calling <code>String.isEmpty()</code> clearly communicates the code’s intention, which is to test if the string is empty. Using
 <code>String.length() == 0</code> is less direct and makes the code less readable. This preference for <code>isEmpty()</code> extends to all
 <code>CharSequence</code> objects, including <code>StringBuilder</code> and <code>StringBuffer</code>.</p>
+<p>A <code>String.strip().length() == 0</code> or <code>String.trim().length() == 0</code> test is a blankness check, and
+<code>String.isBlank()</code> states that intent directly.</p>
+<p>It is also cheaper. Invoking operations that create new string objects with white space removed incurs unnecessary memory allocation and management
+overhead: whenever there is white space to remove, <code>strip()</code> and <code>trim()</code> copy the remaining characters into a new string, which
+is then discarded as soon as its length has been read. <code>isBlank()</code> inspects the characters in place and allocates nothing.</p>
+<h3>Exceptions</h3>
+<p><code>String.isBlank()</code> is only available from Java 11 on. This rule does not raise an issue on <code>strip().length()</code> or
+<code>trim().length()</code> comparisons when the project targets an earlier version.</p>
 <h2>How to fix it</h2>
 <h3>Code examples</h3>
 <h4>Noncompliant code example</h4>
@@ -15,6 +23,11 @@ <h4>Noncompliant code example</h4>
 ...
 if (sb.length() == 0) { /* … */ } // Noncompliant
 </pre>
+<pre data-diff-id="3" data-diff-type="noncompliant">
+if ("string".strip().length() == 0) { /* … */ } // Noncompliant
+
+if ("string".trim().length() &gt; 0) { /* … */ } // Noncompliant
+</pre>
 <h4>Compliant solution</h4>
 <pre data-diff-id="1" data-diff-type="compliant">
 if ("string".isEmpty()){ /* … */ }
@@ -26,10 +39,27 @@ <h4>Compliant solution</h4>
 ...
 if (sb.isEmpty()) { /* … */ }
 </pre>
+<pre data-diff-id="3" data-diff-type="compliant">
+if ("string".isBlank()) { /* … */ }
+
+if (!"string".isBlank()) { /* … */ }
+</pre>
+<h3>Pitfalls</h3>
+<p><code>strip()</code> removes exactly the characters <code>isBlank()</code> treats as white space, both relying on
+<code>Character.isWhitespace</code>, so <code>strip().length() == 0</code> and <code>isBlank()</code> always agree.</p>
+<p><code>trim()</code> does not. It removes every character up to and including <code>U+0020</code>, which covers control characters such as
+<code>U+0000</code> that <code>Character.isWhitespace</code> rejects, and it leaves Unicode white space above <code>U+0020</code>, such as the em
+space <code>U+2003</code>, in place. Replacing <code>trim().length() == 0</code> with <code>isBlank()</code> therefore makes strings of Unicode white
+space count as blank and strings of control characters count as non-blank. The issue message and the quick fix say so explicitly; apply the fix only
+when that is the intended behavior, and keep <code>trim().isEmpty()</code> otherwise.</p>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
   <li>Java Documentation - <a href="https://docs.oracle.com/javase/7/docs/api/java/lang/String.html#isEmpty()">java.lang.String.isEmpty()
   method</a></li>
+  <li>Java Documentation - <a
+  href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#isBlank()">java.lang.String.isBlank() method</a></li>
+  <li>Java Documentation - <a
+  href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html#strip()">java.lang.String.strip() method</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.json
index 9640bf2cf6d..479d2e0e053 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7158.json
@@ -1,5 +1,5 @@
 {
-  "title": "\"String.isEmpty()\" should be used to test for emptiness",
+  "title": "\"String.isEmpty()\" and \"String.isBlank()\" should be used to test for emptiness and blankness",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9352.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9352.html
index 7e0cdfaf864..1ecbe3dd442 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9352.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9352.html
@@ -2,18 +2,21 @@
 type exist in the application’s dependency injection container without explicit disambiguation.</p>
 <h2>Why is this an issue?</h2>
 <p>Spring resolves autowiring by type: when exactly one bean matches the required type, it gets injected without further input. If two or more beans
-of the same type exist in the application context, Spring cannot decide which one to use and expects the ambiguity to be resolved explicitly, either
-with <code>@Qualifier</code> or by marking one bean <code>@Primary</code>.</p>
-<p>Without this disambiguation, Spring throws a <code>NoUniqueBeanDefinitionException</code> while building the application context.</p>
+of the same type exist in the application context, Spring cannot decide which one to use and expects the ambiguity to be resolved explicitly, for
+example with <code>@Qualifier</code>, by marking one bean <code>@Primary</code>, or by ensuring only one candidate is registered.</p>
 <h3>What is the potential impact?</h3>
-<p>The application will fail to start with an error indicating ambiguous dependency resolution during the dependency injection framework’s
-initialization phase. This prevents the application from running and requires immediate attention to resolve the configuration error.</p>
+<p>Spring will throw a <code>NoUniqueBeanDefinitionException</code> exception at runtime, indicating ambiguous dependency resolution during the
+dependency injection framework’s initialization phase. This prevents the application from running and requires immediate attention to resolve the
+configuration error.</p>
 <h2>How to fix it in Spring</h2>
+<p>The ambiguity can be resolved in several ways, for example with <code>@Qualifier</code>, <code>@Primary</code>, or by restricting which beans are
+registered with <code>@Conditional</code> and its variants. The two most common options are shown below.</p>
+<h3>Code examples</h3>
+<p><strong>Option 1: select the bean with <code>@Qualifier</code></strong></p>
 <p>Use the <code>@Qualifier</code> annotation at the injection point to explicitly specify which bean to inject. The qualifier value must match the
 bean name (typically the method name for <code>@Bean</code> methods).</p>
 <p>This approach is useful when different parts of your application need different beans of the same type. Each injection point can specify exactly
 which bean it requires.</p>
-<h3>Code examples</h3>
 <h4>Noncompliant code example</h4>
 <pre data-diff-id="1" data-diff-type="noncompliant">
 @Configuration
@@ -57,6 +60,7 @@ <h4>Compliant solution</h4>
     private DataSource dataSource; // Compliant; @Qualifier explicitly specifies that primaryDataSource needs to be used
 }
 </pre>
+<p><strong>Option 2: mark a default bean with <code>@Primary</code></strong></p>
 <p>Use the <code>@Primary</code> annotation on one of the bean definitions to mark it as the default choice. When Spring encounters multiple beans of
 the same type, it will automatically select the primary bean if no explicit qualifier is specified.</p>
 <p>This approach is useful when you have a clear default bean that should be used in most cases, with alternative beans available for specific
@@ -119,5 +123,10 @@ <h3>Documentation</h3>
   <li>Spring Framework API - <a
   href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Primary.html">@Primary
   Annotation</a></li>
+  <li>StackOverflow - <a
+  href="https://stackoverflow.com/questions/32245003/will-spring-throw-an-exception-if-there-is-ambiguity-when-resolving-a-bean">Will Spring throw an
+  exception if there is ambiguity when resolving a bean</a></li>
+  <li>Spring Framework Guru - <a href="https://springframework.guru/fixing-nonuniquebeandefinitionexception-exceptions/">Fixing
+  NoUniqueBeanDefinitionException</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json
index 9b8976ad8db..cdee8d59db1 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json
@@ -8,8 +8,7 @@
   },
   "tags": [
     "deprecated",
-    "convention",
-    "tests"
+    "convention"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-9387",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9390.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9390.html
index 47d97dc8f07..95b3822b894 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9390.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9390.html
@@ -47,7 +47,7 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
-  <li>Oracle Java Documentation - <a
+  <li>Java Documentation - <a
   href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Objects.html#equals(java.lang.Object,java.lang.Object)">Objects (Java
   SE 17 &amp; JDK 17)</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9412.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9412.json
index 0c438afafc9..7a63b494749 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9412.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9412.json
@@ -15,7 +15,7 @@
   "ruleSpecification": "RSPEC-9412",
   "sqKey": "S9412",
   "scope": "All",
-  "quickfix": "targeted",
+  "quickfix": "unknown",
   "code": {
     "impacts": {
       "MAINTAINABILITY": "LOW"
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9413.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9413.html
index 007806b4765..6bac8f88187 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9413.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9413.html
@@ -4,7 +4,7 @@
 <h2>Why is this an issue?</h2>
 <p>Many APIs provide built-in formatting capabilities. When you wrap generic string formatting functions around these APIs, you’re adding an
 unnecessary layer that hurts both performance and readability.</p>
-<h2>Performance concerns</h2>
+<h3>Performance concerns</h3>
 <p>Generic string formatting functions are typically eagerly evaluated. This means the formatted string is created immediately, even if it’s never
 used. This is particularly problematic in logging scenarios:</p>
 <pre>
@@ -21,7 +21,7 @@ <h2>Performance concerns</h2>
 <pre>
 LOG.debug("Processing {} items", items.size()); // Only formats if DEBUG is enabled
 </pre>
-<h2>Readability and idioms</h2>
+<h3>Readability and idioms</h3>
 <p>Each API has its own idiomatic way of formatting. Using generic string formatting makes the code less recognizable to developers familiar with
 these frameworks:</p>
 <ul>
@@ -42,77 +42,63 @@ <h3>What is the potential impact?</h3>
   review and understand.</li>
 </ul>
 <p>In Java, this specifically refers to redundant <code>String.format</code> calls.</p>
-<h2>How to fix it in SLF4J</h2>
-<p>SLF4J and similar logging frameworks (Log4j2, Logback) support parameterized logging with <code>{}</code> placeholders. This approach defers string
-construction until the log level is enabled.</p>
-<p>Arguments implementing <code>java.util.Formattable</code> are an exception: <code>String.format</code> formats them with
-<code>formatTo</code> instead of <code>toString</code>, so replacing it with <code>{}</code> placeholders could change the message.</p>
+<h2>How to fix it</h2>
+<p>Pass the format string and its arguments directly to the API instead of pre-formatting them with <code>String.format</code>. How to do this depends
+on the API:</p>
+<ul>
+  <li><strong>SLF4J and similar logging frameworks</strong> (Log4j2, Logback) support parameterized logging with <code>{}</code> placeholders. This
+  approach defers string construction until the log level is enabled. Arguments implementing <code>java.util.Formattable</code> are an exception:
+  <code>String.format</code> formats them with <code>formatTo</code> instead of <code>toString</code>, so replacing it with <code>{}</code>
+  placeholders could change the message.</li>
+  <li><strong>Console output</strong> (<code>System.out</code>/<code>System.err</code>): use <code>printf</code> instead of <code>println</code> with
+  <code>String.format</code>. The <code>printf</code> method supports the same format specifiers as <code>String.format</code>.</li>
+  <li><strong><code>PrintStream</code> and <code>PrintWriter</code></strong> both provide <code>printf</code> and <code>format</code> methods. Use
+  these instead of wrapping <code>String.format</code> in <code>print</code> or <code>println</code>.</li>
+</ul>
+<p>Note that <code>println</code> appends a line separator, so use <code>%n</code> at the end of the format string when switching to
+<code>printf</code>.</p>
+<p>In the examples below, <code>activateUser</code> illustrates the SLF4J case, <code>displayResult</code> the console output case, and
+<code>writeHeader</code> the <code>PrintWriter</code> case.</p>
 <h3>Code examples</h3>
 <h4>Noncompliant code example</h4>
 <pre data-diff-id="1" data-diff-type="noncompliant">
+import java.io.PrintWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class UserService {
-  private static final Logger LOG = LoggerFactory.getLogger(UserService.class);
+class Example {
+  private static final Logger LOG = LoggerFactory.getLogger(Example.class);
 
   void activateUser(String username, String role) {
     LOG.info(String.format("Activated user '%s' with role '%s'", username, role)); // Noncompliant
   }
+
+  void displayResult(int a, int b, int sum) {
+    System.out.println(String.format("Result: %d + %d = %d", a, b, sum)); // Noncompliant
+  }
+
+  void writeHeader(PrintWriter writer, String title, int pageNum) {
+    writer.println(String.format("Page %d: %s", pageNum, title)); // Noncompliant
+  }
 }
 </pre>
 <h4>Compliant solution</h4>
 <pre data-diff-id="1" data-diff-type="compliant">
+import java.io.PrintWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class UserService {
-  private static final Logger LOG = LoggerFactory.getLogger(UserService.class);
+class Example {
+  private static final Logger LOG = LoggerFactory.getLogger(Example.class);
 
   void activateUser(String username, String role) {
     LOG.info("Activated user '{}' with role '{}'", username, role);
   }
-}
-</pre>
-<h2>How to fix it in System.out/System.err</h2>
-<p>For console output, use <code>printf</code> instead of <code>println</code> with <code>String.format</code>. The <code>printf</code> method
-supports the same format specifiers as <code>String.format</code>.</p>
-<h3>Code examples</h3>
-<h4>Noncompliant code example</h4>
-<pre data-diff-id="2" data-diff-type="noncompliant">
-class Calculator {
-  void displayResult(int a, int b, int sum) {
-    System.out.println(String.format("Result: %d + %d = %d", a, b, sum)); // Noncompliant
-  }
-}
-</pre>
-<h4>Compliant solution</h4>
-<pre data-diff-id="2" data-diff-type="compliant">
-class Calculator {
+
   void displayResult(int a, int b, int sum) {
     System.out.printf("Result: %d + %d = %d%n", a, b, sum);
   }
-}
-</pre>
-<h2>How to fix it in PrintStream/PrintWriter</h2>
-<p>Both <code>PrintStream</code> and <code>PrintWriter</code> provide <code>printf</code> and <code>format</code> methods. Use these instead of
-wrapping <code>String.format</code> in <code>print</code> or <code>println</code>.</p>
-<h3>Code examples</h3>
-<h4>Noncompliant code example</h4>
-<pre data-diff-id="3" data-diff-type="noncompliant">
-import java.io.PrintWriter;
-
-class ReportGenerator {
-  void writeHeader(PrintWriter writer, String title, int pageNum) {
-    writer.println(String.format("Page %d: %s", pageNum, title)); // Noncompliant
-  }
-}
-</pre>
-<h4>Compliant solution</h4>
-<pre data-diff-id="3" data-diff-type="compliant">
-import java.io.PrintWriter;
 
-class ReportGenerator {
   void writeHeader(PrintWriter writer, String title, int pageNum) {
     writer.printf("Page %d: %s%n", pageNum, title);
   }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.html
index 7856aaa0221..07471a8874d 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.html
@@ -1,6 +1,5 @@
-<p>This rule raises an issue when a cryptographic digest/hash object is declared as a class-level variable (either instance-level or shared across all
-instances).</p>
-<p>In Java, this specifically refers to <code>MessageDigest</code> instances.</p>
+<p>This rule raises an issue when a <code>MessageDigest</code> object is declared as a class-level variable (either instance-level or shared across
+all instances).</p>
 <h2>Why is this an issue?</h2>
 <p>Cryptographic hash computation objects are stateful components that calculate hash values by maintaining internal state as data is incrementally
 processed through their methods.</p>
@@ -81,3 +80,4 @@ <h3>Standards</h3>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/567.html">CWE-567: Unsynchronized Access to Shared Data in a Multithreaded
   Context</a></li>
 </ul>
+
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.json
index 9c8021a2753..a84698ad650 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9428.json
@@ -4,7 +4,7 @@
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
-    "constantCost": "5min"
+    "constantCost": "5 min"
   },
   "tags": [
     "concurrency",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9433.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9433.html
index 6f14fce7cb3..9c8f83e971f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9433.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9433.html
@@ -1,34 +1,88 @@
-<p>An issue is raised when a literal value (numeric, boolean, or other primitive) is converted to a string by concatenating it with an empty string
-rather than using explicit conversion methods.</p>
+<p>An issue is raised when a primitive literal is converted to a string by concatenating it with an empty string rather than writing the resulting
+string literal directly or using an explicit conversion method.</p>
+<p>This includes compile-time constant contexts when the concatenation can be replaced with an equivalent string literal. Annotation arguments,
+annotation element defaults, constant <code>case</code> labels, and constant field initializers are not exempt.</p>
+<p>When the targeted empty-string/primitive-literal pattern is part of a larger compile-time constant concatenation, simplify and report the enclosing
+constant concatenation. For example, report the whole initializer <code>"a" + ("" + 1)</code> and recommend <code>"a1"</code>. This rule does not
+target arbitrary constant concatenations such as <code>"a" + "b"</code> unless they contain the targeted pattern.</p>
 <h2>Why is this an issue?</h2>
-<p>Converting literals to strings by concatenating them with empty strings is an inefficient and unclear approach.</p>
-<p>When you write an expression that concatenates an empty string with a non-string value, the language runtime must:</p>
-<ul>
-  <li>Create a string building object or buffer</li>
-  <li>Append the empty string</li>
-  <li>Append the value after converting it to a string</li>
-  <li>Call a method to extract the final string result</li>
-</ul>
-<p>This creates unnecessary intermediate objects and performs extra operations. More importantly, the intent is unclear - a developer reading an empty
-string concatenated with a value must infer that this is a type conversion, rather than seeing an explicit conversion call.</p>
-<p>Most languages provide explicit, efficient methods for converting primitives to strings:</p>
+<p>Converting literals to strings by concatenating them with empty strings obscures the intended string value.</p>
+<p>When concatenation is evaluated at runtime, it may involve intermediate objects or additional operations to build the resulting string. The exact
+behavior depends on the language, compiler, and runtime. These costs do not apply when the concatenation is evaluated at compile time.</p>
+<p>The readability concern remains in either case: a developer reading an empty string concatenated with a literal must infer the resulting string,
+rather than seeing it directly.</p>
+<p>Writing the resulting string literal directly makes the value clear. When an explicit conversion is appropriate, most languages also provide
+methods for converting primitives to strings:</p>
 <ul>
   <li>Type-specific conversion functions (e.g., functions that convert integers to strings, booleans to strings)</li>
   <li>Generic conversion functions that accept any value type</li>
 </ul>
-<p>These methods directly convert the value to a string without unnecessary intermediate steps, making both the intent and the operation clearer.</p>
-<p>In Java, these explicit methods include <code>Integer.toString()</code>, <code>Boolean.toString()</code>, and other type-specific methods, or the
-generic <code>String.valueOf()</code> method.</p>
+<p>These methods make the conversion intent explicit, but do not necessarily preserve compile-time constant semantics.</p>
+<p>In Java, concatenations that are constant expressions are evaluated at compile time. For example, <code>"" + 42</code> and <code>"a" + ("" +
+1)</code> do not incur runtime string-building overhead. The reason to simplify these expressions is readability, not runtime performance.</p>
 <h3>What is the potential impact?</h3>
-<p>The performance impact of using string operations as an indirect method for type conversion is typically small in individual cases, but can
-accumulate in large applications or performance-sensitive code paths. More significantly, this pattern reduces code readability and maintainability by
-obscuring the developer’s intent.</p>
+<p>This pattern reduces code readability and maintainability by obscuring the intended string value. Runtime concatenation may also have a performance
+cost, but concatenations evaluated at compile time do not incur runtime string-building overhead.</p>
 <h2>How to fix it</h2>
-<p>Replace empty string concatenation with explicit type conversion methods. For primitive types, use the wrapper class’s static
-<code>toString()</code> method (e.g., <code>Integer.toString()</code>, <code>Long.toString()</code>, <code>Boolean.toString()</code>). Alternatively,
-use <code>String.valueOf()</code> which works for all types.</p>
+<p>For compile-time constant concatenations, replace the enclosing constant concatenation with a string literal containing its evaluated value.
+Preserve the exact string value, including escaping where necessary.</p>
+<p>Use this replacement in annotation arguments and annotation element defaults (including array elements), constant <code>case</code> labels in
+<code>switch</code> statements or expressions, and constant field initializers. This also applies to implicitly <code>static final</code> fields in
+interfaces and annotation types.</p>
+<p>Method calls such as <code>Integer.toString(1)</code> and <code>String.valueOf(1)</code> are not constant expressions. They are unsuitable
+replacements in annotation values, annotation element defaults, and constant <code>case</code> labels because the code would no longer compile. In a
+constant field initializer, they would turn the field into a non-constant, potentially breaking uses in constant contexts and changing constant
+inlining behavior. An equivalent string literal preserves these semantics.</p>
+<p>Outside contexts where compile-time constant semantics must be preserved, an explicit conversion is also an option. For primitive types, use the
+wrapper class’s static <code>toString()</code> method (e.g., <code>Integer.toString()</code>, <code>Long.toString()</code>,
+<code>Boolean.toString()</code>) or <code>String.valueOf()</code>.</p>
 <h3>Code examples</h3>
 <h4>Noncompliant code example</h4>
+<pre data-diff-id="2" data-diff-type="noncompliant">
+@interface Label {
+  String value() default "" + 1; // Noncompliant
+  String[] aliases() default {"" + 2}; // Noncompliant
+}
+
+@Label(value = "" + 3, aliases = {"" + 4}) // Noncompliant
+class Example {
+  static final String SIMPLE = "" + 42; // Noncompliant
+  static final String NESTED = "a" + ("" + 1); // Noncompliant: replace the whole initializer with "a1"
+
+  boolean matches(String value) {
+    switch (value) {
+      case "" + 5: // Noncompliant
+        return true;
+      default:
+        return false;
+    }
+  }
+}
+</pre>
+<h4>Compliant solution</h4>
+<pre data-diff-id="2" data-diff-type="compliant">
+@interface Label {
+  String value() default "1";
+  String[] aliases() default {"2"};
+}
+
+@Label(value = "3", aliases = {"4"})
+class Example {
+  static final String SIMPLE = "42";
+  static final String NESTED = "a1";
+
+  boolean matches(String value) {
+    switch (value) {
+      case "5":
+        return true;
+      default:
+        return false;
+    }
+  }
+}
+</pre>
+<h4>Noncompliant code example</h4>
+<p>When constant semantics do not need to be preserved, explicit conversion methods are another solution:</p>
 <pre data-diff-id="1" data-diff-type="noncompliant">
 String s = "" + 123;   // Noncompliant
 String b = "" + true;  // Noncompliant
@@ -43,6 +97,9 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
+  <li>Java Language Specification - <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-15.html#jls-15.29">Constant Expressions</a></li>
+  <li>Java Language Specification - <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-15.html#jls-15.18.1">String Concatenation
+  Operator</a></li>
   <li>Oracle Java Documentation - <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html#valueOf(int)">String
   (Java SE 17 &amp; JDK 17)</a></li>
   <li>Oracle Java Documentation - <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html#toString(int)">Integer
diff --git a/sonar-java-plugin/src/main/resources/profiles/Sonar_agentic_AI/S6862 b/sonar-java-plugin/src/main/resources/profiles/Sonar_agentic_AI/S6862
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/sonar-java-plugin/src/main/resources/profiles/Sonar_way/S6862 b/sonar-java-plugin/src/main/resources/profiles/Sonar_way/S6862
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/sonar-java-plugin/src/main/resources/profiles/Sonar_way/S9391 b/sonar-java-plugin/src/main/resources/profiles/Sonar_way/S9391
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/sonarpedia.json b/sonarpedia.json
index 21dfd7b9db9..60076c6b738 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -4,7 +4,7 @@
     "JAVA"
   ],
   "profiles-path": "./sonar-java-plugin/src/main/resources/profiles",
-  "latest-update": "2026-09-24T13:53:22.889544226Z",
+  "latest-update": "2026-10-22T11:55:36.615101096Z",
   "options": {
     "no-language-in-filenames": true,
     "preserve-filenames": false

From 50b8023be340e83958628b701693b90d9aafab99 Mon Sep 17 00:00:00 2001
From: Gitar <noreply@gitar.ai>
Date: Thu, 22 Oct 2026 12:13:33 +0000
Subject: [PATCH 2/3] fix: restore tests tag for S9387

Co-authored-by: hashicorp-vault-sonar-prod[bot] <111297361+hashicorp-vault-sonar-prod[bot]@users.noreply.github.com>
---
 .../main/resources/org/sonar/l10n/java/rules/java/S9387.json   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json
index cdee8d59db1..9b8976ad8db 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S9387.json
@@ -8,7 +8,8 @@
   },
   "tags": [
     "deprecated",
-    "convention"
+    "convention",
+    "tests"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-9387",

From e7091cc487dd408949fcfbda730dba870ae13159 Mon Sep 17 00:00:00 2001
From: asya-vorobeva <asya.vorobeva@sonarsource.com>
Date: Thu, 22 Oct 2026 16:27:46 +0400
Subject: [PATCH 3/3] Fix failing test

---
 .../java/org/sonar/plugins/java/JavaAgenticWayProfileTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaAgenticWayProfileTest.java b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaAgenticWayProfileTest.java
index 56cee0b4e7a..6f43b97c8e1 100644
--- a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaAgenticWayProfileTest.java
+++ b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaAgenticWayProfileTest.java
@@ -60,7 +60,7 @@ void profile_is_registered_as_expected() {
     BuiltInQualityProfilesDefinition.BuiltInQualityProfile actualProfile = profilesPerLanguages.get("java").get("Sonar agentic AI");
     assertThat(actualProfile.isDefault()).isFalse();
     assertThat(actualProfile.rules())
-      .hasSize(465)
+      .hasSize(464)
       .extracting(BuiltInQualityProfilesDefinition.BuiltInActiveRule::ruleKey)
       .doesNotContainAnyElementsOf(List.of(
         "S101",