diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S100_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S100_java.json
index d33ba174073..e5812e15d05 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S100_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S100_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-100",
   "sqKey": "S100",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S101_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S101_java.json
index a3f372d5ec3..3706fbc91f4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S101_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S101_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-101",
   "sqKey": "S101",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S103_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S103_java.json
index 01e4e980438..52d5912389c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S103_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S103_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-103",
   "sqKey": "S103",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S104_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S104_java.json
index fb141bb6c4f..4dacf1f69f3 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S104_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S104_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-104",
   "sqKey": "S104",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S105_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S105_java.json
index 3ae3c256040..771eae73499 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S105_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S105_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-105",
   "sqKey": "S105",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1066_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1066_java.json
index 16f59cf6f31..3089fe0f1ca 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1066_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1066_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1066",
   "sqKey": "S1066",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1067_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1067_java.json
index 97a5baaacb5..b6f4b5ac3d7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1067_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1067_java.json
@@ -14,6 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1067",
   "sqKey": "S1067",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.html
index 46207f637b3..36b4f96f946 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.html
@@ -17,6 +17,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/">OWASP Top 10 2021 Category A9</a> - Security Logging and
+  Monitoring Failures </li>
+  <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
+  </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/nzdGBQ">CERT, ERR02-J.</a> - Prevent exceptions while logging data </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.json
index 642f48b50d5..9f82688167d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S106_java.json
@@ -18,6 +18,12 @@
   "securityStandards": {
     "CERT": [
       "ERR02-J."
+    ],
+    "OWASP": [
+      "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A9"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S107_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S107_java.json
index 23fe875e072..31f7c8773f4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S107_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S107_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-107",
   "sqKey": "S107",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S108_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S108_java.json
index 4061cc7fe91..28af3204ae5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S108_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S108_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-108",
   "sqKey": "S108",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1104_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1104_java.html
index b191ce1c48f..d999ec731b8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1104_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1104_java.html
@@ -38,6 +38,6 @@ <h2>Exceptions</h2>
 ignored, as annotations are often used by injection frameworks, which in exchange require having public fields.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/493.html">MITRE, CWE-493</a> - Critical Public Variable Without Final Modifier </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/493.html">MITRE, CWE-493</a> - Critical Public Variable Without Final Modifier </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1105_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1105_java.json
index 4a9238354be..2c0f46889a7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1105_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1105_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1105",
   "sqKey": "S1105",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1110_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1110_java.json
index c154ef1314d..33fd642c65d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1110_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1110_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1110",
   "sqKey": "S1110",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1111_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1111_java.html
index 051548daf49..6b9022be1cd 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1111_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1111_java.html
@@ -8,7 +8,7 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/586.html">MITRE, CWE-586</a> - Explicit Call to Finalize() </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/586.html">MITRE, CWE-586</a> - Explicit Call to Finalize() </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1114_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1114_java.html
index 64c79c117dd..f5fc561274b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1114_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1114_java.html
@@ -21,7 +21,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/568.html">MITRE, CWE-568</a> - finalize() Method Without super.finalize() </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/568.html">MITRE, CWE-568</a> - finalize() Method Without super.finalize() </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1116_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1116_java.json
index 48cd59643ad..90ef60e19a3 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1116_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1116_java.json
@@ -13,7 +13,7 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1116",
   "sqKey": "S1116",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "covered",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1117_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1117_java.json
index 9591e6f0ac5..5ba40a0c168 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1117_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1117_java.json
@@ -14,7 +14,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1117",
   "sqKey": "S1117",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1119_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1119_java.json
index 398942a7b55..80d8bb17a42 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1119_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1119_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1119",
   "sqKey": "S1119",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.html
index 1651f235252..104968e5ec8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.html
@@ -26,7 +26,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/481.html">MITRE, CWE-481</a> - Assigning instead of Comparing </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/481.html">MITRE, CWE-481</a> - Assigning instead of Comparing </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/ZNYxBQ">CERT, EXP45-C.</a> - Do not perform assignments in selection statements </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/ITZGBQ">CERT, EXP51-J.</a> - Do not perform assignments in conditional expressions </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.json
index 8fca8887314..63a3c9f71e6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1121_java.json
@@ -14,12 +14,15 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1121",
   "sqKey": "S1121",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "EXP45-C.",
       "EXP51-J.",
       "EXP19-CPP."
+    ],
+    "CWE": [
+      481
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1125_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1125_java.json
index 36280de89aa..5762255357f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1125_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1125_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1125",
   "sqKey": "S1125",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "partial"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1126_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1126_java.json
index 34aa78b2eda..41a889946d8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1126_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1126_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1126",
   "sqKey": "S1126",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1128_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1128_java.json
index 4a7b949c41c..76d8ad5383f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1128_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1128_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1128",
   "sqKey": "S1128",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "covered"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.html
index 91ad9096af4..2c0dca8c394 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.html
@@ -28,7 +28,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/_DdGBQ">CERT, ERR07-J.</a> - Do not throw RuntimeException, Exception, or Throwable </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.json
index 7f3e423090b..6018f3c10ca 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S112_java.json
@@ -18,6 +18,9 @@
   "securityStandards": {
     "CERT": [
       "ERR07-J."
+    ],
+    "CWE": [
+      397
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.html
index 457993ebea9..b41e8d74116 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.html
@@ -9,6 +9,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.json
index d4579b29bd9..00aef3d01f5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1134_java.json
@@ -12,7 +12,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1134",
   "sqKey": "S1134",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CWE": [
       546
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.html
index 64b7e87d71c..b84405a1d49 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.html
@@ -9,6 +9,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.json
index 13b7655e993..0246922dec6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1135_java.json
@@ -12,7 +12,7 @@
   "defaultSeverity": "Info",
   "ruleSpecification": "RSPEC-1135",
   "sqKey": "S1135",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CWE": [
       546
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S113_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S113_java.json
index 12bc3b90c9b..e03be583dcc 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S113_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S113_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-113",
   "sqKey": "S113",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.html
index 3a394eb74fa..db8aae2bec7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.html
@@ -57,7 +57,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/584.html">MITRE, CWE-584</a> - Return Inside Finally Block </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/584.html">MITRE, CWE-584</a> - Return Inside Finally Block </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.json
index 6de466bda24..fa61e9d0986 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1143_java.json
@@ -14,10 +14,13 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1143",
   "sqKey": "S1143",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "ERR04-J."
+    ],
+    "CWE": [
+      584
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.html
index c0e402edc8f..43016748a9a 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.html
@@ -13,7 +13,7 @@ <h2>Exceptions</h2>
 <p>These methods are ignored inside <code>main</code>.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/382.html">MITRE, CWE-382</a> - Use of System.exit() </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/382.html">MITRE, CWE-382</a> - Use of System.exit() </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.json
index b57c24c72cf..f7818b4b786 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1147_java.json
@@ -18,6 +18,9 @@
   "securityStandards": {
     "CERT": [
       "ERR09-J."
+    ],
+    "CWE": [
+      382
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.html
index 91e65d973b3..e6fc168ea09 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.html
@@ -69,6 +69,8 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/">OWASP Top 10 2021 Category A9</a> - Security Logging and
+  Monitoring Failures </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/xDdGBQ">CERT, ERR00-J.</a> - Do not suppress or ignore checked exceptions </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.json
index 6f4167c4f51..2c21fd265f9 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1166_java.json
@@ -20,6 +20,15 @@
   "securityStandards": {
     "CERT": [
       "ERR00-J."
+    ],
+    "CWE": [
+      778
+    ],
+    "OWASP": [
+      "A10"
+    ],
+    "OWASP Top 10 2021": [
+      "A9"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1172_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1172_java.json
index 141c167357a..85c21a0ef90 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1172_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1172_java.json
@@ -13,7 +13,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1172",
   "sqKey": "S1172",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "covered",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1174_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1174_java.html
index ddb0fa59d00..056923b6a81 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1174_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1174_java.html
@@ -12,7 +12,7 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/583.html">MITRE, CWE-583</a> - finalize() Method Declared Public </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/583.html">MITRE, CWE-583</a> - finalize() Method Declared Public </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/4jZGBQ">CERT, MET12-J.</a> - Do not use finalizers </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S117_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S117_java.json
index 7b14a281506..c7da2d77dd7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S117_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S117_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-117",
   "sqKey": "S117",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1181_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1181_java.html
index 667ecb4ecbb..2a602321613 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1181_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1181_java.html
@@ -14,7 +14,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/396.html">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/396.html">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
   <li> <a href="https://github.com/isocpp/CppCoreGuidelines/blob/036324/CppCoreGuidelines.md#Re-exception-types">C++ Core Guidelines E.14</a> - Use
   purpose-designed user-defined types as exceptions (not built-in types) </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1182_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1182_java.html
index 400872ac60f..3a2bdcf8d12 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1182_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1182_java.html
@@ -63,7 +63,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/580.html">MITRE, CWE-580</a> - clone() Method Without super.clone() </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/580.html">MITRE, CWE-580</a> - clone() Method Without super.clone() </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186_java.json
index 0a485134ceb..01ddf94c1c6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1186",
   "sqKey": "S1186",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "covered"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.html
index 9029a74da52..369000da9be 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.html
@@ -37,7 +37,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/581.html">MITRE, CWE-581</a> - Object Model Violation: Just One of Equals and Hashcode Defined
+  <li> <a href="https://cwe.mitre.org/data/definitions/581.html">MITRE, CWE-581</a> - Object Model Violation: Just One of Equals and Hashcode Defined
   </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>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.json
index 65fd0105dac..e10bfeb576c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.json
@@ -17,6 +17,9 @@
   "securityStandards": {
     "CERT": [
       "MET09-J."
+    ],
+    "CWE": [
+      581
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.html
index 0979ec41560..bf38f7d58b2 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.html
@@ -13,7 +13,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/572.html">MITRE, CWE-572</a> - Call to Thread run() instead of start() </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/572.html">MITRE, CWE-572</a> - Call to Thread run() instead of start() </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/6DdGBQ">CERT THI00-J.</a> - Do not invoke Thread.run() </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.json
index 16a8f5458b4..1b6f00d9d52 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-1219",
   "sqKey": "S1219",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.json
index 8b095225623..66b81fa346e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.json
@@ -13,7 +13,7 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-121",
   "sqKey": "S121",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.json
index 20b25ed1da7..1c879718e61 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1226",
   "sqKey": "S1226",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.json
index c2fbeb76801..19209565097 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-122",
   "sqKey": "S122",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.json
index e6bd6e3ddf4..be1dc66e753 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-125",
   "sqKey": "S125",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.json
index f28e97a9b29..a6dc1daa726 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1264",
   "sqKey": "S1264",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.json
index d1d19f289f5..d04c357c61b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.json
@@ -12,7 +12,7 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-126",
   "sqKey": "S126",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.html
index aff1813f998..b8ee3d4762d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.html
@@ -47,7 +47,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/484.html">MITRE, CWE-484</a> - Omitted Break Statement in Switch </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/484.html">MITRE, CWE-484</a> - Omitted Break Statement in Switch </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
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.json
index 02a42f8e2af..957eedb9571 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.json
@@ -14,11 +14,14 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-128",
   "sqKey": "S128",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "MSC17-C.",
       "MSC52-J."
+    ],
+    "CWE": [
+      484
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.json
index 044a36e7cf9..cd9f27a18ee 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1301",
   "sqKey": "S1301",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.html
index 54219dcfe2b..8f1ad651ca6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.html
@@ -46,6 +46,7 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/OjdGBQ">CERT, MSC03-J.</a> - Never hard code sensitive information </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.json
index f69436fdf44..695f1ebb5c8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.json
@@ -17,6 +17,12 @@
   "securityStandards": {
     "CERT": [
       "MSC03-J."
+    ],
+    "OWASP": [
+      "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1314_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1314_java.json
index 9418cc1c842..6fb126a9b1c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1314_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1314_java.json
@@ -13,7 +13,7 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-1314",
   "sqKey": "S1314",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.html
index 617f5a0304c..daf910ef4b0 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.html
@@ -57,7 +57,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/478.html">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/478.html">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/RtYxBQ">CERT, MSC01-C.</a> - Strive for logical completeness </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.json
index c57c8400eff..89d3fc218ca 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.json
@@ -13,10 +13,13 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-131",
   "sqKey": "S131",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "MSC01-C."
+    ],
+    "CWE": [
+      478
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S134_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S134_java.json
index 9a0f3c4b102..a458ba65172 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S134_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S134_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-134",
   "sqKey": "S134",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S135_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S135_java.json
index c3ef69011a4..b8f22b3d617 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S135_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S135_java.json
@@ -13,6 +13,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-135",
   "sqKey": "S135",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S139_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S139_java.json
index 88077f0cfc3..554f8498994 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S139_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S139_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-139",
   "sqKey": "S139",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.html
index e848b18e3b6..ec3c0a5a39d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.html
@@ -17,7 +17,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/500.html">MITRE, CWE-500</a> - Public Static Field Not Marked Final </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/500.html">MITRE, CWE-500</a> - Public Static Field Not Marked Final </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/WjdGBQ">CERT OBJ10-J.</a> - Do not use public static nonfinal fields </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.json
index dcf12f61bdf..ab07941d688 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1444_java.json
@@ -17,6 +17,9 @@
   "securityStandards": {
     "CERT": [
       "OBJ10-J."
+    ],
+    "CWE": [
+      500
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1451_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1451_java.json
index a7c4bf25394..907c05269fb 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1451_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1451_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Blocker",
   "ruleSpecification": "RSPEC-1451",
   "sqKey": "S1451",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1479_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1479_java.json
index 5cd78ee4590..d1c9ed53afc 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1479_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1479_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1479",
   "sqKey": "S1479",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1481_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1481_java.json
index dea37bc44eb..d991044bdca 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1481_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1481_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1481",
   "sqKey": "S1481",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "partial"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1488_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1488_java.json
index af01cb5bca1..86457fda605 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1488_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1488_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1488",
   "sqKey": "S1488",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "covered"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1656_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1656_java.json
index e15511faa37..9c0aa2f4d23 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1656_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1656_java.json
@@ -12,7 +12,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1656",
   "sqKey": "S1656",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.html
index c066332541d..3cb90a5a483 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.html
@@ -30,7 +30,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/395.html">MITRE, CWE-395</a> - Use of NullPointerException Catch to Detect NULL Pointer
+  <li> <a href="https://cwe.mitre.org/data/definitions/395.html">MITRE, CWE-395</a> - Use of NullPointerException Catch to Detect NULL Pointer
   Dereference </li>
   <li> <a href="https://tinyurl.com/y6r4amg3">CERT, ERR08-J.</a> - Do not catch NullPointerException or any of its ancestors </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.json
index 28415a72ff8..1cf6293cb79 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1696_java.json
@@ -18,6 +18,9 @@
   "securityStandards": {
     "CERT": [
       "ERR08-J."
+    ],
+    "CWE": [
+      395
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.html
index d2c8243700e..15cbe5ea269 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.html
@@ -54,8 +54,8 @@ <h2>Exceptions</h2>
 <h2>See</h2>
 <ul>
   <li> {rule:java:S4973} - Strings and Boxed types should be compared using "equals()" </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/595.html">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/597.html">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/595.html">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/597.html">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </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
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.json
index 2c73c90ee26..cfec713c9f1 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1698_java.json
@@ -19,6 +19,10 @@
     "CERT": [
       "EXP03-J.",
       "EXP50-J."
+    ],
+    "CWE": [
+      595,
+      597
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1751_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1751_java.json
index 3a47297aaf4..be938c138df 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1751_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1751_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1751",
   "sqKey": "S1751",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1764_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1764_java.json
index aff9b62da36..f4ffcc7a267 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1764_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1764_java.json
@@ -12,7 +12,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1764",
   "sqKey": "S1764",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1774_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1774_java.json
index 54a9a27fb26..d57cef9e263 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1774_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1774_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1774",
   "sqKey": "S1774",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1821_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1821_java.json
index d459d5bc7d1..3e47a5ef3bf 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1821_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1821_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1821",
   "sqKey": "S1821",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.html
index dff6abbc0b7..2aac89a24aa 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.html
@@ -15,7 +15,7 @@ <h2>Exceptions</h2>
 <p>This rule ignores initializations to -1, 0, 1, <code>null</code>, <code>true</code>, <code>false</code> and <code>""</code>.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/39UxBQ">CERT, MSC13-C.</a> - Detect and remove unused values </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/9DZGBQ">CERT, MSC56-J.</a> - Detect and remove superfluous code and values </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.json
index 474a309abd9..d985bb9f3b7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1854_java.json
@@ -14,11 +14,14 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1854",
   "sqKey": "S1854",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "MSC13-C.",
       "MSC56-J."
+    ],
+    "CWE": [
+      563
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1862_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1862_java.json
index df51c78e2c6..e7aef14b390 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1862_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1862_java.json
@@ -14,7 +14,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-1862",
   "sqKey": "S1862",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.html
index bf832f4ef22..4c2f80c2abd 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.html
@@ -49,7 +49,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/486.html">MITRE, CWE-486</a> - Comparison of Classes by Name </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/486.html">MITRE, CWE-486</a> - Comparison of Classes by Name </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/eDdGBQ">CERT, OBJ09-J.</a> - Compare classes and not class names </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.json
index a237f007fd5..1029f6ceaed 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1872_java.json
@@ -17,6 +17,9 @@
   "securityStandards": {
     "CERT": [
       "OBJ09-J."
+    ],
+    "CWE": [
+      486
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.html
index 33674e94495..14cb5cb3339 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.html
@@ -33,7 +33,7 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/477.html">MITRE, CWE-477</a> - Use of Obsolete Functions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/477.html">MITRE, CWE-477</a> - Use of Obsolete Functions </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.json
index b9fabfc9263..36b963999f9 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1874_java.json
@@ -18,6 +18,9 @@
   "securityStandards": {
     "CERT": [
       "MET02-J."
+    ],
+    "CWE": [
+      477
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1940_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1940_java.json
index 4cc1afce1fa..582025e8d03 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1940_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1940_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-1940",
   "sqKey": "S1940",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1948_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1948_java.html
index 76d138cfec9..c951c607d41 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1948_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1948_java.html
@@ -42,7 +42,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/594.html">MITRE, CWE-594</a> - Saving Unserializable Objects to Disk </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/594.html">MITRE, CWE-594</a> - Saving Unserializable Objects to Disk </li>
   <li> <a href="https://docs.oracle.com/javase/6/docs/api/java/io/Serializable.html">Oracle Java 6, Serializable</a> </li>
   <li> <a href="https://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html">Oracle Java 7, Serializable</a> </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1989_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1989_java.html
index c1ba7358877..7233c4875f9 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1989_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1989_java.html
@@ -30,7 +30,7 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/600.html">MITRE, CWE-600</a> - Uncaught Exception in Servlet </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/600.html">MITRE, CWE-600</a> - Uncaught Exception in Servlet </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1994_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1994_java.json
index 291a085dd7e..95c3ab595cf 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1994_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1994_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-1994",
   "sqKey": "S1994",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.html
index 52a26daa836..31b2ab2c779 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.html
@@ -29,10 +29,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/759.html">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/760.html">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/759.html">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/760.html">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.json
index 8f91d7fedfc..79404b7f534 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2053_java.json
@@ -22,6 +22,9 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.html
index b201832a6ff..52fbae8f62c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.html
@@ -21,7 +21,7 @@ <h2>Recommended Secure Coding Practices</h2>
   <li> Store the credentials in a configuration file that is not pushed to the code repository. </li>
   <li> Store the credentials in a database. </li>
   <li> Use your cloud provider’s service for managing secrets. </li>
-  <li> If the a password has been disclosed through the source code: change it. </li>
+  <li> If a password has been disclosed through the source code: change it. </li>
 </ul>
 <h2>Sensitive Code Example</h2>
 <pre>
@@ -47,9 +47,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/798">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/259">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/798.html">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/259.html">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/OjdGBQ">CERT, MSC03-J.</a> - Never hard code sensitive information </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#HARD_CODE_PASSWORD">Hard Coded Password</a> </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.json
index 7c2e229ef21..f3b22e46254 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2068_java.json
@@ -19,6 +19,16 @@
   "securityStandards": {
     "CERT": [
       "MSC03-J."
+    ],
+    "CWE": [
+      798,
+      259
+    ],
+    "OWASP": [
+      "A2"
+    ],
+    "OWASP Top 10 2021": [
+      "A7"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.html
index 24f61a6fbcb..ee0166af680 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.html
@@ -72,8 +72,9 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/89">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
+  <li> <a href="https://cwe.mitre.org/data/definitions/89.html">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
   </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/564.html">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.json
index f877082a4d1..3c3cd2fd6ae 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2077_java.json
@@ -23,6 +23,18 @@
   "securityStandards": {
     "CERT": [
       "IDS00-J."
+    ],
+    "CWE": [
+      564,
+      89,
+      20,
+      943
+    ],
+    "OWASP": [
+      "A1"
+    ],
+    "OWASP Top 10 2021": [
+      "A3"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.html
index db7c89c6d58..d61d6d6ce72 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.html
@@ -31,11 +31,14 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/311">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/614">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/311.html">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/614.html">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute
+  </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.json
index 5e8f5cfcbcf..67b1675e37e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2092_java.json
@@ -25,6 +25,10 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A4",
+      "A5"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.html
index f007eaf7805..99bb39a376b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.html
@@ -79,8 +79,8 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/772.html">MITRE, CWE-772</a> - Missing Release of Resource after Effective Lifetime </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/772.html">MITRE, CWE-772</a> - Missing Release of Resource after Effective Lifetime </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/vjdGBQ">CERT, FIO04-J.</a> - Release resources when they are no longer needed </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/QtUxBQ">CERT, FIO42-C.</a> - Close files when they are no longer needed </li>
   <li> <a href="https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html">Try With Resources</a> </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.json
index c121ad1069d..676dd68d6a8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2095_java.json
@@ -20,6 +20,10 @@
     "CERT": [
       "FIO04-J.",
       "FIO42-C."
+    ],
+    "CWE": [
+      459,
+      772
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.html
index f0845617b41..1ccf211f008 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.html
@@ -11,6 +11,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A2_2017-Broken_Authentication.html">OWASP Top 10 2017 Category A2</a> - Broken
   Authentication </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.json
index 6581afbd7fe..90d2a3a02ca 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2115_java.json
@@ -22,6 +22,9 @@
     "OWASP": [
       "A2",
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A7"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2119_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2119_java.html
index d17600cc20f..bcd04fde318 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2119_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2119_java.html
@@ -2,7 +2,7 @@
 on the JDK. For better efficiency and randomness, create a single <code>Random</code>, then store, and reuse it.</p>
 <p>The <code>Random()</code> constructor tries to set the seed with a distinct value every time. However there is no guarantee that the seed will be
 random or even uniformly distributed. Some JDK will use the current time as seed, which makes the generated numbers not random at all.</p>
-<p>This rule finds cases where a new <code>Random</code> is created each time a method is invoked and assigned to a local random variable.</p>
+<p>This rule finds cases where a new <code>Random</code> is created each time a method is invoked.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 public void doSomethingCommon() {
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2123_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2123_java.json
index b0429182c84..52ca02df422 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2123_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2123_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2123",
   "sqKey": "S2123",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2142_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2142_java.html
index 20b40032855..750c61454d8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2142_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2142_java.html
@@ -36,6 +36,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/391.html">MITRE, CWE-391</a> - Unchecked Error Condition </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/391.html">MITRE, CWE-391</a> - Unchecked Error Condition </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.html
index bfa3cd6e0a0..3e248a76c7d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.html
@@ -55,7 +55,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/190">MITRE, CWE-190</a> - Integer Overflow or Wraparound </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/190.html">MITRE, CWE-190</a> - Integer Overflow or Wraparound </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
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.json
index e3647afe67d..8871ea2b39d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2184_java.json
@@ -20,6 +20,9 @@
     "CERT": [
       "NUM50-J.",
       "INT18-C."
+    ],
+    "CWE": [
+      190
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2208_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2208_java.json
index 3e2a1488d60..03d5089698f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2208_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2208_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-2208",
   "sqKey": "S2208",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2221_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2221_java.html
index 5c22ce6fe0a..70f4feb86fb 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2221_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2221_java.html
@@ -29,6 +29,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/396.html">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/396.html">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.html
index 7fe4c25d29c..6507902ff30 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.html
@@ -18,7 +18,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/476.html">MITRE CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.json
index 0d13936530e..5a2bd523f85 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2225_java.json
@@ -17,6 +17,9 @@
   "securityStandards": {
     "CERT": [
       "EXP01-J."
+    ],
+    "CWE": [
+      476
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2234_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2234_java.json
index 6d112932c65..61b399f5ad4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2234_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2234_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2234",
   "sqKey": "S2234",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.html
index 78b1c50b3bd..f7e13945afa 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.html
@@ -38,6 +38,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.json
index 8d2157057cd..0b75e19b480 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2245_java.json
@@ -20,6 +20,24 @@
       "MSC02-J.",
       "MSC30-C.",
       "MSC50-CPP."
+    ],
+    "CWE": [
+      326,
+      330,
+      338,
+      1241
+    ],
+    "OWASP": [
+      "A3"
+    ],
+    "OWASP Mobile": [
+      "M5"
+    ],
+    "MASVS": [
+      "MSTG-CRYPTO-6"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2251_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2251_java.json
index 020c38d519c..5125230d84a 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2251_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2251_java.json
@@ -12,7 +12,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2251",
   "sqKey": "S2251",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.html
index d18a101c0d9..adc05d248ff 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.html
@@ -23,8 +23,9 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/807">MITRE, CWE-807</a> - Reliance on Untrusted Inputs in a Security Decision </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/807.html">MITRE, CWE-807</a> - Reliance on Untrusted Inputs in a Security Decision </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.json
index 5275d010b98..9785aa555a7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2254_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A2"
+    ],
+    "OWASP Top 10 2021": [
+      "A4"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.html
index 987f5b5d2b3..32d4413fa94 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.html
@@ -17,9 +17,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#CUSTOM_MESSAGE_DIGEST">MessageDigest is Custom</a>
   </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.json
index 97bba67dfec..78cc7d1521b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2257_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2259_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2259_java.json
index 7892783746c..bf5b18d2fb4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2259_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2259_java.json
@@ -18,6 +18,9 @@
     "CERT": [
       "EXP34-C.",
       "EXP01-J."
+    ],
+    "CWE": [
+      476
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2260_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2260_java.json
index ac444c5aaa7..5c20da9af6f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2260_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2260_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2260",
   "sqKey": "S2260",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.html
index d7f34615888..081d7c0eae8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.html
@@ -59,8 +59,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/374">MITRE, CWE-374</a> - Passing Mutable Objects to an Untrusted Method </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/375">MITRE, CWE-375</a> - Returning a Mutable Object to an Untrusted Caller </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/374.html">MITRE, CWE-374</a> - Passing Mutable Objects to an Untrusted Method </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/375.html">MITRE, CWE-375</a> - Returning a Mutable Object to an Untrusted Caller </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>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.json
index b691b632c40..3673ed506e0 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2384_java.json
@@ -20,6 +20,10 @@
       "OBJ05-J.",
       "OBJ06-J.",
       "OBJ13-J."
+    ],
+    "CWE": [
+      375,
+      374
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.html
index a2bff8082c7..6ff95cf2d92 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.html
@@ -20,8 +20,8 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/582.html">MITRE, CWE-582</a> - Array Declared Public, Final, and Static </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/607.html">MITRE, CWE-607</a> - Public Static Final Field References Mutable Object </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/582.html">MITRE, CWE-582</a> - Array Declared Public, Final, and Static </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/607.html">MITRE, CWE-607</a> - Public Static Final Field References Mutable Object </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>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.json
index 0611a7c11fd..12056fc5239 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2386_java.json
@@ -19,6 +19,10 @@
     "CERT": [
       "OBJ01-J.",
       "OBJ13-J."
+    ],
+    "CWE": [
+      607,
+      582
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.html
index 5f50bcc03ce..cdd2fd9e121 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.html
@@ -16,7 +16,8 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/579.html">MITRE, CWE-579</a> - J2EE Bad Practices: Non-serializable Object Stored in Session
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/579.html">MITRE, CWE-579</a> - J2EE Bad Practices: Non-serializable Object Stored in Session
   </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.json
index c6827274bdd..7189a232792 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2441_java.json
@@ -16,6 +16,9 @@
   "securityStandards": {
     "CWE": [
       579
+    ],
+    "OWASP Top 10 2021": [
+      "A4"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.html
index dc593bb7293..1392cb01e32 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.html
@@ -33,8 +33,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/412.html">MITRE, CWE-412</a> - Unrestricted Externally Accessible Lock </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/413">MITRE, CWE-413</a> - Improper Resource Locking </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/412.html">MITRE, CWE-412</a> - Unrestricted Externally Accessible Lock </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/413.html">MITRE, CWE-413</a> - Improper Resource Locking </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>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.json
index 8716f6196f3..63d4f7635bc 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2445_java.json
@@ -18,6 +18,10 @@
   "securityStandards": {
     "CERT": [
       "LCK00-J."
+    ],
+    "CWE": [
+      412,
+      413
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2447_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2447_java.html
index 4ab48476d90..845b793865e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2447_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2447_java.html
@@ -10,7 +10,7 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/476.html">MITRE CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.html
index 25b3df39d3f..e22aee3dc8d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.html
@@ -36,8 +36,8 @@ <h2>Exceptions</h2>
 <p>In these cases it is obvious the code is as intended.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/570.html">MITRE, CWE-570</a> - Expression is Always False </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/571">MITRE, CWE-571</a> - Expression is Always True </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/570.html">MITRE, CWE-570</a> - Expression is Always False </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/571.html">MITRE, CWE-571</a> - Expression is Always True </li>
   <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>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.json
index cf4570c872c..afa6e3d026e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2583_java.json
@@ -20,6 +20,11 @@
   "securityStandards": {
     "CERT": [
       "MSC12-C."
+    ],
+    "CWE": [
+      489,
+      571,
+      570
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html
index 068e1c536ed..4d7f3442f58 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html
@@ -32,7 +32,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/571">MITRE, CWE-571</a> - Expression is Always True </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/570">MITRE, CWE-570</a> - Expression is Always False </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/571.html">MITRE, CWE-571</a> - Expression is Always True </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/570.html">MITRE, CWE-570</a> - Expression is Always False </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.json
index 2fc4965ebf8..ed052219603 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.json
@@ -15,10 +15,15 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2589",
   "sqKey": "S2589",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "MSC12-C."
+    ],
+    "CWE": [
+      489,
+      571,
+      570
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.html
index 4b42ed56e6e..a53d1d778c4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.html
@@ -59,9 +59,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Test_File_Permission_(OTG-CONFIG-009)">OWASP File Permission</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/266.html">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/display/java/FIO01-J.+Create+files+with+appropriate+access+permissions">CERT, FIO01-J.</a> -
   Create files with appropriate access permissions </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.json
index 15da629fb43..236da0af682 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2612_java.json
@@ -20,6 +20,17 @@
     "CERT": [
       "FIO01-J.",
       "FIO06-C."
+    ],
+    "CWE": [
+      732,
+      266
+    ],
+    "OWASP": [
+      "A5"
+    ],
+    "OWASP Top 10 2021": [
+      "A1",
+      "A4"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2637_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2637_java.html
index 57cc6dc09d3..610b40e7960 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2637_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2637_java.html
@@ -27,7 +27,7 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.html
index ab33942a49d..4511fbf597b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.html
@@ -18,11 +18,12 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/Web_Service_Security_Cheat_Sheet.html#user-authentication">OWASP Web Service Security
   Cheat Sheet</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/522">MITRE, CWE-522</a> - Insufficiently Protected Credentials </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/522.html">MITRE, CWE-522</a> - Insufficiently Protected Credentials </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.json
index b44b32b8680..97dd1ae2afb 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2647_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A4"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.html
index c4aefabc8c4..1cede466e5c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.html
@@ -39,7 +39,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/483.html">MITRE, CWE-483</a> - Incorrect Block Delimitation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/483.html">MITRE, CWE-483</a> - Incorrect Block Delimitation </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>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.json
index e918c5ea1a9..1fb18b0b882 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2681_java.json
@@ -13,10 +13,13 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2681",
   "sqKey": "S2681",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "EXP52-J."
+    ],
+    "CWE": [
+      483
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2692_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2692_java.json
index b4c713118a3..1b1f6afb28d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2692_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2692_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-2692",
   "sqKey": "S2692",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.html
index 823aa686b0d..03c0e8f4212 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.html
@@ -113,13 +113,14 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a
   href="https://docs.oracle.com/en/java/javase/13/security/java-api-xml-processing-jaxp-security-guide.html#GUID-8CD65EF5-D113-4D5C-A564-B875C8625FAC">Oracle Java Documentation</a> - XML External Entity Injection Attack </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A4-XML_External_Entities_(XXE)">OWASP Top 10 2017 Category A4</a> - XML External Entities
   (XXE) </li>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#java">OWASP XXE Prevention Cheat
   Sheet</a> </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/611.html">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/827.html">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/611.html">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/827.html">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.json
index dc556ab467c..67863c5b7b1 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2755_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A4"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2757_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2757_java.json
index 8742db6cd40..bdf3a05503d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2757_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2757_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-2757",
   "sqKey": "S2757",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.html
index 38acb7312f1..09710f8c970 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.html
@@ -24,6 +24,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.json
index 655a5873646..8f4f17cac95 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3281_java.json
@@ -16,6 +16,9 @@
   "securityStandards": {
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.html
index 3cc72249f17..0252c561e79 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.html
@@ -47,10 +47,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/329">MITRE, CWE-329</a> - CWE-329: Not Using an Unpredictable IV with CBC Mode </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/330">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/329.html">MITRE, CWE-329</a> - CWE-329: Not Using an Unpredictable IV with CBC Mode </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38a.pdf">NIST, SP-800-38A</a> - Recommendation for Block Cipher
   Modes of Operation </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#STATIC_IV">STATIC_IV</a> </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.json
index cddb37040ba..d51ca028f74 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3329_java.json
@@ -17,9 +17,10 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      330,
       329,
-      340
+      330,
+      340,
+      1204
     ],
     "OWASP": [
       "A6"
@@ -29,6 +30,9 @@
     ],
     "MASVS": [
       "MSTG-CRYPTO-6"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.html
index 97617eb5c95..5d713b643ab 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.html
@@ -33,12 +33,11 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/HttpOnly">OWASP HttpOnly</a> </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/79.html">CWE-79</a> - Improper Neutralization of Input During Web Page Generation ('Cross-site
-  Scripting') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1004.html">CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1004.html">MITRE, CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#HTTPONLY_COOKIE">HTTPONLY_COOKIE</a> </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.json
index 317f2b73cd8..ba01c60ef50 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3330_java.json
@@ -18,11 +18,13 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      79,
       1004
     ],
     "OWASP": [
       "A7"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.html
index 45880fcbc81..515c793e02c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.html
@@ -21,6 +21,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.json
index f092bf4df50..22add9439f4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3355_java.json
@@ -16,6 +16,9 @@
   "securityStandards": {
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3358_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3358_java.json
index c4e336b01f2..068d25de040 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3358_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3358_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3358",
   "sqKey": "S3358",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3518_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3518_java.json
index 3d12d29beb1..83705b009dd 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3518_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3518_java.json
@@ -19,6 +19,9 @@
     "CERT": [
       "NUM02-J.",
       "INT33-C."
+    ],
+    "CWE": [
+      369
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3626_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3626_java.json
index 2b31b503377..a184ea5c7e5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3626_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3626_java.json
@@ -13,6 +13,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-3626",
   "sqKey": "S3626",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.html
index f95a69a8a30..8f3fa1e4d5d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.html
@@ -39,6 +39,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> -
   Broken Access Control </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/352.html">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.json
index 5e0d50b3d96..e5cd259cff6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3752_java.json
@@ -22,6 +22,10 @@
     ],
     "OWASP": [
       "A5"
+    ],
+    "OWASP Top 10 2021": [
+      "A1",
+      "A4"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3776_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3776_java.json
index 96e0a2ab81e..020eaf1cc66 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3776_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3776_java.json
@@ -14,6 +14,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-3776",
   "sqKey": "S3776",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3923_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3923_java.json
index 3b9cfd0dd40..b2096f6cda7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3923_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3923_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3923",
   "sqKey": "S3923",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3972_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3972_java.json
index 30adc3cbf4c..08cc7552633 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3972_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3972_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-3972",
   "sqKey": "S3972",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3973_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3973_java.json
index 358e05894ce..cab0a0c1c07 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3973_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3973_java.json
@@ -13,6 +13,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-3973",
   "sqKey": "S3973",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3981_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3981_java.json
index 94a2d2f43ba..63ddd60d8ca 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3981_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3981_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3981",
   "sqKey": "S3981",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3984_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3984_java.json
index e59289c2251..1fb073021da 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3984_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S3984_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-3984",
   "sqKey": "S3984",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "covered"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.html
index 35ee2255452..e366d78f552 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.html
@@ -34,6 +34,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
+  Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/426.html">MITRE, CWE-426</a> - Untrusted Search Path </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/427.html">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.json
index f96f52cf673..0bea9671384 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4036_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A1"
+    ],
+    "OWASP Top 10 2021": [
+      "A8"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4143_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4143_java.json
index 4b7bec043ff..7525e268ac3 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4143_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4143_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-4143",
   "sqKey": "S4143",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4144_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4144_java.json
index f1bf63cc2d5..73160e62855 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4144_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4144_java.json
@@ -14,6 +14,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-4144",
   "sqKey": "S4144",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4165_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4165_java.json
index b4c5ebb4ddb..718e23bd7d0 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4165_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4165_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-4165",
   "sqKey": "S4165",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4275_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4275_java.json
index 10d907cbd37..f425d894c97 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4275_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4275_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-4275",
   "sqKey": "S4275",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4288_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4288_java.html
index 5093c50ff8b..6c8a5239132 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4288_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4288_java.html
@@ -1,8 +1,7 @@
 <p>Spring <code>@Controller</code>, <code>@Service</code>, and <code>@Repository</code> classes are singletons by default, meaning only one instance
 of the class is ever instantiated in the application. Typically such a class might have a few <code>static</code> members, such as a logger, but all
 non-static members should be managed by Spring and supplied via constructor injection rather than by field injection.</p>
-<p>This rule raise an issue when any non-<code>static</code> member of a Spring component has an injection annotation, or if the constructor of Spring
-component does not have injection annotation.</p>
+<p>This rule raise an issue when any non-<code>static</code> member of a Spring component has an injection annotation.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 @Controller
@@ -11,27 +10,32 @@ <h2>Noncompliant Code Example</h2>
   @Autowired
   private String name = null; // Noncompliant
 
-  HelloWorld() {
-   // ...
-  }
-
-  // ...
 }
 </pre>
 <h2>Compliant Solution</h2>
+<p>As of Spring 4.3</p>
 <pre>
 @Controller
 public class HelloWorld {
 
   private String name = null;
 
-  @Autowired
   HelloWorld(String name) {
     this.name = name;
-   // ...
   }
+}
+</pre>
+<p>Before Spring 4.3</p>
+<pre>
+@Controller
+public class HelloWorld {
+
+  private String name = null;
 
-  // ...
+  @Autowired
+  HelloWorld(String name) {
+    this.name = name;
+  }
 }
 </pre>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.html
index 7acd444a7ff..3c1d715474a 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.html
@@ -23,6 +23,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.json
index 1e6c4adf8dd..ae8daa79fd2 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4347_java.json
@@ -25,6 +25,9 @@
     ],
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.html
index 87220fe2ba3..0c985b8bb62 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.html
@@ -27,6 +27,9 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.json
index e3bd627e546..3bf1564cdb7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4423_java.json
@@ -33,6 +33,10 @@
     ],
     "MASVS": [
       "MSTG-NETWORK-2"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A7"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4425_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4425_java.html
index daa8aae5edd..b6d21b4d2e6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4425_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4425_java.html
@@ -25,7 +25,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/704.html">MITRE, CWE-704</a> - Incorrect Type Conversion or Cast </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/704.html">MITRE, CWE-704</a> - Incorrect Type Conversion or Cast </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#BAD_HEXA_CONVERSION">BAD_HEXA_CONVERSION</a> </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.html
index e7503f1a808..cbac9363326 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.html
@@ -43,6 +43,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.json
index 009156b7d58..7f41304e8c6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4426_java.json
@@ -30,6 +30,9 @@
     ],
     "MASVS": [
       "MSTG-CRYPTO-3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.html
index a873b64bfb0..cab363e84e5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.html
@@ -39,8 +39,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">CWE-521</a> - Weak Password Requirements </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">MITRE, CWE-521</a> - Weak Password Requirements </li>
   <li> <a href="https://ldapwiki.com/wiki/Simple%20Authentication">ldapwiki.com</a>- Simple Authentication </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.json
index 274d49e3db9..86a0cdc15e7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4433_java.json
@@ -20,6 +20,9 @@
     ],
     "OWASP": [
       "A2"
+    ],
+    "OWASP Top 10 2021": [
+      "A7"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.html
index a469f904a38..4e3109a8c78 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.html
@@ -28,6 +28,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
+  Integrity Failures </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/502.html">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A8-Insecure_Deserialization">OWASP Top 10 2017 Category A8</a> - Insecure Deserialization
   </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.json
index b8fa83227b4..3008ace559e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4434_java.json
@@ -20,6 +20,9 @@
     ],
     "OWASP": [
       "A8"
+    ],
+    "OWASP Top 10 2021": [
+      "A8"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.html
index f9d935fab7d..937998650f4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.html
@@ -52,6 +52,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/352.html">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.json
index cd46f04cc54..a649fb43b79 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4502_java.json
@@ -22,6 +22,9 @@
     ],
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.html
index c9b068ef09d..38d088f461c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.html
@@ -79,9 +79,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Leftover Debug Code </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Active Debug Code </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.json
index f7b2a0cf9ed..0ffed0b22da 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4507_java.json
@@ -25,6 +25,9 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.html
index 7194b37d1a8..ba101216bc6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.html
@@ -37,8 +37,12 @@ <h2>Sensitive Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
+  <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
+  Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/15.html">MITRE, CWE-15</a> - External Control of System or Configuration Setting </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/915.html">MITRE, CWE-915</a> - Improperly Controlled Modification of Dynamically-Determined
+  Object Attributes </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/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.json
index 4f08d11262c..4072acdb755 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4512_java.json
@@ -17,13 +17,17 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      15
+      915
     ],
     "OWASP": [
       "A1"
     ],
     "CERT": [
       "MSC61-J."
+    ],
+    "OWASP Top 10 2021": [
+      "A3",
+      "A8"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4524_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4524_java.json
index c588f8c1dc5..4c78785aab9 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4524_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4524_java.json
@@ -10,6 +10,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-4524",
   "sqKey": "S4524",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.html
index 5cfffc0ad63..7c4f1cb1806 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.html
@@ -37,6 +37,8 @@ <h2>Sensitive Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
+  Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A8-Insecure_Deserialization">OWASP Top 10 2017 Category A8</a> - Insecure Deserialization
   </li>
   <li> OWASP - <a href="https://www.owasp.org/index.php/Deserialization_of_untrusted_data">Deserialization of untrusted data</a> </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.json
index 4ea60b0238c..89bb8b8b9c6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4544_java.json
@@ -20,6 +20,9 @@
     ],
     "OWASP": [
       "A8"
+    ],
+    "OWASP Top 10 2021": [
+      "A8"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.html
index ba88851e868..4bd74cd48d5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.html
@@ -34,6 +34,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.json
index aa487728d49..8e4c0c73486 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4601_java.json
@@ -17,6 +17,9 @@
   "securityStandards": {
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.html
index 68470e10563..1e020f19218 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.html
@@ -80,6 +80,8 @@ <h2>Exceptions</h2>
 the object cannot be forged on client side.</p>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
+  Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/915.html">MITRE, CWE-915</a> - Improperly Controlled Modification of Dynamically-Determined
   Object Attributes </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.json
index e9f662cc9ce..c21cfdb1dd1 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4684_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A5"
+    ],
+    "OWASP Top 10 2021": [
+      "A8"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.html
index 1c934c62877..3d5f9ce09b6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.html
@@ -25,6 +25,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
@@ -33,9 +34,7 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/916.html">MITRE, CWE-916</a> - Use of Password Hash With Insufficient Computational Effort
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1240.html">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.json
index b02911d4df3..0296709d8c6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4790_java.json
@@ -16,9 +16,7 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      916,
-      327,
-      328
+      1240
     ],
     "OWASP": [
       "A3",
@@ -29,6 +27,9 @@
     ],
     "MASVS": [
       "MSTG-CRYPTO-4"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.html
index 7f914243c02..4b1ba5aabf6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.html
@@ -133,13 +133,14 @@ <h2>Exceptions</h2>
 life</a>.</p>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A09_2021-Security_Logging_and_Monitoring_Failures/">OWASP Top 10 2021 Category A9</a> - Security Logging and
+  Monitoring Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/117.html">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/778.html">MITRE, CWE-778</a> - Insufficient Logging </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.json
index ff1f3f3c85d..d3d97d2d611 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4792_java.json
@@ -14,13 +14,15 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      532,
       117,
-      778
+      532
     ],
     "OWASP": [
       "A3",
       "A10"
+    ],
+    "OWASP Top 10 2021": [
+      "A9"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.html
index 2fba7bc360b..f11b145a1d9 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.html
@@ -29,6 +29,10 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/295.html">MITRE, CWE-295</a> - Improper Certificate Validation </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.json
index fd53584acfc..3bc04528aa9 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4830_java.json
@@ -21,6 +21,24 @@
   "securityStandards": {
     "CERT": [
       "MSC61-J."
+    ],
+    "CWE": [
+      295
+    ],
+    "OWASP": [
+      "A6",
+      "A3"
+    ],
+    "OWASP Mobile": [
+      "M3"
+    ],
+    "MASVS": [
+      "MSTG-NETWORK-3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A5",
+      "A7"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4973_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4973_java.html
index 2fd48d3acd1..c56d1aafdc5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4973_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4973_java.html
@@ -16,8 +16,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/595.html">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/597.html">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/595.html">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/597.html">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </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
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.html
index 27eca006b55..8406b2ecd47 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.html
@@ -81,6 +81,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> -
   Security Misconfiguration </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/409.html">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.json
index 584a33582c0..1b5a53e33aa 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5042_java.json
@@ -19,6 +19,17 @@
   "securityStandards": {
     "CERT": [
       "IDS04-J."
+    ],
+    "CWE": [
+      409
+    ],
+    "OWASP": [
+      "A5",
+      "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A1",
+      "A5"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.html
index 77bd4b1c47f..80b358c2b42 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.html
@@ -109,6 +109,9 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS">developer.mozilla.org</a> - CORS </li>
   <li> <a href="https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy">developer.mozilla.org</a> - Same origin policy </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.json
index 4ebd17de81a..4b2484d3b5d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5122_java.json
@@ -19,6 +19,10 @@
     ],
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A5",
+      "A7"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.html
index c6eaba9bbc0..41e16666665 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.html
@@ -48,16 +48,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.md">OWASP Cheat
   Sheet</a> - XSS Prevention Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/80.html">MITRE, CWE-80</a> - Improper Neutralization of Script-Related HTML Tags in a Web Page
-  (Basic XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/83.html">MITRE, CWE-83</a> - Improper Neutralization of Script in Attributes in a Web Page
-  </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/84.html">MITRE, CWE-84</a> - Improper Neutralization of Encoded URI Schemes in a Web Page </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.json
index 273e02c51db..a66a02b4f7d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5247_java.json
@@ -16,18 +16,13 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      79,
-      80,
-      81,
-      82,
-      83,
-      84,
-      85,
-      86,
-      87
+      79
     ],
     "OWASP": [
       "A7"
+    ],
+    "OWASP Top 10 2021": [
+      "A3"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.html
index 40caec07451..242f027290d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.html
@@ -1,5 +1,5 @@
 <p>ActiveMQ can send/receive JMS Object messages (named ObjectMessage in ActiveMQ context) to comply with JMS specification. Internally, ActiveMQ
-relies on Java serialization mechanism for marshaling/unmashaling of the message payload. Deserialization based on data supplied by the user could
+relies on Java serialization mechanism for marshaling/unmarshaling of the message payload. Deserialization based on data supplied by the user could
 lead to remote code execution attacks, where the structure of the serialized data is changed to modify the behavior of the object being
 unserialized.</p>
 <p>To limit the risk to be victim of such attack, ActiveMQ 5.12.2+ enforces developers to explicitly whitelist packages that can be exchanged using
@@ -19,6 +19,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
+  Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A8-Insecure_Deserialization">OWASP Top 10 2017 Category A8</a> - Insecure Deserialization
   </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/502.html">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.json
index 61e3f2a9b0b..1dbbcb2394f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5301_java.json
@@ -20,6 +20,9 @@
     ],
     "OWASP": [
       "A8"
+    ],
+    "OWASP Top 10 2021": [
+      "A8"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.html
index 66d7d745404..5e479c27ba8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.html
@@ -71,6 +71,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x11-v6-interaction_with_the_environment">Mobile AppSec Verification
   Standard</a> - Platform Interaction Requirements </li>
   <li> <a href="https://www.owasp.org/index.php/Mobile_Top_10_2016-M1-Improper_Platform_Usage">OWASP Mobile Top 10 2016 Category M1</a> - Improper
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.json
index 4312e0396c6..0d7bd3bb122 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5320_java.json
@@ -20,6 +20,9 @@
     ],
     "MASVS": [
       "MSTG-PLATFORM-4"
+    ],
+    "OWASP Top 10 2021": [
+      "A4"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.html
index 21e65a20063..91eebe5eb8c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.html
@@ -45,6 +45,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://developer.android.com/training/articles/security-tips#ExternalStorage">Android Security tips on external file storage</a>
   </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x07-v2-data_storage_and_privacy_requirements">Mobile AppSec
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.json
index b879edb0b2f..971a77131fa 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5324_java.json
@@ -22,6 +22,9 @@
     ],
     "MASVS": [
       "MSTG-STORAGE-1"
+    ],
+    "OWASP Top 10 2021": [
+      "A4"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.html
index fbb454f2e60..bcbe7e93789 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.html
@@ -120,6 +120,7 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x10-v5-network_communication_requirements">Mobile AppSec Verification
@@ -127,7 +128,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/319">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/319.html">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
   <li> <a href="https://security.googleblog.com/2016/09/moving-towards-more-secure-web.html">Google, Moving towards more secure web</a> </li>
   <li> <a href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http/">Mozilla, Deprecating non secure http</a> </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.json
index 52063608be3..be0360d8781 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5332_java.json
@@ -24,6 +24,9 @@
     ],
     "MASVS": [
       "MSTG-NETWORK-1"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.html
index 24c932a532b..8d938c22433 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.html
@@ -43,13 +43,15 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html">OWASP CheatSheet</a> - Password Storage Cheat Sheet
   </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data
   Exposure </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/328">MITRE, CWE-328</a> - Reversible One-Way Hash </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/916">MITRE, CWE-916</a> - Use of Password Hash With Insufficient Computational Effort </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/256.html">MITRE, CWE-256</a> - Plaintext Storage of a Password </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/916.html">MITRE, CWE-916</a> - Use of Password Hash With Insufficient Computational Effort
+  </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.json
index f7d4df2eee9..75188304a0c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5344_java.json
@@ -20,14 +20,17 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      328,
-      327,
+      256,
       916
     ],
     "OWASP": [
       "A2",
       "A6",
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A4"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.html
index f8ff121c60f..706c60fe3c6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.html
@@ -73,12 +73,13 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
+  Permissions </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.json
index 053403e7cd2..392f0b50c71 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5443_java.json
@@ -19,6 +19,9 @@
     "OWASP": [
       "A5",
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.html
index 7cf5be7af0d..990e24de405 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.html
@@ -21,11 +21,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A9-Using_Components_with_Known_Vulnerabilities">OWASP Top 10 2017 Category A9</a> - Using
   Components with Known Vulnerabilities </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
+  Permissions </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.json
index 969a9af22c4..962d8d9718f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5445_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A9"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.html
index 9f8884375c9..86406b65398 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.html
@@ -78,6 +78,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/295.html">MITRE, CWE-295</a> - Improper Certificate Validation </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.json
index 17a3452a45e..205de58e3b2 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5527_java.json
@@ -20,8 +20,7 @@
   "scope": "Main",
   "securityStandards": {
     "CWE": [
-      297,
-      295
+      297
     ],
     "OWASP": [
       "A3",
@@ -32,6 +31,11 @@
     ],
     "MASVS": [
       "MSTG-NETWORK-3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A5",
+      "A7"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.html
index b58b103d779..dd58e998867 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.html
@@ -32,6 +32,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.json
index 9117bf35f98..5971327c023 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5542_java.json
@@ -21,6 +21,23 @@
   "securityStandards": {
     "CERT": [
       "MSC61-J."
+    ],
+    "CWE": [
+      327,
+      780
+    ],
+    "OWASP": [
+      "A6",
+      "A3"
+    ],
+    "OWASP Mobile": [
+      "M5"
+    ],
+    "MASVS": [
+      "MSTG-CRYPTO-3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.html
index 830fa089200..cf0cd1f36c6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.html
@@ -48,6 +48,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.json
index 52b8c71ad0b..c1213f27b54 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5547_java.json
@@ -21,6 +21,23 @@
   "securityStandards": {
     "CERT": [
       "MSC61-J."
+    ],
+    "CWE": [
+      327,
+      326
+    ],
+    "OWASP": [
+      "A3",
+      "A6"
+    ],
+    "OWASP Mobile": [
+      "M5"
+    ],
+    "MASVS": [
+      "MSTG-CRYPTO-3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.html
index b38d6359491..778bf9512a3 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.html
@@ -51,6 +51,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/347.html">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.json
index b8ed92dc1eb..15bf1c124fc 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5659_java.json
@@ -22,6 +22,9 @@
     ],
     "OWASP": [
       "A3"
+    ],
+    "OWASP Top 10 2021": [
+      "A2"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.html
index d9bcbf36f03..c03bf55eef4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.html
@@ -55,6 +55,10 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A06_2021-Vulnerable_and_Outdated_Components/">OWASP Top 10 2021 Category A6</a> - Vulnerable and Outdated
+  Components </li>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A9-Using_Components_with_Known_Vulnerabilities">OWASP Top 10 2017 Category A9</a> - Using
   Components with Known Vulnerabilities </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.json
index 1289747b4c2..6da2c2ef198 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5679_java.json
@@ -19,6 +19,10 @@
     "OWASP": [
       "A9",
       "A2"
+    ],
+    "OWASP Top 10 2021": [
+      "A6",
+      "A7"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.html
index a53822fb6b1..994b47243ec 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.html
@@ -22,6 +22,7 @@ <h2>Compliant Solution</h2>
 <p>Don’t use <code>x-powered-by</code> or <code>Server</code> HTTP header or any other means disclosing fingerprints of the application.</p>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a
   href="https://owasp.org/www-project-web-security-testing-guide/stable/4-Web_Application_Security_Testing/01-Information_Gathering/08-Fingerprint_Web_Application_Framework.html">OWASP Testing Guide - OTG-INFO-008</a> - Fingerprint Web Application Framework </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.json
index 471bf9676f8..f23992c730d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5689_java.json
@@ -13,13 +13,16 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-5689",
   "sqKey": "S5689",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CWE": [
       200
     ],
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.html
index b6832cb6234..c52ef2f81e7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.html
@@ -50,11 +50,12 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/Denial_of_Service_Cheat_Sheet.html">Owasp Cheat Sheet</a> - Owasp Denial of Service
   Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/770.html">CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">CWE-400</a> - Uncontrolled Resource Consumption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/770.html">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.json
index 62be21dd6c8..f8bc9593dc7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5693_java.json
@@ -14,7 +14,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5693",
   "sqKey": "S5693",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CWE": [
       400,
@@ -22,6 +22,9 @@
     ],
     "OWASP": [
       "A6"
+    ],
+    "OWASP Top 10 2021": [
+      "A5"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5738_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5738_java.html
index f8451035085..f8aeb000e8f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5738_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5738_java.html
@@ -49,7 +49,7 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/477.html">MITRE, CWE-477</a> - Use of Obsolete Functions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/477.html">MITRE, CWE-477</a> - Use of Obsolete Functions </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> RSPEC-1874 for standard deprecation use </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.html
index f7fc97b46e0..3f5e831f5fa 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.html
@@ -93,6 +93,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> -
   Broken Authentication </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.json
index aea7c3b7996..50267aa8d2e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5804_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A2"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.html
index d43239691d5..c7b98544813 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.html
@@ -89,6 +89,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Boken Access Control </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/285.html">MITRE, CWE-285</a> - Improper Authorization </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.json
index 4074cba377f..3434e0b2a3e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5808_java.json
@@ -20,6 +20,9 @@
     ],
     "OWASP": [
       "A5"
+    ],
+    "OWASP Top 10 2021": [
+      "A1"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.json
index 8acf11feffb..2e72d4bcdb9 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-5842",
   "sqKey": "S5842",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.json
index 65f1d847327..afdf38846af 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.json
@@ -14,6 +14,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5843",
   "sqKey": "S5843",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.json
index 23f9e925bcc..2064e7ba7aa 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5850",
   "sqKey": "S5850",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852_java.json
index d6526057953..b97498d145c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852_java.json
@@ -14,7 +14,7 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5852",
   "sqKey": "S5852",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CWE": [
       400,
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.html
index 9f99f918e38..2a9e971233f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.html
@@ -2,8 +2,8 @@
 they are given a regular expression that does not conform to that syntax.</p>
 <p>To avoid syntax errors, special characters should be escaped with backslashes when they are intended to be matched literally and references to
 capturing groups should use the correctly spelled name or number of the group.</p>
-<p>To match a literal string, rather than a regular expression, either all special characters should be escaped or the <code>Pattern.LITERAL</code>
-flag or methods that don’t use regular expressions should be used.</p>
+<p>To match a literal string instead of a regular expression, either all special characters should be escaped, the <code>Pattern.LITERAL</code> flag
+or methods that don’t use regular expressions should be used.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 Pattern.compile("([");
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.json
index a8ab3f03627..ccb1fd05b08 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5856_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-5856",
   "sqKey": "S5856",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5860_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5860_java.json
index 66447cc1bd2..fd4e6896bf5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5860_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5860_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5860",
   "sqKey": "S5860",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5867_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5867_java.json
index f6d01151a12..809ef8c6532 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5867_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5867_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Minor",
   "ruleSpecification": "RSPEC-5867",
   "sqKey": "S5867",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5868_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5868_java.json
index c52d98649ee..d85a51caedd 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5868_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5868_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5868",
   "sqKey": "S5868",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5869_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5869_java.json
index 33adeb113c6..f79ce26d85d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5869_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5869_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-5869",
   "sqKey": "S5869",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.html
index bcc3906ef49..f7d73b2bb03 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.html
@@ -27,6 +27,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> -
   Broken Authentication </li>
   <li> <a href="https://www.owasp.org/index.php/Session_fixation">OWASP Sesssion Fixation</a> </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.json
index 29ffade9300..c7947c4311c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5876_java.json
@@ -21,6 +21,9 @@
     ],
     "OWASP": [
       "A2"
+    ],
+    "OWASP Top 10 2021": [
+      "A7"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6019_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6019_java.json
index 587edeb433c..dbe20d53fc2 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6019_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6019_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-6019",
   "sqKey": "S6019",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6035_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6035_java.json
index 8e392dd3eda..9b49b87ec67 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6035_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6035_java.json
@@ -12,6 +12,6 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-6035",
   "sqKey": "S6035",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.html
index 38907a8ce23..179e8a7d632 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.html
@@ -40,6 +40,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://developer.android.com/training/articles/keystore">developer.android.com</a> - Android keystore system </li>
   <li> <a href="https://developer.android.com/training/articles/keystore#UserAuthentication">developer.android.com</a> - Require user authentication
   for key use </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.json
index 9511a6dadef..7d891572863 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.json
@@ -24,6 +24,9 @@
     ],
     "MASVS": [
       "MSTG-AUTH-1"
+    ],
+    "OWASP Top 10 2021": [
+      "A4"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.html
index 5379ee0ae00..c4c9972f8c0 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.html
@@ -54,6 +54,9 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
+  <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x07-v2-data_storage_and_privacy_requirements">Mobile AppSec
   Verification Standard</a> - Data Storage and Privacy Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m2-insecure-data-storage">OWASP Mobile Top 10 2016 Category M2</a> - Insecure
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.json
index 0704432cb38..db85861f4ef 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.json
@@ -30,6 +30,11 @@
     ],
     "MASVS": [
       "MSTG-STORAGE-14"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A4",
+      "A5"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.html
index 70b6130932a..38e07c2f9b0 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.html
@@ -31,6 +31,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
+  Authentication Failures </li>
   <li> <a href="https://developer.android.com/training/sign-in/biometric-auth">developer.android.com</a> - Use a cryptographic solution that depends
   on authentication </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m4-insecure-authentication">OWASP Mobile Top 10 Category M4</a> - Insecure
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.json
index 225337c2bfa..1cec66bc478 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.json
@@ -23,6 +23,9 @@
     ],
     "MASVS": [
       "MSTG-AUTH-8"
+    ],
+    "OWASP Top 10 2021": [
+      "A7"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.html
index c82e6431b63..77268359fc5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.html
@@ -33,6 +33,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x07-v2-data_storage_and_privacy_requirements">Mobile AppSec
   Verification Standard</a> - Data Storage and Privacy Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m2-insecure-data-storage">OWASP Mobile Top 10 2016 Category M2</a> - Insecure
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.json
index 26860d76828..f407d37af3c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.json
@@ -30,6 +30,9 @@
     ],
     "MASVS": [
       "MSTG-STORAGE-14"
+    ],
+    "OWASP Top 10 2021": [
+      "A4"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.html
index 53251c712df..74c0078a3c1 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.html
@@ -37,6 +37,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x07-v2-data_storage_and_privacy_requirements">Mobile AppSec
   Verification Standard</a> - Data Storage and Privacy Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m2-insecure-data-storage">OWASP Mobile Top 10 2016 Category M2</a> - Insecure
@@ -46,5 +48,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration.html">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://cwe.mitre.org/data/definitions/311.html">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/321.html">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.json
index 47b092ba0ff..1ba43c0d9bd 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.json
@@ -19,7 +19,8 @@
   "scope": "All",
   "securityStandards": {
     "CWE": [
-      311
+      311,
+      321
     ],
     "OWASP": [
       "A3",
@@ -30,6 +31,10 @@
     ],
     "MASVS": [
       "MSTG-STORAGE-14"
+    ],
+    "OWASP Top 10 2021": [
+      "A2",
+      "A4"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.html
index 9df4315d666..cf66169f86a 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.html
@@ -28,6 +28,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration.html">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A7_2017-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.json
index b4aa313e023..01cdab5b20e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.json
@@ -26,6 +26,9 @@
     ],
     "MASVS": [
       "MSTG-PLATFORM-2"
+    ],
+    "OWASP Top 10 2021": [
+      "A3"
     ]
   }
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.html
index fc760434435..95b23448df0 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.html
@@ -28,6 +28,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
+  <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration.html">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A7_2017-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.json
index 71aa149d192..2fb0d35824b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.json
@@ -26,6 +26,9 @@
     ],
     "MASVS": [
       "MSTG-PLATFORM-2"
+    ],
+    "OWASP Top 10 2021": [
+      "A3"
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.html
index 9f585481730..4c5b626649e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.html
@@ -89,6 +89,6 @@ <h2>See</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="http://cwe.mitre.org/data/definitions/783.html">MITRE, CWE-783</a> - Operator Precedence Logic Error </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/783.html">MITRE, CWE-783</a> - Operator Precedence Logic Error </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.json
index ced43393301..3f1452ec935 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.json
@@ -19,6 +19,9 @@
       "EXP00-C.",
       "EXP00-CPP.",
       "EXP53-J."
+    ],
+    "CWE": [
+      783
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.json
index 355ba8c8e76..2ed4089090c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.json
@@ -12,7 +12,7 @@
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-881",
   "sqKey": "S881",
-  "scope": "Main",
+  "scope": "All",
   "quickfix": "unknown",
   "securityStandards": {
     "CERT": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.html
index e0f4abcdac6..4ba23f0b158 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.html
@@ -33,7 +33,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="http://cwe.mitre.org/data/definitions/835">MITRE, CWE-835</a> - Loop with Unreachable Exit Condition ('Infinite Loop') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/835.html">MITRE, CWE-835</a> - Loop with Unreachable Exit Condition ('Infinite Loop') </li>
   <li> <a href="https://wiki.sei.cmu.edu/confluence/x/x9YxBQ">CERT, MSC21-C.</a> - Use robust loop termination conditions </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.json
index 21b85f21578..1c9cdc4aa66 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.json
@@ -14,10 +14,13 @@
   "defaultSeverity": "Critical",
   "ruleSpecification": "RSPEC-888",
   "sqKey": "S888",
-  "scope": "Main",
+  "scope": "All",
   "securityStandards": {
     "CERT": [
       "MSC21-C."
+    ],
+    "CWE": [
+      835
     ]
   },
   "quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.html
index fcad25e4027..3b1b30a9506 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.html
@@ -34,6 +34,6 @@ <h2>See</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="http://cwe.mitre.org/data/definitions/754">MITRE, CWE-754</a> - Improper Check for Unusual Exceptional Conditions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/754.html">MITRE, CWE-754</a> - Improper Check for Unusual Exceptional Conditions </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.json
index c4fb6fec9e8..210f8103935 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.json
@@ -22,6 +22,9 @@
       "FIO02-J.",
       "ERR33-C.",
       "POS54-C."
+    ],
+    "CWE": [
+      754
     ]
   },
   "quickfix": "unknown"
diff --git a/sonarpedia.json b/sonarpedia.json
index 17866cbfb0c..982a4b313a2 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -3,7 +3,7 @@
   "languages": [
     "JAVA"
   ],
-  "latest-update": "2021-10-18T07:51:32.391539600Z",
+  "latest-update": "2021-11-12T14:11:50.317565Z",
   "options": {
     "no-language-in-filenames": false,
     "preserve-filenames": false