From 9c59e2082916e562c37091a1da4bfbed046ee8ee Mon Sep 17 00:00:00 2001
From: Johann Beleites <sdefend_9jftz8pq@esnail.de>
Date: Wed, 31 Jul 2024 14:26:14 +0000
Subject: [PATCH 1/2] Add STIG support

* Upgrade sonar-analyzer-commons to version that supports STIG metadata.
* Update rule metadata.
---
 pom.xml                                                      | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S1161.html | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2053.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2077.html | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2092.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2184.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2226.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2254.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2612.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2647.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2696.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2885.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S2886.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S3330.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S4502.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S4830.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S5332.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S5344.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S5443.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S5445.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S5527.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S5547.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S5876.json | 2 +-
 .../main/resources/org/sonar/l10n/java/rules/java/S6914.html | 5 -----
 sonarpedia.json                                              | 2 +-
 25 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 63cb7769f74..379831af616 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
      -->
     <sonar.plugin.api.version>10.2.0.1908</sonar.plugin.api.version>
     <sonarlint.plugin.api.version>9.8.0.76914</sonarlint.plugin.api.version>
-    <analyzer.commons.version>2.11.0.2861</analyzer.commons.version>
+    <analyzer.commons.version>2.12.0.2964</analyzer.commons.version>
     <orchestrator.version>3.40.0.183</orchestrator.version>
     <sslr.version>1.24.0.633</sslr.version>
     <argLine>-Xmx512m</argLine>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1161.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1161.html
index 009468b6f2d..9fe85d9ff3a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1161.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1161.html
@@ -1,6 +1,6 @@
 <h2>Why is this an issue?</h2>
 <p>While not mandatory, using the <code>@Override</code> annotation on compliant methods improves readability by making it explicit that methods are
-overriden.</p>
+overridden.</p>
 <p>A compliant method either overrides a parent method or implements an interface or abstract method.</p>
 <h3>Noncompliant code example</h3>
 <pre data-diff-id="1" data-diff-type="noncompliant">
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json
index 6f426ba6a65..298542a3930 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.json
@@ -36,7 +36,7 @@
     "PCI DSS 4.0": [
       "6.2.4"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222542"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
index 6ab995608d8..64911293a30 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
@@ -1,5 +1,5 @@
 <p>Formatted SQL queries can be difficult to maintain, debug and can increase the risk of SQL injection when concatenating untrusted values into the
-query. However, this rule doesn’t detect SQL injections (unlike rule {rule:javasecurity:S3649}), the goal is only to highlight complex/formatted queries.</p>
+query. However, this rule doesn’t detect SQL injections (unlike rule {rule:java:S3649}), the goal is only to highlight complex/formatted queries.</p>
 <h2>Ask Yourself Whether</h2>
 <ul>
   <li> Some parts of the query come from untrusted values (like user inputs). </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
index 4893092b62c..57451ebcbc6 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2092.json
@@ -46,7 +46,7 @@
       "6.1.2",
       "6.1.3"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222576"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json
index a281e528230..4fd34fa1b0a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2184.json
@@ -32,7 +32,7 @@
     "ASVS 4.0": [
       "5.4.3"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222612"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json
index f1426202cc8..15d8246daf4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2226.json
@@ -25,7 +25,7 @@
     "CERT": [
       "MSC11-J."
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222567"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json
index eec339f3cdf..e40873571fe 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2254.json
@@ -29,7 +29,7 @@
     "OWASP Top 10 2021": [
       "A4"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222582"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
index 9e1235d6f1c..948fea4ccb3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2612.json
@@ -45,7 +45,7 @@
     "ASVS 4.0": [
       "4.3.3"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222430"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json
index 8610ca35978..2e86b128dc0 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2647.json
@@ -36,7 +36,7 @@
     "ASVS 4.0": [
       "2.10.3"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222533"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json
index 0a80eec87cc..7496f61bde4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2696.json
@@ -20,7 +20,7 @@
   "sqKey": "S2696",
   "scope": "Main",
   "securityStandards": {
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222567"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json
index dca347e2b3a..b45d724adf4 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2885.json
@@ -20,7 +20,7 @@
   "sqKey": "S2885",
   "scope": "Main",
   "securityStandards": {
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222567"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json
index 965cc978ca8..85436a2d775 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2886.json
@@ -24,7 +24,7 @@
     "CERT": [
       "VNA01-J."
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222567"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json
index d88c94437cf..745ea9e8fdb 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3330.json
@@ -39,7 +39,7 @@
     "ASVS 4.0": [
       "3.4.2"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222575"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json
index 9d0a4f2ef7c..9993a82606f 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.json
@@ -40,7 +40,7 @@
       "13.2.3",
       "4.2.2"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222603"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json
index 2c3ea6fc429..0a53b804630 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.json
@@ -57,7 +57,7 @@
       "1.9.2",
       "9.2.1"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222550"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json
index 1c02db62907..b9040cda88a 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.json
@@ -45,7 +45,7 @@
       "9.1.1",
       "9.2.2"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222397",
       "V-222534",
       "V-222562",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json
index 982ecf7c343..66ac614432e 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5344.json
@@ -46,7 +46,7 @@
       "2.4.4",
       "2.4.5"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222542"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json
index 139e11afd8c..8836c7bdc70 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5443.json
@@ -33,7 +33,7 @@
     "PCI DSS 4.0": [
       "6.2.4"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222567"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json
index 13f111f8273..606163f707b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5445.json
@@ -36,7 +36,7 @@
     "PCI DSS 4.0": [
       "6.2.4"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222567"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json
index cf1834c370f..6c6f4376386 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.json
@@ -49,7 +49,7 @@
       "4.2.1",
       "6.2.4"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222550"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json
index e63fbe3dd10..20f0a55c59b 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5547.json
@@ -56,7 +56,7 @@
       "6.2.5",
       "8.3.7"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222396"
     ]
   },
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json
index 2d65b9cbb22..77f3ca69fb3 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5876.json
@@ -39,7 +39,7 @@
     "ASVS 4.0": [
       "3.2.1"
     ],
-    "STIG ASD 2023-06-08": [
+    "STIG ASD_V5R3": [
       "V-222579",
       "V-222582"
     ]
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6914.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6914.html
index 2ed9d254c9d..fba6a267cb2 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6914.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6914.html
@@ -61,9 +61,4 @@ <h3>Documentation</h3>
   </li>
   <li> <a href="https://developer.android.com/reference/android/location/package-summary">Android Developers - Android Location</a> </li>
 </ul>
-<h3>Articles &amp; blog posts</h3>
-<ul>
-  <li> <a
-  href="https://timeero.com/post/do-gps-tracking-apps-drain-mobile-battery-heres-what-you-need-to-know#toc-how-much-battery-does-location-services-use-">Timeero - How Much Battery Does Location Services Use?</a> </li>
-</ul>
 
diff --git a/sonarpedia.json b/sonarpedia.json
index fcbef9fc3ce..75669e00a95 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -3,7 +3,7 @@
   "languages": [
     "JAVA"
   ],
-  "latest-update": "2024-06-26T13:48:56.604262Z",
+  "latest-update": "2024-07-31T14:20:43.109120Z",
   "options": {
     "no-language-in-filenames": true,
     "preserve-filenames": false

From 6460a0b00f07bd0374dd6f460d68c1d1866164fd Mon Sep 17 00:00:00 2001
From: Johann Beleites <sdefend_9jftz8pq@esnail.de>
Date: Tue, 6 Aug 2024 17:23:52 +0200
Subject: [PATCH 2/2] Revert erroneous metadata rule key update

---
 .../main/resources/org/sonar/l10n/java/rules/java/S2077.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
index 64911293a30..6ab995608d8 100644
--- a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
+++ b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html
@@ -1,5 +1,5 @@
 <p>Formatted SQL queries can be difficult to maintain, debug and can increase the risk of SQL injection when concatenating untrusted values into the
-query. However, this rule doesn’t detect SQL injections (unlike rule {rule:java:S3649}), the goal is only to highlight complex/formatted queries.</p>
+query. However, this rule doesn’t detect SQL injections (unlike rule {rule:javasecurity:S3649}), the goal is only to highlight complex/formatted queries.</p>
 <h2>Ask Yourself Whether</h2>
 <ul>
   <li> Some parts of the query come from untrusted values (like user inputs). </li>