From 1ee0049ab86440acf066dfe1dd12dbee4ad95011 Mon Sep 17 00:00:00 2001
From: aurelien-coet-sonarsource
 <aurelien-coet-sonarsource@users.noreply.github.com>
Date: Thu, 7 May 2026 15:03:32 +0000
Subject: [PATCH 1/2] Update rule metadata

---
 .../org/sonar/l10n/java/rules/java/S106.html  |  4 +-
 .../org/sonar/l10n/java/rules/java/S1065.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1111.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1113.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1114.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1116.html | 12 +--
 .../org/sonar/l10n/java/rules/java/S1117.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S112.html  |  4 +-
 .../org/sonar/l10n/java/rules/java/S1121.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S1143.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S1147.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S1163.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S1166.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S1168.html |  8 +-
 .../org/sonar/l10n/java/rules/java/S1172.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1174.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1181.html |  5 +-
 .../org/sonar/l10n/java/rules/java/S1182.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1193.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S1206.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S121.html  |  4 +-
 .../org/sonar/l10n/java/rules/java/S126.html  |  7 +-
 .../org/sonar/l10n/java/rules/java/S128.html  |  9 ++-
 .../org/sonar/l10n/java/rules/java/S131.html  |  3 +-
 .../org/sonar/l10n/java/rules/java/S1313.json |  3 +-
 .../org/sonar/l10n/java/rules/java/S1314.html |  7 +-
 .../org/sonar/l10n/java/rules/java/S1444.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1449.html |  5 +-
 .../org/sonar/l10n/java/rules/java/S1656.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1659.html |  6 +-
 .../org/sonar/l10n/java/rules/java/S1696.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1698.html |  8 +-
 .../org/sonar/l10n/java/rules/java/S1699.html |  7 +-
 .../org/sonar/l10n/java/rules/java/S1764.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1860.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1862.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1872.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S1943.html |  8 +-
 .../org/sonar/l10n/java/rules/java/S1989.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2057.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2059.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2061.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2066.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2068.json |  3 +-
 .../org/sonar/l10n/java/rules/java/S2077.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2077.json |  3 +-
 .../org/sonar/l10n/java/rules/java/S2092.json |  3 +-
 .../org/sonar/l10n/java/rules/java/S2093.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2111.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2143.html | 70 ++++++++++++------
 .../org/sonar/l10n/java/rules/java/S2151.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2159.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2162.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2164.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2168.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2175.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2178.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2184.html |  8 +-
 .../org/sonar/l10n/java/rules/java/S2197.html |  7 +-
 .../org/sonar/l10n/java/rules/java/S2201.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2225.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2245.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2251.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2274.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2276.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2384.html |  9 ++-
 .../org/sonar/l10n/java/rules/java/S2386.html |  6 +-
 .../org/sonar/l10n/java/rules/java/S2390.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2442.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2445.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2446.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2447.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2612.html |  5 +-
 .../org/sonar/l10n/java/rules/java/S2612.json |  3 +-
 .../org/sonar/l10n/java/rules/java/S2674.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2681.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S2693.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S2886.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S3011.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S3014.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S3034.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S3064.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S3067.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S3077.html |  5 +-
 .../org/sonar/l10n/java/rules/java/S3078.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S3346.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S3366.html |  6 +-
 .../org/sonar/l10n/java/rules/java/S3457.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S3551.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S4347.html |  5 +-
 .../org/sonar/l10n/java/rules/java/S4423.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S4426.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S4507.json |  3 +-
 .../org/sonar/l10n/java/rules/java/S4512.html | 73 ++++++++++---------
 .../org/sonar/l10n/java/rules/java/S4512.json |  7 +-
 .../org/sonar/l10n/java/rules/java/S4830.html |  5 +-
 .../org/sonar/l10n/java/rules/java/S4973.html |  8 +-
 .../org/sonar/l10n/java/rules/java/S5042.html | 60 ++++++++-------
 .../org/sonar/l10n/java/rules/java/S5042.json | 15 ++--
 .../org/sonar/l10n/java/rules/java/S5324.html |  2 +-
 .../org/sonar/l10n/java/rules/java/S5527.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S5542.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S5738.html |  3 +-
 .../org/sonar/l10n/java/rules/java/S6418.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S6418.json |  3 +-
 .../org/sonar/l10n/java/rules/java/S7409.html |  4 +-
 .../org/sonar/l10n/java/rules/java/S818.html  |  6 +-
 .../org/sonar/l10n/java/rules/java/S864.html  |  7 +-
 .../org/sonar/l10n/java/rules/java/S881.html  | 10 ++-
 .../org/sonar/l10n/java/rules/java/S888.html  |  3 +-
 .../org/sonar/l10n/java/rules/java/S899.html  |  6 +-
 .../org/sonar/l10n/java/rules/java/S923.html  |  4 +-
 .../java/rules/java/Sonar_way_profile.json    |  1 +
 sonarpedia.json                               |  2 +-
 114 files changed, 417 insertions(+), 264 deletions(-)

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 b5e935f9ed2..7b01700531a 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
@@ -41,6 +41,8 @@ <h3>Documentation</h3>
   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
   Exposure</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/nzdGBQ">CERT, ERR02-J.</a> - Prevent exceptions while logging data</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,
+  ERR02-J.</a> - Prevent exceptions while logging data</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1065.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1065.html
index ee08e1648ee..282ea34238c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1065.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1065.html
@@ -20,6 +20,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc12-c">CERT,
+  MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1111.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1111.html
index 8e0e9a96313..815ad80f114 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1111.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1111.html
@@ -18,6 +18,7 @@ <h2>Resources</h2>
 <ul>
   <li><a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-12.html#jls-12.6">docs.oracle.com</a> - Finalization of Class Instances</li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/586">CWE-586 - Explicit Call to Finalize()</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met12-j">CERT,
+  MET12-J.</a> - Do not use finalizers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1113.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1113.html
index 76259bd86b7..cf48fb43b27 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1113.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1113.html
@@ -29,6 +29,7 @@ <h3>Exceptions</h3>
 <h2>Resources</h2>
 <ul>
   <li><a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-12.html#jls-12.6">docs.oracle.com</a> - Finalization of Class Instances</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met12-j">CERT,
+  MET12-J.</a> - Do not use finalizers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1114.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1114.html
index abaac7a0920..53080d11818 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1114.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1114.html
@@ -24,6 +24,7 @@ <h3>Compliant solution</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/568">CWE-568 - finalize() Method Without super.finalize()</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met12-j">CERT,
+  MET12-J.</a> - Do not use finalizers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1116.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1116.html
index dcf08dd0964..1a5d35754fc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1116.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1116.html
@@ -28,10 +28,12 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/IDZGBQ">CERT, MSC51-J.</a> - Do not place a semicolon immediately following an if, for, or while
-  condition</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/WtYxBQ">CERT, EXP15-C.</a> - Do not place a semicolon on the same line as an if, for, or while
-  statement</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc12-c">CERT,
+  MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc51-j">CERT,
+  MSC51-J.</a> - Do not place a semicolon immediately following an if, for, or while condition</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/expressions-exp/exp15-c">CERT,
+  EXP15-C.</a> - Do not place a semicolon on the same line as an if, for, or while statement</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1117.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1117.html
index 004b0a5bce1..c8a00874578 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1117.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1117.html
@@ -24,8 +24,8 @@ <h3>Noncompliant code example</h3>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
-  <li>CERT - <a href="https://wiki.sei.cmu.edu/confluence/display/java/DCL51-J.+Do+not+shadow+or+obscure+identifiers+in+subscopes">DCL51-J. Do not
-  shadow or obscure identifiers in subscopes</a></li>
+  <li>CERT - <a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/declarations-and-initialization-dcl/dcl51-j">DCL51-J. Do not shadow or obscure identifiers in subscopes</a></li>
 </ul>
 <h3>Related rules</h3>
 <ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S112.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S112.html
index 15f6a7f455e..12cd39a0015 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S112.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S112.html
@@ -54,7 +54,9 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/397">CWE-397 Declaration of Throws for Generic Exception</a></li>
-  <li>CERT - <a href="https://wiki.sei.cmu.edu/confluence/x/_DdGBQ">ERR07-J. Do not throw RuntimeException, Exception, or Throwable</a></li>
+  <li>CERT - <a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err07-j">ERR07-J. Do
+  not throw RuntimeException, Exception, or Throwable</a></li>
 </ul>
 <h3>Related rules</h3>
 <ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1121.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1121.html
index ce916034522..db7fc2dd80e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1121.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1121.html
@@ -48,6 +48,8 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/481">CWE-481 - Assigning instead of Comparing</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ITZGBQ">CERT, EXP51-J.</a> - Do not perform assignments in conditional expressions</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/expressions-exp/exp51-j">CERT,
+  EXP51-J.</a> - Do not perform assignments in conditional expressions</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1143.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1143.html
index ce6aa5860e5..c6622f54fc7 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1143.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1143.html
@@ -59,6 +59,8 @@ <h3>Compliant solution</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/584">CWE-584 - Return Inside Finally Block</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/BTdGBQ">CERT, ERR04-J.</a> - Do not complete abruptly from a finally block</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err04-j">CERT,
+  ERR04-J.</a> - Do not complete abruptly from a finally block</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1147.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1147.html
index 81f875e54b7..115519dd43d 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1147.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1147.html
@@ -15,6 +15,8 @@ <h3>Exceptions</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/382">CWE-382 - Use of System.exit()</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/7zZGBQ">CERT, ERR09-J.</a> - Do not allow untrusted code to terminate the JVM</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err09-j">CERT,
+  ERR09-J.</a> - Do not allow untrusted code to terminate the JVM</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1163.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1163.html
index 7d7fc23629d..3acab4b7d45 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1163.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1163.html
@@ -21,6 +21,8 @@ <h2>Why is this an issue?</h2>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/FTZGBQ">CERT, ERR05-J.</a> - Do not let checked exceptions escape from a finally block</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err05-j">CERT,
+  ERR05-J.</a> - Do not let checked exceptions escape from a finally block</li>
 </ul>
 
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 bb4dbce4e8c..dddaeb9d984 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
@@ -84,7 +84,9 @@ <h2>Resources</h2>
   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><a href="https://wiki.sei.cmu.edu/confluence/x/xDdGBQ">CERT, ERR00-J.</a> - Do not suppress or ignore checked exceptions</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>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/778">CWE-778 - Insufficient Logging</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1168.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1168.html
index 538d24204d9..a4dd400b921 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1168.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1168.html
@@ -65,9 +65,9 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/aNYxBQ">CERT, MSC19-C.</a> - For functions that return an array, prefer returning an empty array
-  over a null value</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/JzZGBQ">CERT, MET55-J.</a> - Return an empty array or collection instead of a null value for
-  methods that return an array or collection</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc19-c">CERT,
+  MSC19-C.</a> - For functions that return an array, prefer returning an empty array over a null value</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/methods-met/met55-j">CERT,
+  MET55-J.</a> - Return an empty array or collection instead of a null value for methods that return an array or collection</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1172.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1172.html
index 6acff444062..24458928b8a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1172.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1172.html
@@ -59,6 +59,7 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc12-c">CERT,
+  MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1174.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1174.html
index 5c6ee7208c4..6a3ca67087e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1174.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1174.html
@@ -14,6 +14,7 @@ <h3>Noncompliant code example</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/583">CWE-583 - finalize() Method Declared Public</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met12-j">CERT,
+  MET12-J.</a> - Do not use finalizers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1181.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1181.html
index 38294b6b28b..29f677cf2b6 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1181.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1181.html
@@ -16,7 +16,8 @@ <h3>Compliant solution</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/396">CWE-396 - Declaration of Catch for Generic Exception</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/display/java/ERR08-J.+Do+not+catch+NullPointerException+or+any+of+its+ancestors">CERT, ERR08-J.</a>
-  - Do not catch NullPointerException or any of its ancestors</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err08-j">CERT,
+  ERR08-J.</a> - Do not catch NullPointerException or any of its ancestors</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1182.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1182.html
index a18cb9456d6..e6b12afa6a6 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1182.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1182.html
@@ -69,6 +69,7 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/580">CWE-580 - clone() Method Without super.clone()</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/FjZGBQ">CERT, MET53-J.</a> - Ensure that the clone() method calls super.clone()</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/methods-met/met53-j">CERT,
+  MET53-J.</a> - Ensure that the clone() method calls super.clone()</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1193.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1193.html
index 76c8d66e8e4..04b3c99b43a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1193.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1193.html
@@ -26,8 +26,8 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/display/java/ERR51-J.+Prefer+user-defined+exceptions+over+more+general+exception+types">CERT,
-  ERR51-J.</a> - Prefer user-defined exceptions over more general exception types</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/exceptional-behavior-err/err51-j">CERT, ERR51-J.</a> - Prefer user-defined exceptions over more general exception types</li>
   <li><a href="https://docs.oracle.com/javase/tutorial/essential/exceptions/catch.html">Oracle - Exceptions</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1206.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1206.html
index 762a014aa08..48a433c361d 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1206.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1206.html
@@ -41,7 +41,7 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/581">CWE-581 - Object Model Violation: Just One of Equals and Hashcode Defined</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/7DVGBQ">CERT, MET09-J.</a> - Classes that define an equals() method must also define a hashCode()
-  method</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met09-j">CERT,
+  MET09-J.</a> - Classes that define an equals() method must also define a hashCode() method</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S121.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S121.html
index 02177c12816..bbd6789d931 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S121.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S121.html
@@ -21,6 +21,8 @@ <h3>Exceptions</h3>
 <code>continue</code> and is on the same line.</p>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/MzZGBQ">CERT, EXP52-J.</a> - Use braces for the body of an if, for, or while statement</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/expressions-exp/exp52-j">CERT,
+  EXP52-J.</a> - Use braces for the body of an if, for, or while statement</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S126.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S126.html
index a6ce5bb898e..97a8f3e0a18 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S126.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S126.html
@@ -24,7 +24,10 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/RtYxBQ">CERT, MSC01-C.</a> - Strive for logical completeness</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/jzZGBQ">CERT, MSC57-J.</a> - Strive for logical completeness</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc01-c">CERT,
+  MSC01-C.</a> - Strive for logical completeness</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc57-j">CERT,
+  MSC57-J.</a> - Strive for logical completeness</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S128.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S128.html
index 8f3a2a0285e..7ee2031e3cc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S128.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S128.html
@@ -51,9 +51,10 @@ <h3>Exceptions</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/484">CWE-484 - Omitted Break Statement in Switch</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ldYxBQ">CERT, MSC17-C.</a> - Finish every set of statements associated with a case label with a
-  break statement</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/1DdGBQ">CERT, MSC52-J.</a> - Finish every set of statements associated with a case label with a
-  break statement</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc17-c">CERT,
+  MSC17-C.</a> - Finish every set of statements associated with a case label with a break statement</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc52-j">CERT,
+  MSC52-J.</a> - Finish every set of statements associated with a case label with a break statement</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S131.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S131.html
index 12cc6011500..7de212f7c75 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S131.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S131.html
@@ -59,6 +59,7 @@ <h3>Exceptions</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/478">CWE-478 - Missing Default Case in Switch Statement</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/RtYxBQ">CERT, MSC01-C.</a> - Strive for logical completeness</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc01-c">CERT,
+  MSC01-C.</a> - Strive for logical completeness</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.json
index d2dc6f0718f..d5a4f9340b2 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1313.json
@@ -13,7 +13,8 @@
     "constantCost": "30min"
   },
   "tags": [
-    "cert"
+    "cert",
+    "former-hotspot"
   ],
   "defaultSeverity": "Minor",
   "quickfix": "unknown",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1314.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1314.html
index 9f6bedc1a51..adf30b1fdf0 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1314.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1314.html
@@ -11,8 +11,9 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/atYxBQ">CERT, DCL18-C.</a> - Do not begin integer constants with 0 when specifying a decimal
-  value</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/7DZGBQ">CERT, DCL50-J.</a> - Use visually distinct identifiers</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/declarations-and-initialization-dcl/dcl18-c">CERT, DCL18-C.</a> - Do not begin integer constants with 0 when specifying a decimal value</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/declarations-and-initialization-dcl/dcl50-j">CERT, DCL50-J.</a> - Use visually distinct identifiers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1444.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1444.html
index 287c905dd5f..a5ad7483731 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1444.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1444.html
@@ -19,6 +19,7 @@ <h3>Compliant solution</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/500">CWE-500 - Public Static Field Not Marked Final</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/WjdGBQ">CERT OBJ10-J.</a> - Do not use public static nonfinal fields</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/object-orientation-obj/obj10-j">CERT,
+  OBJ10-J.</a> - Do not use public static nonfinal fields</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1449.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1449.html
index 7d99de4df6e..8238c0d3566 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1449.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1449.html
@@ -16,7 +16,8 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/4zdGBQ">CERT, STR02-J.</a> - Specify an appropriate locale when comparing locale-dependent
-  data</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/characters-and-strings-str/str02-j">CERT,
+  STR02-J.</a> - Specify an appropriate locale when comparing locale-dependent data</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1656.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1656.html
index 79b4515201f..4de40884cce 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1656.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1656.html
@@ -15,6 +15,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc12-c">CERT,
+  MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1659.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1659.html
index dc99fa6b74f..d541d044500 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1659.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1659.html
@@ -26,7 +26,9 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/YTZGBQ">CERT, DCL52-J.</a> - Do not declare more than one variable per declaration</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/EtcxBQ">CERT, DCL04-C.</a> - Do not declare more than one variable per declaration</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/declarations-and-initialization-dcl/dcl52-j">CERT, DCL52-J.</a> - Do not declare more than one variable per declaration</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/declarations-and-initialization-dcl/dcl04-c">CERT, DCL04-C.</a> - Do not declare more than one variable per declaration</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1696.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1696.html
index 1f295cd8646..c61cd29ac69 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1696.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1696.html
@@ -33,7 +33,8 @@ <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/395">CWE-395 - Use of NullPointerException Catch to Detect NULL Pointer
   Dereference</a></li>
-  <li>CERT - <a href="https://wiki.sei.cmu.edu/confluence/display/java/ERR08-J.+Do+not+catch+NullPointerException+or+any+of+its+ancestors">ERR08-J. Do
+  <li>CERT - <a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err08-j">ERR08-J. Do
   not catch NullPointerException or any of its ancestors</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1698.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1698.html
index d60563da58a..b4664c12383 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1698.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1698.html
@@ -57,8 +57,10 @@ <h2>Resources</h2>
   <li>{rule:java:S4973} - Strings and Boxed types should be compared using "equals()"</li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/595">CWE-595 - Comparison of Object References Instead of Object Contents</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/597">CWE-597 - Use of Wrong Operator in String Comparison</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/UjdGBQ">CERT, EXP03-J.</a> - Do not use the equality operators when comparing values of boxed
-  primitives</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/yDdGBQ">CERT, EXP50-J.</a> - Do not confuse abstract object equality with reference equality</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp03-j">CERT,
+  EXP03-J.</a> - Do not use the equality operators when comparing values of boxed primitives</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/expressions-exp/exp50-j">CERT,
+  EXP50-J.</a> - Do not confuse abstract object equality with reference equality</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1699.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1699.html
index 7aeaa3d820b..087479dd2c3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1699.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1699.html
@@ -38,8 +38,9 @@ <h3>Noncompliant code example</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/8zZGBQ">CERT, MET05-J.</a> - Ensure that constructors do not call overridable methods</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/6ns-BQ">CERT, OOP50-CPP.</a> - Do not invoke virtual functions from constructors or
-  destructors</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met05-j">CERT,
+  MET05-J.</a> - Ensure that constructors do not call overridable methods</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-cpp-coding-standard/rules/object-oriented-programming-oop/oop50-cpp">CERT,
+  OOP50-CPP.</a> - Do not invoke virtual functions from constructors or destructors</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1764.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1764.html
index 08f0200dc1a..48dda451e06 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1764.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1764.html
@@ -39,7 +39,8 @@ <h3>Exceptions</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc12-c">CERT,
+  MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
   <li>{rule:java:S1656} - Implements a check on <code>=</code>.</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1860.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1860.html
index 47553549551..9ade357314b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1860.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1860.html
@@ -96,7 +96,8 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li>CERT - <a href="https://wiki.sei.cmu.edu/confluence/x/1zdGBQ">Do not synchronize on objects that may be reused</a></li>
+  <li>CERT - <a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/locking-lck/lck01-j">Do not
+  synchronize on objects that may be reused</a></li>
   <li>OpenJDK - <a href="https://openjdk.java.net/jeps/390">JEP 390: Warnings for Value-Based Classes</a></li>
   <li>Java Documentation - <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/doc-files/ValueBased.html">Value-based
   Classes</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1862.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1862.html
index 28a8e523d66..523c0b01cc6 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1862.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1862.html
@@ -25,6 +25,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/5dUxBQ">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc12-c">CERT,
+  MSC12-C.</a> - Detect and remove code that has no effect or is never executed</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1872.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1872.html
index 9e3c1ddbb6e..c0573b1cb99 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1872.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1872.html
@@ -51,6 +51,7 @@ <h3>Compliant solution</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/486">CWE-486 - Comparison of Classes by Name</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/eDdGBQ">CERT, OBJ09-J.</a> - Compare classes and not class names</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/object-orientation-obj/obj09-j">CERT,
+  OBJ09-J.</a> - Compare classes and not class names</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1943.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1943.html
index 1a2e1d448f2..b4f842c9f69 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1943.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1943.html
@@ -67,8 +67,10 @@ <h2>Why is this an issue?</h2>
 </ul>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/pzdGBQ">CERT, STR04-J.</a> - Use compatible character encodings when communicating string data
-  between JVMs</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ujZGBQ">CERT, STR50-J.</a> - Use the appropriate method for counting characters in a string</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/characters-and-strings-str/str04-j">CERT,
+  STR04-J.</a> - Use compatible character encodings when communicating string data between JVMs</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/characters-and-strings-str/str50-j">CERT, STR50-J.</a> - Use the appropriate method for counting characters in a string</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 e6c1b1f58cd..8cb24a12f92 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
@@ -46,6 +46,8 @@ <h3>Articles &amp; blog posts</h3>
   <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">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 href="https://wiki.sei.cmu.edu/confluence/x/-zZGBQ">CERT, ERR01-J.</a> - Do not allow exceptions to expose sensitive information</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/exceptional-behavior-err/err01-j">CERT,
+  ERR01-J.</a> - Do not allow exceptions to expose sensitive information</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2057.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2057.html
index bb11cb2772d..29b21769712 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2057.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2057.html
@@ -36,7 +36,8 @@ <h3>Exceptions</h3>
 <code>Error</code>s), and classes marked with <code>@SuppressWarnings("serial")</code> are ignored.</p>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ajdGBQ">CERT, SER00-J.</a> - Enable serialization compatibility during class evolution</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/serialization-ser/ser00-j">CERT,
+  SER00-J.</a> - Enable serialization compatibility during class evolution</li>
   <li><a href="https://docs.oracle.com/en/java/javase/16/docs/specs/serialization/serial-arch.html#serialization-of-records">Record Serialization</a>
   - Serialization of Records</li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2059.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2059.html
index 23f8e15f0da..85112ab4bb5 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2059.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2059.html
@@ -29,6 +29,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ZTdGBQ">CERT, SER05-J.</a> - Do not serialize instances of inner classes</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/serialization-ser/ser05-j">CERT,
+  SER05-J.</a> - Do not serialize instances of inner classes</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2061.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2061.html
index 0c5bd6d43b5..11df8635891 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2061.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2061.html
@@ -42,8 +42,8 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/WTdGBQ">CERT, SER01-J.</a> - Do not deviate from the proper signatures of serialization
-  methods</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/serialization-ser/ser01-j">CERT,
+  SER01-J.</a> - Do not deviate from the proper signatures of serialization methods</li>
   <li><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html">Oracle SDK - java.io.Serializable</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2066.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2066.html
index 0f4d1377077..4bd688542b4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2066.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2066.html
@@ -34,6 +34,7 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ZTdGBQ">CERT SER05-J.</a> - Do not serialize instances of inner classes</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/serialization-ser/ser05-j">CERT,
+  SER05-J.</a> - Do not serialize instances of inner classes</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.json
index 2d7e1399f56..fc12ceb2ead 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2068.json
@@ -15,7 +15,8 @@
   "quickfix": "infeasible",
   "tags": [
     "cwe",
-    "cert"
+    "cert",
+    "former-hotspot"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2068",
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 5eb1ede7bc6..2ac22139f9f 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
@@ -78,7 +78,8 @@ <h2>See</h2>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/564">CWE-564 - SQL Injection: Hibernate</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/20">CWE-20 - Improper Input Validation</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 href="https://wiki.sei.cmu.edu/confluence/x/ITdGBQ">CERT, IDS00-J.</a> - Prevent SQL injection</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/input-validation-and-data-sanitization-ids/ids00-j">CERT, IDS00-J.</a> - Prevent SQL injection</li>
   <li>Derived from FindSecBugs rules <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JPA">Potential SQL/JPQL Injection
   (JPA)</a>, <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JDO">Potential SQL/JDOQL Injection (JDO)</a>, <a
   href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_HIBERNATE">Potential SQL/HQL Injection (Hibernate)</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json
index 8fc140052fa..0e7bc3fb10e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json
@@ -19,7 +19,8 @@
     "bad-practice",
     "cert",
     "hibernate",
-    "sql"
+    "sql",
+    "former-hotspot"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2077",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
index 56c30f558e7..d69ce264447 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
@@ -16,7 +16,8 @@
   "tags": [
     "cwe",
     "spring",
-    "privacy"
+    "privacy",
+    "former-hotspot"
   ],
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-2092",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2093.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2093.html
index 83228b64482..59a5ef3be69 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2093.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2093.html
@@ -60,8 +60,8 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/6DZGBQ">CERT, ERR54-J.</a> - Use a try-with-resources statement to safely handle closeable
-  resources</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/exceptional-behavior-err/err54-j">CERT, ERR54-J.</a> - Use a try-with-resources statement to safely handle closeable resources</li>
   <li><a href="https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html">The Java™ Tutorials - The try-with-resources
   Statement</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2111.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2111.html
index 0c1993e6209..2d0fb37571d 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2111.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2111.html
@@ -28,6 +28,7 @@ <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
   <li><a href="https://docs.oracle.com/en/java/javase/20/docs/api/java.base/java/math/BigDecimal.html">Oracle - BigDecimal</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/kzdGBQ">CERT, NUM10-J</a> - Do not construct BigDecimal objects from floating-point literals</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/numeric-types-and-operations-num/num10-j">CERT, NUM10-J</a> - Do not construct BigDecimal objects from floating-point literals</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2143.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2143.html
index 695533b054e..b4c460a7cbe 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2143.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2143.html
@@ -1,7 +1,11 @@
 <h2>Why is this an issue?</h2>
-<p>The old, much-derided <code>Date</code> and <code>Calendar</code> classes have always been confusing and difficult to use properly, particularly in
-a multi-threaded context. <code>JodaTime</code> has long been a popular alternative, but now an even better option is built-in. Java 8’s JSR 310
-implementation offers specific classes for:</p>
+<p>The old, much-derided <code>Date</code> and <code>Calendar</code> classes have always been confusing and error-prone, particularly in a
+multi-threaded context. The JodaTime library has long been a popular alternative, but it is also considered outdated. Starting from Java SE 8, the
+built-in <code>java.time</code> (JSR-310) API provides a modern, immutable, and thread-safe framework that addresses these long-standing design
+flaws.</p>
+<p><strong>Note</strong>: While Joda-Time remains the standard for handling date and time in java versions prior to 8, users of newer versions should
+migrate to the <code>java.time</code> API.</p>
+<p>The <code>java.time</code> package offers specific classes for:</p>
 <table>
   <colgroup>
     <col style="width: 50%;">
@@ -16,34 +20,34 @@ <h2>Why is this an issue?</h2>
   <tbody>
     <tr>
       <td>
-        <p>LocalDate</p>
+        <p>Instant</p>
       </td>
       <td>
-        <p>a date, without time of day, offset, or zone</p>
+        <p>a timestamp</p>
       </td>
     </tr>
     <tr>
       <td>
-        <p>LocalTime</p>
+        <p>LocalDate</p>
       </td>
       <td>
-        <p>the time of day, without date, offset, or zone</p>
+        <p>a date, without time of day, offset, or zone</p>
       </td>
     </tr>
     <tr>
       <td>
-        <p>LocalDateTime</p>
+        <p>LocalTime</p>
       </td>
       <td>
-        <p>the date and time, without offset, or zone</p>
+        <p>the time of day, without date, offset, or zone</p>
       </td>
     </tr>
     <tr>
       <td>
-        <p>OffsetDate</p>
+        <p>LocalDateTime</p>
       </td>
       <td>
-        <p>a date with an offset such as +02:00, without time of day, or zone</p>
+        <p>the date and time, without offset, or zone</p>
       </td>
     </tr>
     <tr>
@@ -70,6 +74,14 @@ <h2>Why is this an issue?</h2>
         <p>the date and time with a time zone and offset</p>
       </td>
     </tr>
+    <tr>
+      <td>
+        <p>Year</p>
+      </td>
+      <td>
+        <p>a year</p>
+      </td>
+    </tr>
     <tr>
       <td>
         <p>YearMonth</p>
@@ -88,49 +100,63 @@ <h2>Why is this an issue?</h2>
     </tr>
     <tr>
       <td>
-        <p>Year/MonthOfDay/DayOfWeek/…​</p>
+        <p>Month/DayOfWeek</p>
       </td>
       <td>
-        <p>classes for the important fields</p>
+        <p>enum classes for date fields</p>
       </td>
     </tr>
     <tr>
       <td>
-        <p>DateTimeFields</p>
+        <p>Period</p>
       </td>
       <td>
-        <p>stores a map of field-value pairs which may be invalid</p>
+        <p>a date-based amount of time, such as "2 months and 3 days"</p>
       </td>
     </tr>
     <tr>
       <td>
-        <p>Calendrical</p>
+        <p>Duration</p>
       </td>
       <td>
-        <p>access to the low-level API</p>
+        <p>a time-based amount of time, such as "34.5 seconds"</p>
       </td>
     </tr>
     <tr>
       <td>
-        <p>Period</p>
+        <p>Clock</p>
       </td>
       <td>
-        <p>a descriptive amount of time, such as "2 months and 3 days"</p>
+        <p>a clock providing access to the current instant, date and time</p>
       </td>
     </tr>
   </tbody>
 </table>
+<h2>How to fix it</h2>
+<p>Use the <code>java.time</code> API instead of <code>java.util.Calendar</code>, <code>java.util.Date</code> or <code>JodaTime</code>.</p>
 <h3>Noncompliant code example</h3>
+<p>Use of <code>java.util.Date</code> or <code>java.util.Calendar</code></p>
 <pre>
 Date now = new Date();  // Noncompliant
 DateFormat df = new SimpleDateFormat("dd.MM.yyyy");
 Calendar christmas  = Calendar.getInstance();  // Noncompliant
 christmas.setTime(df.parse("25.12.2020"));
 </pre>
+<p>Use of Joda-Time</p>
+<pre>
+DateTime dateTime =  new DateTime(); // Noncompliant
+</pre>
 <h3>Compliant solution</h3>
 <pre>
-LocalDate now = LocalDate.now();  // gets calendar date. no time component
-LocalTime now2 = LocalTime.now(); // gets current time. no date component
-LocalDate christmas = LocalDate.of(2020,12,25);
+LocalDate nowUTC = LocalDate.now(ZoneOffset.UTC);  // gets current date in UTC
+LocalDate christmas = LocalDate.of(2020, Month.DECEMBER,25); // create date from year/month/day
+ZonedDateTime nowParis = ZonedDateTime.now(ZoneId.of("Europe/Paris")); // get current time in Paris with time-zone information
 </pre>
+<h2>Resources</h2>
+<h3>Documentation</h3>
+<ul>
+  <li>Java SE Documentation - java.time - <a
+  href="https://docs.oracle.com/en/java/javase/25/docs/api/java.base/java/time/package-summary.html">Official documentation for the java.time
+  package</a></li>
+</ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2151.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2151.html
index 171be0e8fdb..c2d16048cf4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2151.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2151.html
@@ -21,6 +21,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met12-j">CERT,
+  MET12-J.</a> - Do not use finalizers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2159.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2159.html
index c60184b9120..f3e7a437bb8 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2159.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2159.html
@@ -53,6 +53,7 @@ <h3>Noncompliant code example</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/5zdGBQ">CERT, EXP02-J.</a> - Do not use the Object.equals() method to compare two arrays</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp02-j">CERT,
+  EXP02-J.</a> - Do not use the Object.equals() method to compare two arrays</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2162.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2162.html
index 159d0296d26..f331611156f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2162.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2162.html
@@ -63,7 +63,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/AzZGBQ">CERT, MET08-J.</a> - Preserve the equality contract when overriding the equals()
-  method</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met08-j">CERT,
+  MET08-J.</a> - Preserve the equality contract when overriding the equals() method</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2164.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2164.html
index b45e3e8410c..a1126a382d0 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2164.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2164.html
@@ -25,7 +25,7 @@ <h3>Exceptions</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/CtcxBQ">CERT, FLP02-C.</a> - Avoid using floating-point numbers when precise computation is
-  needed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/floating-point-flp/flp02-c">CERT,
+  FLP02-C.</a> - Avoid using floating-point numbers when precise computation is needed</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2168.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2168.html
index 9008b5d254b..1728a990079 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2168.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2168.html
@@ -56,7 +56,8 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <ul>
   <li><a href="https://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html">The "Double-Checked Locking is Broken" Declaration</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/6zdGBQ">CERT, LCK10-J.</a> - Use a correct form of the double-checked locking idiom</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/locking-lck/lck10-j">CERT,
+  LCK10-J.</a> - Use a correct form of the double-checked locking idiom</li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/609">CWE-609 - Double-checked locking</a></li>
   <li><a href="https://docs.oracle.com/javase/specs/jls/se7/html/jls-12.html#jls-12.4">JLS 12.4</a> - Initialization of Classes and Interfaces</li>
   <li>Wikipedia: <a href="https://en.wikipedia.org/wiki/Double-checked_locking#Usage_in_Java">Double-checked locking</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2175.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2175.html
index 9d8722e5556..cc5abbf2417 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2175.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2175.html
@@ -49,8 +49,8 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/uDdGBQ">CERT, EXP04-J.</a> - Do not pass arguments to certain Java Collections Framework methods
-  that are a different type than the collection parameter type</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp04-j">CERT,
+  EXP04-J.</a> - Do not pass arguments to certain Java Collections Framework methods that are a different type than the collection parameter type</li>
   <li><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html">Java SE 17 &amp; JDK 17</a> - Collection
   interface</li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2178.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2178.html
index 8c0ea2b6b92..208fb010d0a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2178.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2178.html
@@ -11,6 +11,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/WNYxBQ">CERT, EXP46-C.</a> - Do not use a bitwise operator with a Boolean-like operand</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/rules/expressions-exp/exp46-c">CERT, EXP46-C.</a> - Do not
+  use a bitwise operator with a Boolean-like operand</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html
index b3ae629a724..8ba92c55733 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.html
@@ -58,10 +58,10 @@ <h2>Resources</h2>
 <h3>Standards</h3>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/190">CWE-190 - Integer Overflow or Wraparound</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/AjdGBQ">CERT, NUM50-J.</a> - Convert integers to floating point for floating-point
-  operations</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/I9cxBQ">CERT, INT18-C.</a> - Evaluate integer expressions in a larger size before comparing or
-  assigning to that size</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/numeric-types-and-operations-num/num50-j">CERT, NUM50-J.</a> - Convert integers to floating point for floating-point operations</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/integers-int/int18-c">CERT, INT18-C.</a> -
+  Evaluate integer expressions in a larger size before comparing or assigning to that size</li>
   <li>STIG Viewer - <a href="https://stigviewer.com/stigs/application_security_and_development/2024-12-06/finding/V-222612">Application Security and
   Development: V-222612</a> - The application must not be vulnerable to overflow attacks.</li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2197.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2197.html
index 2aacf28c199..729207a803b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2197.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2197.html
@@ -15,8 +15,9 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/pDdGBQ">CERT, NUM51-J.</a> - Do not assume that the remainder operator always returns a
-  nonnegative result for integral operands</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/_NUxBQ">CERT, INT10-C</a> - Do not assume a positive remainder when using the % operator</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/numeric-types-and-operations-num/num51-j">CERT, NUM51-J.</a> - Do not assume that the remainder operator always returns a nonnegative result for integral operands</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/integers-int/int10-c">CERT, INT10-C</a> -
+  Do not assume a positive remainder when using the % operator</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2201.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2201.html
index 1eccdaeb1cb..24b9b2e2243 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2201.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2201.html
@@ -103,6 +103,7 @@ <h3>Exceptions</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/xzdGBQ">CERT, EXP00-J.</a> - Do not ignore values returned by methods</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp00-j">CERT,
+  EXP00-J.</a> - Do not ignore values returned by methods</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2225.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2225.html
index ba4576978aa..d44b7eda456 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2225.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2225.html
@@ -20,6 +20,7 @@ <h3>Compliant solution</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/476">CWE-476 - NULL Pointer Dereference</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/aDdGBQ">CERT, EXP01-J.</a> - Do not use a null in a case where an object is required</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp01-j">CERT,
+  EXP01-J.</a> - Do not use a null in a case where an object is required</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 0e1c1f6f8bf..b87a1bee6f3 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
@@ -62,6 +62,7 @@ <h2>See</h2>
   Insufficient Cryptography</a></li>
   <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m10-insufficient-cryptography">Mobile Top 10 2024 Category M10 -
   Insufficient Cryptography</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/oTdGBQ">CERT, MSC02-J.</a> - Generate strong random numbers</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/miscellaneous-msc/msc02-j">CERT,
+  MSC02-J.</a> - Generate strong random numbers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2251.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2251.html
index a4a3033bf55..f07d76c8245 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2251.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2251.html
@@ -60,7 +60,9 @@ <h4>Compliant solution</h4>
 <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/aTdGBQ">CERT, MSC54-J.</a> - Avoid inadvertent wrapping of loop counters</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc54-j">CERT,
+  MSC54-J.</a> - Avoid inadvertent wrapping of loop counters</li>
 </ul>
 <h3>Articles &amp; blog posts</h3>
 <ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2274.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2274.html
index 22910bf3236..367fbd7be93 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2274.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2274.html
@@ -52,6 +52,7 @@ <h2>Resources</h2>
   <li><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/locks/Condition.html">Java SE 17 &amp; JDK 17</a> -
   Condition</li>
   <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait--">Java Platform SE 8</a> - Object#wait</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/EzdGBQ">CERT THI03-J.</a> - Always invoke wait() and await() methods inside a loop</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/thread-apis-thi/thi03-j">CERT,
+  THI03-J.</a> - Always invoke wait() and await() methods inside a loop</li>
 </ol>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2276.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2276.html
index cf07d319bc5..9cbfd916e6c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2276.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2276.html
@@ -33,6 +33,7 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/YTdGBQ">CERT, LCK09-J.</a> - Do not perform operations that can block while holding a lock</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/locking-lck/lck09-j">CERT,
+  LCK09-J.</a> - Do not perform operations that can block while holding a lock</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2384.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2384.html
index 71e52ba3cca..f0526bacb23 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2384.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2384.html
@@ -75,8 +75,11 @@ <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/374">CWE-374 - Passing Mutable Objects to an Untrusted Method</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/375">CWE-375 - Returning a Mutable Object to an Untrusted Caller</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/OTdGBQ">CERT, OBJ05-J.</a> - Do not return references to private mutable class members</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/HTdGBQ">CERT, OBJ06-J.</a> - Defensively copy mutable inputs and mutable internal components</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/VzZGBQ">CERT, OBJ13-J.</a> - Ensure that references to mutable objects are not exposed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/object-orientation-obj/obj05-j">CERT,
+  OBJ05-J.</a> - Do not return references to private mutable class members</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/object-orientation-obj/obj06-j">CERT,
+  OBJ06-J.</a> - Defensively copy mutable inputs and mutable internal components</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/object-orientation-obj/obj13-j">CERT,
+  OBJ13-J.</a> - Ensure that references to mutable objects are not exposed</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2386.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2386.html
index 1fedd472161..ab9254bb18e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2386.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2386.html
@@ -23,7 +23,9 @@ <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/582">CWE-582 - Array Declared Public, Final, and Static</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/607">CWE-607 - Public Static Final Field References Mutable Object</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/LjdGBQ">CERT, OBJ01-J.</a> - Limit accessibility of fields</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/VzZGBQ">CERT, OBJ13-J.</a> - Ensure that references to mutable objects are not exposed</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/object-orientation-obj/obj01-j">CERT,
+  OBJ01-J.</a> - Limit accessibility of fields</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/object-orientation-obj/obj13-j">CERT,
+  OBJ13-J.</a> - Ensure that references to mutable objects are not exposed</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2390.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2390.html
index 693990fa0c0..a1890a345f3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2390.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2390.html
@@ -24,8 +24,8 @@ <h3>Noncompliant code example</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li>CERT - <a href="https://wiki.sei.cmu.edu/confluence/display/java/DCL00-J.+Prevent+class+initialization+cycles">DCL00-J. Prevent class
-  initialization cycles</a></li>
+  <li>CERT - <a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/declarations-and-initialization-dcl/dcl00-j">DCL00-J. Prevent class initialization cycles</a></li>
   <li><a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-12.html#jls-12.4">Section 12.4: Initialization of Classes and Interfaces</a> -
   Java Language Specification</li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2442.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2442.html
index 2e28f4ac1d5..762a327bc9e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2442.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2442.html
@@ -23,7 +23,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/qjdGBQ">CERT, LCK03-J.</a> - Do not synchronize on the intrinsic locks of high-level concurrency
-  objects</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/locking-lck/lck03-j">CERT,
+  LCK03-J.</a> - Do not synchronize on the intrinsic locks of high-level concurrency objects</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2445.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2445.html
index 2171343e279..9738b56563c 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2445.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2445.html
@@ -36,7 +36,7 @@ <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/412">CWE-412 - Unrestricted Externally Accessible Lock</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/413">CWE-413 - Improper Resource Locking</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/djdGBQ">CERT, LCK00-J.</a> - Use private final lock objects to synchronize classes that may
-  interact with untrusted code</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/locking-lck/lck00-j">CERT,
+  LCK00-J.</a> - Use private final lock objects to synchronize classes that may interact with untrusted code</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2446.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2446.html
index 9328fa7fb2a..36255b3f9e8 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2446.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2446.html
@@ -32,6 +32,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/MTdGBQ">CERT, THI02-J.</a> - Notify all waiting threads rather than a single thread</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/thread-apis-thi/thi02-j">CERT,
+  THI02-J.</a> - Notify all waiting threads rather than a single thread</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2447.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2447.html
index fa8bfdefff3..bd6f4d1e653 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2447.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2447.html
@@ -38,6 +38,7 @@ <h3>Compliant solution</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/476">CWE-476 - NULL Pointer Dereference</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/aDdGBQ">CERT, EXP01-J.</a> - Do not use a null in a case where an object is required</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp01-j">CERT,
+  EXP01-J.</a> - Do not use a null in a case where an object is required</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 f858d9bfd48..b55c71635fe 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
@@ -76,7 +76,8 @@ <h3>Standards</h3>
   <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>CERT FIO01-J - <a href="https://wiki.sei.cmu.edu/confluence/display/java/FIO01-J.+Create+files+with+appropriate+access+permissions">CERT
-  guideline for creating files with appropriate access permissions in Java</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>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
index 49909d4f519..c4484e9d751 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
@@ -14,7 +14,8 @@
   },
   "tags": [
     "cwe",
-    "cert"
+    "cert",
+    "former-hotspot"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2612",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2674.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2674.html
index 02037e629ff..98f76ffd676 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2674.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2674.html
@@ -32,6 +32,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/VzdGBQ">CERT, FIO10-J.</a> - Ensure the array is filled when using read() to fill an array</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/input-output-fio/fio10-j">CERT,
+  FIO10-J.</a> - Ensure the array is filled when using read() to fill an array</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2681.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2681.html
index b0c47c5b67f..9ae69317606 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2681.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2681.html
@@ -30,6 +30,8 @@ <h2>Why is this an issue?</h2>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/483">CWE-483 - Incorrect Block Delimitation</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/MzZGBQ">CERT, EXP52-J.</a> - Use braces for the body of an if, for, or while statement</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/expressions-exp/exp52-j">CERT,
+  EXP52-J.</a> - Use braces for the body of an if, for, or while statement</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2693.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2693.html
index b869287bed7..e77e22454e0 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2693.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2693.html
@@ -16,6 +16,7 @@ <h3>Noncompliant code example</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/FDdGBQ">CERT, TSM02-J.</a> - Do not use background threads during class initialization</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/thread-safety-miscellaneous-tsm/tsm02-j">CERT, TSM02-J.</a> - Do not use background threads during class initialization</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html
index bc5ac236b8d..b3da1ad24fd 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.html
@@ -75,7 +75,9 @@ <h3>Articles &amp; blog posts</h3>
 </ul>
 <h3>Standards</h3>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/4jdGBQ">CERT, VNA01-J.</a> - Ensure visibility of shared references to immutable objects</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/visibility-and-atomicity-vna/vna01-j">CERT,
+  VNA01-J.</a> - Ensure visibility of shared references to immutable objects</li>
   <li>STIG Viewer - <a href="https://stigviewer.com/stigs/application_security_and_development/2024-12-06/finding/V-222567">Application Security and
   Development: V-222567</a> - The application must not be vulnerable to race conditions.</li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3011.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3011.html
index 63fee75c65b..0355cc08755 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3011.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3011.html
@@ -17,7 +17,7 @@ <h2>Resources</h2>
 <h3>Documentation</h3>
 <ul>
   <li><a href="https://en.wikipedia.org/wiki/Encapsulation_(computer_programming)">Wikipedia definition of Encapsulation</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/_jZGBQ">CERT, SEC05-J.</a> - Do not use reflection to increase accessibility of classes, methods,
-  or fields</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/platform-security-sec/sec05-j">CERT,
+  SEC05-J.</a> - Do not use reflection to increase accessibility of classes, methods, or fields</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3014.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3014.html
index 2bf49019117..d30a1c09c3f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3014.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3014.html
@@ -33,6 +33,7 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/YzdGBQ">CERT, THI01-J.</a> - Do not invoke ThreadGroup methods</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/thread-apis-thi/thi01-j">CERT,
+  THI01-J.</a> - Do not invoke ThreadGroup methods</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3034.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3034.html
index e26fbb411d9..b443752393e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3034.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3034.html
@@ -62,7 +62,8 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/kDZGBQ">CERT, NUM52-J.</a> - Be aware of numeric promotion behavior</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/numeric-types-and-operations-num/num52-j">CERT, NUM52-J.</a> - Be aware of numeric promotion behavior</li>
   <li><a href="https://en.wikipedia.org/wiki/Signed_number_representations#Two.27s_complement">Wikipedia</a> - Two’s complement</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3064.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3064.html
index 346dfcd70a6..179d9f5edf4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3064.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3064.html
@@ -44,7 +44,8 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/6zdGBQ">CERT, LCK10-J.</a> - Use a correct form of the double-checked locking idiom</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/locking-lck/lck10-j">CERT,
+  LCK10-J.</a> - Use a correct form of the double-checked locking idiom</li>
 </ul>
 <h3>Related rules</h3>
 <ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3067.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3067.html
index 2a4cdfc8d45..3fd1f2ce7dc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3067.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3067.html
@@ -23,6 +23,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/qTdGBQ">CERT, LCK02-J.</a> - Do not synchronize on the class object returned by getClass()</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/locking-lck/lck02-j">CERT,
+  LCK02-J.</a> - Do not synchronize on the class object returned by getClass()</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3077.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3077.html
index f5e80394b94..dcad12e0ce7 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3077.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3077.html
@@ -17,7 +17,8 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/UzdGBQ">CERT, CON50-J.</a> - Do not assume that declaring a reference volatile guarantees safe
-  publication of the members of the referenced object</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/concurrency-con/con50-j">CERT,
+  CON50-J.</a> - Do not assume that declaring a reference volatile guarantees safe publication of the members of the referenced object</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3078.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3078.html
index 237695bc5fb..384c57efeba 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3078.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3078.html
@@ -31,6 +31,8 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/SjdGBQ">CERT, VNA02-J.</a> - Ensure that compound operations on shared variables are atomic</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/visibility-and-atomicity-vna/vna02-j">CERT,
+  VNA02-J.</a> - Ensure that compound operations on shared variables are atomic</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3346.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3346.html
index 8e67816acb2..f6448080de9 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3346.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3346.html
@@ -12,6 +12,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/mjdGBQ">CERT, EXP06-J.</a> - Expressions used in assertions must not produce side effects</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp06-j">CERT,
+  EXP06-J.</a> - Expressions used in assertions must not produce side effects</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3366.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3366.html
index 67eb9662452..215f42b20d5 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3366.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3366.html
@@ -27,7 +27,9 @@ <h3>Exceptions</h3>
 by {rule:java:S3010} .</p>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/iDdGBQ">CERT, TSM01-J.</a> - Do not let the this reference escape during object construction</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/vzdGBQ">CERT, TSM03-J.</a> - Do not publish partially initialized objects</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/thread-safety-miscellaneous-tsm/tsm01-j">CERT, TSM01-J.</a> - Do not let the this reference escape during object construction</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/thread-safety-miscellaneous-tsm/tsm03-j">CERT, TSM03-J.</a> - Do not publish partially initialized objects</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3457.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3457.html
index 377d1664f32..5ad3a9841dd 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3457.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3457.html
@@ -59,7 +59,8 @@ <h4>Compliant solution</h4>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/J9YxBQ">CERT, FIO47-C.</a> - Use valid format strings</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/rules/input-output-fio/fio47-c">CERT, FIO47-C.</a> - Use
+  valid format strings</li>
   <li><a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/text/MessageFormat.html">java.text.MessageFormat</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3551.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3551.html
index 016e2865cc5..a5ba63aacda 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3551.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3551.html
@@ -39,7 +39,7 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/gzdGBQ">CERT, TSM00-J</a> - Do not override thread-safe methods with methods that are not
-  thread-safe</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/thread-safety-miscellaneous-tsm/tsm00-j">CERT, TSM00-J</a> - Do not override thread-safe methods with methods that are not thread-safe</li>
 </ul>
 
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 2b0a9042bca..96a023c444e 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
@@ -72,7 +72,8 @@ <h3>Standards</h3>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/332">CWE-332 - Insufficient Entropy in PRNG</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/336">CWE-336 - Same Seed in Pseudo-Random Number Generator (PRNG)</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/337">CWE-337 - Predictable Seed in Pseudo-Random Number Generator (PRNG)</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/display/java/MSC63-J.+Ensure+that+SecureRandom+is+properly+seeded">CERT, MSC63J.</a> - Ensure that
-  SecureRandom is properly seeded</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc63-j">CERT,
+  MSC63J.</a> - Ensure that SecureRandom is properly seeded</li>
 </ul>
 
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 a9513383605..dfbc3dc887b 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
@@ -144,6 +144,8 @@ <h3>Standards</h3>
   <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m5-insecure-communication">Mobile Top 10 2024 Category M5 - Insecure
   Communication</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>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/hDdGBQ">CERT, MSC61-J.</a> - Do not use insecure or weak cryptographic algorithms</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc61-j">CERT,
+  MSC61-J.</a> - Do not use insecure or weak cryptographic algorithms</li>
 </ul>
 
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 7bca208490f..9d167750e95 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
@@ -184,6 +184,8 @@ <h3>Standards</h3>
   Use of Cryptographic Algorithms and Key Lengths</li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/326">CWE-326 - Inadequate Encryption Strength</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>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/hDdGBQ">CERT, MSC61-J.</a> - Do not use insecure or weak cryptographic algorithms</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc61-j">CERT,
+  MSC61-J.</a> - Do not use insecure or weak cryptographic algorithms</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json
index 424b00cc4da..1192aac3943 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json
@@ -17,7 +17,8 @@
     "error-handling",
     "spring",
     "debug",
-    "user-experience"
+    "user-experience",
+    "former-hotspot"
   ],
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-4507",
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 42ebd686f70..6138c4c4717 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
@@ -1,31 +1,18 @@
-<p>Setting JavaBean properties is security sensitive. Doing it with untrusted values has led in the past to the following vulnerability:</p>
-<ul>
-  <li><a href="https://www.cve.org/CVERecord?id=CVE-2014-0114">CVE-2014-0114</a></li>
-</ul>
-<p>JavaBeans can have their properties or nested properties set by population functions. An attacker can leverage this feature to push into the
-JavaBean malicious data that can compromise the software integrity. A typical attack will try to manipulate the ClassLoader and finally execute
-malicious code.</p>
-<p>This rule raises an issue when:</p>
-<ul>
-  <li>BeanUtils.populate(…​) or BeanUtilsBean.populate(…​) from <a href="http://commons.apache.org/proper/commons-beanutils/">Apache Commons
-  BeanUtils</a> are called</li>
-  <li>BeanUtils.setProperty(…​) or BeanUtilsBean.setProperty(…​) from <a href="http://commons.apache.org/proper/commons-beanutils/">Apache Commons
-  BeanUtils</a> are called</li>
-  <li>org.springframework.beans.BeanWrapper.setPropertyValue(…​) or org.springframework.beans.BeanWrapper.setPropertyValues(…​) from Spring is
-  called</li>
-</ul>
-<h2>Ask Yourself Whether</h2>
-<ul>
-  <li>the new property values might have been tampered with or provided by an untrusted source.</li>
-  <li>sensitive properties can be modified, for example: <code>class.classLoader</code></li>
-</ul>
-<p>There is a risk if you answered yes to any of those questions.</p>
-<h2>Recommended Secure Coding Practices</h2>
-<p>Sanitize all values used as JavaBean properties.</p>
-<p>Don’t set any sensitive properties. Keep full control over which properties are set. If the property names are provided by an unstrusted source,
-filter them with a whitelist.</p>
-<h2>Sensitive Code Example</h2>
-<pre>
+<p>Setting JavaBean properties from untrusted user input can allow an attacker to manipulate arbitrary object properties, including sensitive
+internals such as <code>class.classLoader</code>.</p>
+<h2>Why is this an issue?</h2>
+<p>JavaBean property population functions such as <code>BeanUtils.populate()</code>, <code>BeanUtils.setProperty()</code>,
+<code>BeanUtilsBean.populate()</code>, and <code>BeanUtilsBean.setProperty()</code> from Apache Commons BeanUtils, and
+<code>BeanWrapper.setPropertyValue()</code> and <code>BeanWrapper.setPropertyValues()</code> from Spring, allow setting arbitrary bean properties by
+name. When the property names or values are derived from untrusted input without validation, an attacker can set sensitive properties — for example,
+<code>class.classLoader</code> — and use them to load and execute malicious code.</p>
+<h3>What is the potential impact?</h3>
+<p>If successfully exploited, this vulnerability can lead to remote code execution, full application compromise, data exfiltration, or lateral
+movement within the network.</p>
+<h2>How to fix it</h2>
+<h3>Code examples</h3>
+<h4>Noncompliant code example</h4>
+<pre data-diff-id="1" data-diff-type="noncompliant">
 Company bean = new Company();
 HashMap map = new HashMap();
 Enumeration names = request.getParameterNames();
@@ -33,17 +20,35 @@ <h2>Sensitive Code Example</h2>
     String name = (String) names.nextElement();
     map.put(name, request.getParameterValues(name));
 }
-BeanUtils.populate(bean, map); // Sensitive: "map" is populated with data coming from user input, here "request.getParameterNames()"
+BeanUtils.populate(bean, map); // Noncompliant: "map" is populated with data coming from user input, here "request.getParameterNames()"
 </pre>
-<h2>See</h2>
+<h4>Compliant solution</h4>
+<pre data-diff-id="1" data-diff-type="compliant">
+Company bean = new Company();
+HashMap map = new HashMap();
+Set&lt;String&gt; allowedProperties = Set.of("name", "address"); // define allowed properties
+Enumeration names = request.getParameterNames();
+while (names.hasMoreElements()) {
+    String name = (String) names.nextElement();
+    if (allowedProperties.contains(name)) {
+        map.put(name, request.getParameterValues(name));
+    }
+}
+BeanUtils.populate(bean, map);
+</pre>
+<h2>Resources</h2>
+<h3>Articles &amp; blog posts</h3>
+<ul>
+  <li><a href="https://www.cve.org/CVERecord?id=CVE-2014-0114">CVE-2014-0114</a></li>
+  <li><a href="https://find-sec-bugs.github.io/bugs.htm#BEAN_PROPERTY_INJECTION">FindSecBugs - BEAN_PROPERTY_INJECTION</a></li>
+</ul>
+<h3>Standards</h3>
 <ul>
+  <li>CWE - <a href="https://cwe.mitre.org/data/definitions/915">CWE-915 - Improperly Controlled Modification of Dynamically-Determined Object
+  Attributes</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/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>CWE - <a href="https://cwe.mitre.org/data/definitions/915">CWE-915 - Improperly Controlled Modification of Dynamically-Determined Object
-  Attributes</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/hDdGBQ">CERT, MSC61-J.</a> - Do not use insecure or weak cryptographic algorithms</li>
-  <li>Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#BEAN_PROPERTY_INJECTION">BEAN_PROPERTY_INJECTION</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.json
index 475d991a750..311e6924b8b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4512.json
@@ -1,6 +1,6 @@
 {
-  "title": "Setting JavaBean properties is security-sensitive",
-  "type": "SECURITY_HOTSPOT",
+  "title": "JavaBean properties should not be populated from untrusted input",
+  "type": "VULNERABILITY",
   "code": {
     "impacts": {
       "SECURITY": "HIGH"
@@ -14,7 +14,8 @@
   },
   "tags": [
     "cwe",
-    "cert"
+    "cert",
+    "former-hotspot"
   ],
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-4512",
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 05240565e0f..dc94cc5c2d5 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
@@ -67,7 +67,7 @@ <h3>Standards</h3>
   Misconfiguration</a></li>
   <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">Mobile Top 10 2016 Category M3 - Insecure
   Communication</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m5-insecure-communication">Mobile Top 10 2024 Category M5 - Insecure
+  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m5-insecure-communication">Mobile Top 10 2023 Category M5 - Insecure
   Communication</a></li>
   <li>OWASP - <a href="https://mas.owasp.org/checklists/MASVS-NETWORK/">Mobile AppSec Verification Standard - Network Communication
   Requirements</a></li>
@@ -75,6 +75,7 @@ <h3>Standards</h3>
   <li>STIG Viewer - <a href="https://stigviewer.com/stigs/application_security_and_development/2024-12-06/finding/V-222550">Application Security and
   Development: V-222550</a> - The application must validate certificates by constructing a certification path to an accepted trust anchor.</li>
   <li><a
-  href="https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms">https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms</a></li>
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc61-j">MSC61-J
+  - Do not use insecure or weak cryptographic algorithms</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4973.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4973.html
index 6d67615f6fd..3688ed27f5f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4973.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4973.html
@@ -19,8 +19,10 @@ <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/595">CWE-595 - Comparison of Object References Instead of Object Contents</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/597">CWE-597 - Use of Wrong Operator in String Comparison</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/UjdGBQ">CERT, EXP03-J.</a> - Do not use the equality operators when comparing values of boxed
-  primitives</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/yDdGBQ">CERT, EXP50-J.</a> - Do not confuse abstract object equality with reference equality</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp03-j">CERT,
+  EXP03-J.</a> - Do not use the equality operators when comparing values of boxed primitives</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/expressions-exp/exp50-j">CERT,
+  EXP50-J.</a> - Do not confuse abstract object equality with reference equality</li>
 </ul>
 
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 42cc42aaed0..5c728b672bb 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
@@ -3,27 +3,24 @@
 lead to denial of service. A Zip bomb is usually a malicious archive file of a few kilobytes of compressed data but turned into gigabytes of
 uncompressed data. To achieve this extreme <a href="https://en.wikipedia.org/wiki/Data_compression_ratio">compression ratio</a>, attackers will
 compress irrelevant data (eg: a long string of repeated bytes).</p>
-<h2>Ask Yourself Whether</h2>
-<p>Archives to expand are untrusted and:</p>
-<ul>
-  <li>There is no validation of the number of entries in the archive.</li>
-  <li>There is no validation of the total size of the uncompressed data.</li>
-  <li>There is no validation of the ratio between the compressed and uncompressed archive entry.</li>
-</ul>
-<p>There is a risk if you answered yes to any of those questions.</p>
-<h2>Recommended Secure Coding Practices</h2>
-<ul>
-  <li>Define and control the ratio between compressed and uncompressed data, in general the data compression ratio for most of the legit archives is 1
-  to 3.</li>
-  <li>Define and control the threshold for maximum total size of the uncompressed data.</li>
-  <li>Count the number of file entries extracted from the archive and abort the extraction if their number is greater than a predefined threshold, in
-  particular it’s not recommended to recursively expand archives (an entry of an archive could be also an archive).</li>
-</ul>
-<h2>Sensitive Code Example</h2>
-<pre>
+<h2>Why is this an issue?</h2>
+<p>Expanding archive files without controlling the size of the extracted data can lead to denial of service. A Zip bomb is a malicious archive of a
+few kilobytes of compressed data that expands into gigabytes of uncompressed data by compressing highly repetitive content. Applications that fail to
+validate the number of entries, total uncompressed size, or compression ratio of an archive are vulnerable to this attack.</p>
+<h3>What is the potential impact?</h3>
+<h4>Denial of service</h4>
+<p>An attacker who can supply a malicious archive can exhaust the server’s disk space, memory, or CPU by triggering unbounded decompression. This can
+make the application completely unavailable to legitimate users and may require manual intervention to recover the affected system.</p>
+<h2>How to fix it in Java SE</h2>
+<p>Validate the number of entries, total uncompressed size, and compression ratio when extracting archive files. Do not rely on <a
+href="https://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#getSize()">getSize</a> to retrieve the uncompressed size, as this value
+comes from archive headers that can be forged; calculate the actual size while reading.</p>
+<h3>Code examples</h3>
+<h4>Noncompliant code example</h4>
+<pre data-diff-id="1" data-diff-type="noncompliant">
 File f = new File("ZipBomb.zip");
 ZipFile zipFile = new ZipFile(f);
-Enumeration&lt;? extends ZipEntry&gt; entries = zipFile.entries(); // Sensitive
+Enumeration&lt;? extends ZipEntry&gt; entries = zipFile.entries(); // Noncompliant
 
 while(entries.hasMoreElements()) {
   ZipEntry ze = entries.nextElement();
@@ -31,19 +28,16 @@ <h2>Sensitive Code Example</h2>
   Files.copy(zipFile.getInputStream(ze), out.toPath(), StandardCopyOption.REPLACE_EXISTING);
 }
 </pre>
-<h2>Compliant Solution</h2>
-<p>Do not rely on <a href="https://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#getSize()">getsize</a> to retrieve the size of an
-uncompressed entry because this method returns what is defined in the archive headers which can be forged by attackers, instead calculate the actual
-entry size when unzipping it:</p>
-<pre>
+<h4>Compliant solution</h4>
+<pre data-diff-id="1" data-diff-type="compliant">
 File f = new File("ZipBomb.zip");
 ZipFile zipFile = new ZipFile(f);
 Enumeration&lt;? extends ZipEntry&gt; entries = zipFile.entries();
 
 int THRESHOLD_ENTRIES = 10000;
-int THRESHOLD_SIZE = 1000000000; // 1 GB
+long THRESHOLD_SIZE = 1000000000L; // 1 GB
 double THRESHOLD_RATIO = 10;
-int totalSizeArchive = 0;
+long totalSizeArchive = 0;
 int totalEntryArchive = 0;
 
 while(entries.hasMoreElements()) {
@@ -57,7 +51,7 @@ <h2>Compliant Solution</h2>
   byte[] buffer = new byte[2048];
   int totalSizeEntry = 0;
 
-  while((nBytes = in.read(buffer)) &gt; 0) { // Compliant
+  while((nBytes = in.read(buffer)) &gt; 0) {
       out.write(buffer, 0, nBytes);
       totalSizeEntry += nBytes;
       totalSizeArchive += nBytes;
@@ -80,7 +74,12 @@ <h2>Compliant Solution</h2>
   }
 }
 </pre>
-<h2>See</h2>
+<h2>Resources</h2>
+<h3>Articles &amp; blog posts</h3>
+<ul>
+  <li><a href="https://www.bamsoftware.com/hacks/zipbomb/">bamsoftware.com</a> - A better Zip Bomb</li>
+</ul>
+<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>
@@ -89,8 +88,7 @@ <h2>See</h2>
   <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">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><a href="https://wiki.sei.cmu.edu/confluence/display/java/IDS04-J.+Safely+extract+files+from+ZipInputStream">CERT, IDS04-J.</a> - Safely extract
-  files from ZipInputStream</li>
-  <li><a href="https://www.bamsoftware.com/hacks/zipbomb/">bamsoftware.com</a> - A better Zip Bomb</li>
+  <li>CERT - <a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/input-validation-and-data-sanitization-ids/ids04-j">CERT, IDS04-J.</a> - Safely extract files from ZipInputStream</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.json
index 32484b21a10..71dc87a9c66 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5042.json
@@ -1,9 +1,10 @@
 {
-  "title": "Expanding archive files without controlling resource consumption is security-sensitive",
-  "type": "SECURITY_HOTSPOT",
+  "title": "Expanding archive files should not be done without controlling resource consumption",
+  "type": "CODE_SMELL",
+  "quickfix": "unknown",
   "code": {
     "impacts": {
-      "SECURITY": "HIGH"
+      "RELIABILITY": "MEDIUM"
     },
     "attribute": "COMPLETE"
   },
@@ -14,9 +15,10 @@
   },
   "tags": [
     "cwe",
-    "cert"
+    "cert",
+    "former-hotspot"
   ],
-  "defaultSeverity": "Critical",
+  "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5042",
   "sqKey": "S5042",
   "scope": "Main",
@@ -38,6 +40,5 @@
     "ASVS 4.0": [
       "12.1.2"
     ]
-  },
-  "quickfix": "unknown"
+  }
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5324.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5324.html
index fe780b822e2..884ad1e6d0e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5324.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5324.html
@@ -52,7 +52,7 @@ <h3>Standards</h3>
   Requirements</a></li>
   <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m2-insecure-data-storage">Mobile Top 10 2016 Category M2 - Insecure Data
   Storage</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m9-insecure-data-storage">Mobile Top 10 2024 Category M9 - Insecure Data
+  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m9-insecure-data-storage">Mobile Top 10 2023 Category M9 - Insecure Data
   Storage</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/312">CWE-312 - Cleartext Storage of Sensitive Information</a></li>
 </ul>
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 a3fe6274025..342cd394b1b 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
@@ -203,12 +203,12 @@ <h3>Standards</h3>
   Requirements</a></li>
   <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">Mobile Top 10 2016 Category M3 - Insecure
   Communication</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m5-insecure-communication">Mobile Top 10 2024 Category M5 - Insecure
+  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m5-insecure-communication">Mobile Top 10 2023 Category M5 - Insecure
   Communication</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/297">CWE-297 - Improper Validation of Certificate with Host Mismatch</a></li>
   <li>STIG Viewer - <a href="https://stigviewer.com/stigs/application_security_and_development/2024-12-06/finding/V-222550">Application Security and
   Development: V-222550</a> - The application must validate certificates by constructing a certification path to an accepted trust anchor.</li>
   <li><a
-  href="https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms">https://wiki.sei.cmu.edu/confluence/display/java/MSC61-J.+Do+not+use+insecure+or+weak+cryptographic+algorithms</a></li>
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc61-j">https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc61-j</a></li>
 </ul>
 
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 1f911e35fad..f6498d2ca9d 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
@@ -134,6 +134,8 @@ <h3>Standards</h3>
   Insufficient Cryptography</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>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/780">CWE-780 - Use of RSA Algorithm without OAEP</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/hDdGBQ">CERT, MSC61-J.</a> - Do not use insecure or weak cryptographic algorithms</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/miscellaneous-msc/msc61-j">CERT,
+  MSC61-J.</a> - Do not use insecure or weak cryptographic algorithms</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5738.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5738.html
index f87da44a396..58cfc1c1819 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5738.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5738.html
@@ -58,7 +58,8 @@ <h4>Noncompliant code example</h4>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/477">CWE-477 - Use of Obsolete Functions</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/6TdGBQ">CERT, MET02-J.</a> - Do not use deprecated or obsolete classes or methods</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/methods-met/met02-j">CERT,
+  MET02-J.</a> - Do not use deprecated or obsolete classes or methods</li>
   <li>RSPEC-1874 for standard deprecation use</li>
 </ul>
 
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 088f3504ee5..9271b6a528e 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
@@ -73,7 +73,9 @@ <h2>Resources</h2>
   <li>OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication">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 href="https://wiki.sei.cmu.edu/confluence/x/OjdGBQ">MSC03-J - Never hard code sensitive information</a></li>
+  <li>MSC - <a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/miscellaneous-msc/msc03-j">MSC03-J - Never
+  hard code sensitive information</a></li>
   <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m1-improper-credential-usage.html">Mobile Top 10 2024 Category M1 -
   Improper Credential Usage</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.json
index 99c7c5b6f3f..6c5dda39b59 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.json
@@ -15,7 +15,8 @@
   "quickfix": "infeasible",
   "tags": [
     "cwe",
-    "cert"
+    "cert",
+    "former-hotspot"
   ],
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-6418",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7409.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7409.html
index dfc9747a5f5..68d5db16f47 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7409.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S7409.html
@@ -91,9 +91,9 @@ <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-mobile-top-10/2023-risks/m4-insufficient-input-output-validation.html">Mobile Top 10 2024
+  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m4-insufficient-input-output-validation.html">Mobile Top 10 2023
   Category M4 - Insufficient Input/Output Validation</a></li>
-  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m8-security-misconfiguration.html">Mobile Top 10 2024 Category M8 -
+  <li>OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2023-risks/m8-security-misconfiguration.html">Mobile Top 10 2023 Category M8 -
   Security Misconfiguration</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/749">CWE-749 - Exposed Dangerous Method or Function</a></li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S818.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S818.html
index 1cdff6a1173..0bb0963effc 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S818.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S818.html
@@ -14,7 +14,9 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/cdYxBQ">CERT DCL16-C.</a> - Use "L," not "l," to indicate a long value</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/7DZGBQ">CERT, DCL50-J.</a> - Use visually distinct identifiers</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/declarations-and-initialization-dcl/dcl16-c">CERT, DCL16-C.</a> - Use "L," not "l," to indicate a long value</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/declarations-and-initialization-dcl/dcl50-j">CERT, DCL50-J.</a> - Use visually distinct identifiers</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S864.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S864.html
index e1e6bee426f..b823528f857 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S864.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S864.html
@@ -138,8 +138,11 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/YdYxBQ">CERT, EXP00-C.</a> - Use parentheses for precedence of operation</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ZzZGBQ">CERT, EXP53-J.</a> - Use parentheses for precedence of operation</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/expressions-exp/exp00-c">CERT,
+  EXP00-C.</a> - Use parentheses for precedence of operation</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/expressions-exp/exp53-j">CERT,
+  EXP53-J.</a> - Use parentheses for precedence of operation</li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/783">CWE-783 - Operator Precedence Logic Error</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S881.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S881.html
index 52f2de19227..d9d8843c858 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S881.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S881.html
@@ -21,9 +21,11 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/StYxBQ">CERT, EXP30-C.</a> - Do not depend on the order of evaluation for side effects</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/IXw-BQ">CERT, EXP50-CPP.</a> - Do not depend on the order of evaluation for side effects</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/NDdGBQ">CERT, EXP05-J.</a> - Do not follow a write by a subsequent write or read of the same
-  object within an expression</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/rules/expressions-exp/exp30-c">CERT, EXP30-C.</a> - Do not
+  depend on the order of evaluation for side effects</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-cpp-coding-standard/rules/expressions-exp/exp50-cpp">CERT, EXP50-CPP.</a> -
+  Do not depend on the order of evaluation for side effects</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp05-j">CERT,
+  EXP05-J.</a> - Do not follow a write by a subsequent write or read of the same object within an expression</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S888.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S888.html
index 8182a1d39f6..3b9b399ae96 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S888.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S888.html
@@ -35,6 +35,7 @@ <h3>Exceptions</h3>
 <h2>Resources</h2>
 <ul>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/835">CWE-835 - Loop with Unreachable Exit Condition ('Infinite Loop')</a></li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/x9YxBQ">CERT, MSC21-C.</a> - Use robust loop termination conditions</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-c-coding-standard/recommendations/miscellaneous-msc/msc21-c">CERT,
+  MSC21-C.</a> - Use robust loop termination conditions</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S899.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S899.html
index 989095024bb..f866415d84a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S899.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S899.html
@@ -33,8 +33,10 @@ <h3>Compliant solution</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/xzdGBQ">CERT, EXP00-J.</a> - Do not ignore values returned by methods</li>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/x/TTZGBQ">CERT, FIO02-J.</a> - Detect and handle file-related errors</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/expressions-exp/exp00-j">CERT,
+  EXP00-J.</a> - Do not ignore values returned by methods</li>
+  <li><a href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/input-output-fio/fio02-j">CERT,
+  FIO02-J.</a> - Detect and handle file-related errors</li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/754">CWE-754 - Improper Check for Unusual Exceptional Conditions</a></li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S923.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S923.html
index 76470ab698b..1c6bff832f4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S923.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S923.html
@@ -13,7 +13,7 @@ <h3>Noncompliant code example</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li><a href="https://wiki.sei.cmu.edu/confluence/display/java/DCL57-J.+Avoid+ambiguous+overloading+of+variable+arity+methods">CERT, DCL57J</a> -
-  Avoid ambiguous overloading of variable arity methods</li>
+  <li><a
+  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/recommendations/declarations-and-initialization-dcl/dcl57-j">CERT, DCL57J</a> - Avoid ambiguous overloading of variable arity methods</li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json
index ab7c96504a9..8183be0098b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json
@@ -156,6 +156,7 @@
     "S2139",
     "S2140",
     "S2142",
+    "S2143",
     "S2147",
     "S2151",
     "S2153",
diff --git a/sonarpedia.json b/sonarpedia.json
index 48d67623420..38f66f406f5 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -3,7 +3,7 @@
   "languages": [
     "JAVA"
   ],
-  "latest-update": "2026-04-24T14:36:54.720528421Z",
+  "latest-update": "2026-05-07T15:03:31.056802325Z",
   "options": {
     "no-language-in-filenames": true,
     "preserve-filenames": false

From ecafbba2879cb953f3bcee32028dd11370fc990f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Coet?= <aurelien.coet@sonarsource.com>
Date: Fri, 8 May 2026 15:11:07 +0200
Subject: [PATCH 2/2] Revert rules with inconsistant metadata

---
 .../main/resources/org/sonar/l10n/java/rules/java/S2077.html   | 3 +--
 .../main/resources/org/sonar/l10n/java/rules/java/S2077.json   | 3 +--
 .../main/resources/org/sonar/l10n/java/rules/java/S4507.json   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

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 2ac22139f9f..5eb1ede7bc6 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
@@ -78,8 +78,7 @@ <h2>See</h2>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/564">CWE-564 - SQL Injection: Hibernate</a></li>
   <li>CWE - <a href="https://cwe.mitre.org/data/definitions/20">CWE-20 - Improper Input Validation</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
-  href="https://cmu-sei.github.io/secure-coding-standards/sei-cert-oracle-coding-standard-for-java/rules/input-validation-and-data-sanitization-ids/ids00-j">CERT, IDS00-J.</a> - Prevent SQL injection</li>
+  <li><a href="https://wiki.sei.cmu.edu/confluence/x/ITdGBQ">CERT, IDS00-J.</a> - Prevent SQL injection</li>
   <li>Derived from FindSecBugs rules <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JPA">Potential SQL/JPQL Injection
   (JPA)</a>, <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JDO">Potential SQL/JDOQL Injection (JDO)</a>, <a
   href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_HIBERNATE">Potential SQL/HQL Injection (Hibernate)</a></li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json
index 0e7bc3fb10e..8fc140052fa 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.json
@@ -19,8 +19,7 @@
     "bad-practice",
     "cert",
     "hibernate",
-    "sql",
-    "former-hotspot"
+    "sql"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2077",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json
index 1192aac3943..424b00cc4da 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4507.json
@@ -17,8 +17,7 @@
     "error-handling",
     "spring",
     "debug",
-    "user-experience",
-    "former-hotspot"
+    "user-experience"
   ],
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-4507",