diff --git a/releases/apache-groovy.json b/releases/apache-groovy.json
index fc628e4d..6bb37ded 100644
--- a/releases/apache-groovy.json
+++ b/releases/apache-groovy.json
@@ -1,22 +1,22 @@
 {
-  "4.0.7": "2022-12-21",
-  "4.0.6": "2022-10-13",
-  "4.0.5": "2022-09-06",
-  "4.0.4": "2022-07-20",
-  "4.0.3": "2022-06-01",
-  "4.0.2": "2022-04-19",
-  "4.0.1": "2022-03-05",
-  "4.0.0": "2022-01-25",
   "3.0.14": "2022-12-24",
   "2.5.20": "2022-12-24",
+  "4.0.7": "2022-12-21",
   "2.5.19": "2022-10-16",
+  "4.0.6": "2022-10-13",
   "3.0.13": "2022-09-18",
+  "4.0.5": "2022-09-06",
   "3.0.12": "2022-07-23",
   "2.5.18": "2022-07-23",
+  "4.0.4": "2022-07-20",
+  "4.0.3": "2022-06-01",
   "3.0.11": "2022-06-01",
   "2.5.17": "2022-06-01",
+  "4.0.2": "2022-04-19",
   "3.0.10": "2022-03-06",
+  "4.0.1": "2022-03-05",
   "2.5.16": "2022-03-05",
+  "4.0.0": "2022-01-25",
   "2.5.15": "2021-09-07",
   "3.0.9": "2021-09-06",
   "3.0.8": "2021-04-20",
@@ -27,10 +27,10 @@
   "3.0.5": "2020-07-22",
   "2.5.13": "2020-07-22",
   "2.4.20": "2020-07-22",
-  "2.5.12": "2020-05-21",
   "3.0.4": "2020-05-21",
-  "2.5.11": "2020-04-10",
+  "2.5.12": "2020-05-21",
   "3.0.3": "2020-04-10",
+  "2.5.11": "2020-04-10",
   "3.0.2": "2020-03-08",
   "2.5.10": "2020-03-06",
   "2.4.19": "2020-03-03",
@@ -64,8 +64,8 @@
   "2.4.3": "2015-03-23",
   "2.4.2": "2015-03-19",
   "2.3.11": "2015-03-19",
-  "2.3.10": "2015-02-18",
   "2.4.1": "2015-02-18",
+  "2.3.10": "2015-02-18",
   "2.4.0": "2015-01-21",
   "2.3.9": "2014-12-19",
   "2.3.8": "2014-11-28",
@@ -97,11 +97,11 @@
   "2.0.5": "2012-10-04",
   "2.0.4": "2012-09-21",
   "2.0.3": "2012-09-21",
-  "1.8.8": "2012-09-10",
   "2.0.2": "2012-09-10",
+  "1.8.8": "2012-09-10",
   "2.0.1": "2012-07-25",
-  "1.7.11": "2012-07-25",
   "1.8.7": "2012-07-25",
+  "1.7.11": "2012-07-25",
   "2.0.0": "2012-06-28",
   "1.8.6": "2012-02-09",
   "1.8.5": "2011-12-23",
@@ -129,8 +129,8 @@
   "1.6.4": "2009-07-31",
   "1.6.3": "2009-05-13",
   "1.6.2": "2009-04-24",
-  "1.5.8": "2009-04-07",
   "1.6.1": "2009-04-07",
+  "1.5.8": "2009-04-07",
   "1.6.0": "2009-02-18",
   "1.5.7": "2008-10-09",
   "1.5.6": "2008-04-25",
diff --git a/releases/tomcat.json b/releases/tomcat.json
index 16e33dfd..b01525df 100644
--- a/releases/tomcat.json
+++ b/releases/tomcat.json
@@ -4,13 +4,13 @@
   "8.5.84": "2022-11-16",
   "9.0.69": "2022-11-09",
   "10.1.2": "2022-11-09",
-  "8.5.83": "2022-10-03",
   "9.0.68": "2022-10-03",
-  "10.0.27": "2022-10-03",
+  "8.5.83": "2022-10-03",
   "10.1.1": "2022-10-03",
-  "10.0.26": "2022-09-23",
+  "10.0.27": "2022-10-03",
   "9.0.67": "2022-09-23",
   "10.1.0": "2022-09-23",
+  "10.0.26": "2022-09-23",
   "8.5.82": "2022-08-08",
   "9.0.65": "2022-07-14",
   "10.0.23": "2022-07-14",
@@ -20,9 +20,9 @@
   "8.5.79": "2022-05-16",
   "9.0.63": "2022-05-11",
   "10.0.21": "2022-05-10",
+  "9.0.62": "2022-03-31",
   "8.5.78": "2022-03-31",
   "10.0.20": "2022-03-31",
-  "9.0.62": "2022-03-31",
   "8.5.77": "2022-03-13",
   "9.0.60": "2022-03-09",
   "10.0.18": "2022-03-09",
@@ -32,8 +32,8 @@
   "8.5.75": "2022-01-17",
   "9.0.58": "2022-01-15",
   "10.0.16": "2022-01-15",
-  "10.0.14": "2021-12-02",
   "9.0.56": "2021-12-02",
+  "10.0.14": "2021-12-02",
   "8.5.73": "2021-11-11",
   "9.0.55": "2021-11-10",
   "10.0.13": "2021-11-09",
@@ -52,68 +52,68 @@
   "8.5.68": "2021-06-11",
   "9.0.48": "2021-06-10",
   "10.0.7": "2021-06-08",
-  "8.5.66": "2021-05-08",
   "9.0.46": "2021-05-08",
+  "8.5.66": "2021-05-08",
   "10.0.6": "2021-05-08",
   "7.0.109": "2021-04-22",
-  "8.5.65": "2021-03-30",
   "9.0.45": "2021-03-30",
+  "8.5.65": "2021-03-30",
   "10.0.5": "2021-03-30",
   "10.0.4": "2021-03-05",
-  "8.5.64": "2021-03-04",
   "9.0.44": "2021-03-04",
+  "8.5.64": "2021-03-04",
   "8.5.63": "2021-01-29",
   "9.0.43": "2021-01-28",
-  "10.0.2": "2021-01-28",
   "7.0.108": "2021-01-28",
-  "8.5.61": "2020-12-03",
+  "10.0.2": "2021-01-28",
   "9.0.41": "2020-12-03",
+  "8.5.61": "2020-12-03",
   "10.0.0": "2020-12-03",
   "7.0.107": "2020-11-18",
-  "8.5.60": "2020-11-12",
   "9.0.40": "2020-11-12",
-  "8.5.59": "2020-10-06",
+  "8.5.60": "2020-11-12",
   "9.0.39": "2020-10-06",
+  "8.5.59": "2020-10-06",
   "7.0.106": "2020-09-16",
-  "8.5.58": "2020-09-10",
   "9.0.38": "2020-09-10",
+  "8.5.58": "2020-09-10",
   "7.0.105": "2020-07-02",
-  "8.5.57": "2020-06-30",
   "9.0.37": "2020-06-30",
-  "8.5.56": "2020-06-03",
+  "8.5.57": "2020-06-30",
   "9.0.36": "2020-06-03",
+  "8.5.56": "2020-06-03",
   "7.0.104": "2020-05-07",
-  "8.5.55": "2020-05-05",
   "9.0.35": "2020-05-05",
-  "8.5.54": "2020-04-03",
+  "8.5.55": "2020-05-05",
   "9.0.34": "2020-04-03",
+  "8.5.54": "2020-04-03",
   "7.0.103": "2020-03-16",
-  "8.5.53": "2020-03-11",
   "9.0.33": "2020-03-11",
+  "8.5.53": "2020-03-11",
   "7.0.100": "2020-02-11",
-  "8.5.51": "2020-02-05",
   "9.0.31": "2020-02-05",
+  "8.5.51": "2020-02-05",
   "7.0.99": "2019-12-11",
-  "8.5.50": "2019-12-07",
   "9.0.30": "2019-12-07",
+  "8.5.50": "2019-12-07",
   "8.5.49": "2019-11-17",
   "9.0.29": "2019-11-16",
-  "8.5.47": "2019-10-07",
   "9.0.27": "2019-10-07",
-  "8.5.46": "2019-09-16",
+  "8.5.47": "2019-10-07",
   "9.0.26": "2019-09-16",
-  "8.5.45": "2019-08-14",
+  "8.5.46": "2019-09-16",
   "9.0.24": "2019-08-14",
+  "8.5.45": "2019-08-14",
   "7.0.96": "2019-07-24",
-  "8.5.43": "2019-07-04",
   "9.0.22": "2019-07-04",
-  "8.5.42": "2019-06-04",
+  "8.5.43": "2019-07-04",
   "9.0.21": "2019-06-04",
+  "8.5.42": "2019-06-04",
   "8.5.41": "2019-05-04",
   "9.0.20": "2019-05-03",
   "9.0.19": "2019-04-12",
-  "7.0.94": "2019-04-10",
   "8.5.40": "2019-04-10",
+  "7.0.94": "2019-04-10",
   "8.5.39": "2019-03-14",
   "9.0.17": "2019-03-13",
   "7.0.93": "2019-02-16",
@@ -125,32 +125,32 @@
   "8.5.35": "2018-11-03",
   "9.0.13": "2018-11-02",
   "7.0.91": "2018-09-13",
-  "8.5.34": "2018-09-04",
   "9.0.12": "2018-09-04",
+  "8.5.34": "2018-09-04",
   "8.5.33": "2018-08-12",
   "9.0.11": "2018-08-11",
   "7.0.90": "2018-07-02",
   "8.0.53": "2018-06-29",
-  "8.5.32": "2018-06-20",
   "9.0.10": "2018-06-20",
+  "8.5.32": "2018-06-20",
   "7.0.88": "2018-05-07",
   "8.0.52": "2018-04-28",
-  "8.5.31": "2018-04-27",
   "9.0.8": "2018-04-27",
+  "8.5.31": "2018-04-27",
   "8.0.51": "2018-04-09",
   "7.0.86": "2018-04-09",
-  "8.5.30": "2018-04-03",
   "9.0.7": "2018-04-03",
-  "8.5.29": "2018-03-05",
+  "8.5.30": "2018-04-03",
   "9.0.6": "2018-03-05",
+  "8.5.29": "2018-03-05",
   "8.0.50": "2018-02-07",
   "7.0.85": "2018-02-07",
-  "8.5.28": "2018-02-06",
   "9.0.5": "2018-02-06",
+  "8.5.28": "2018-02-06",
   "8.0.49": "2018-01-19",
   "7.0.84": "2018-01-19",
-  "8.5.27": "2018-01-18",
   "9.0.4": "2018-01-18",
+  "8.5.27": "2018-01-18",
   "8.0.48": "2017-11-30",
   "8.5.24": "2017-11-27",
   "9.0.2": "2017-11-25",
@@ -170,12 +170,12 @@
   "7.0.78": "2017-05-10",
   "8.5.15": "2017-05-05",
   "8.5.14": "2017-04-13",
-  "7.0.77": "2017-03-28",
   "8.0.43": "2017-03-28",
+  "7.0.77": "2017-03-28",
   "8.5.13": "2017-03-27",
   "7.0.76": "2017-03-09",
-  "8.0.42": "2017-03-08",
   "8.5.12": "2017-03-08",
+  "8.0.42": "2017-03-08",
   "8.0.41": "2017-01-18",
   "7.0.75": "2017-01-18",
   "8.5.11": "2017-01-10",
@@ -183,17 +183,17 @@
   "8.0.39": "2016-11-09",
   "7.0.73": "2016-11-07",
   "8.5.8": "2016-11-03",
-  "8.0.38": "2016-10-06",
   "8.5.6": "2016-10-06",
+  "8.0.38": "2016-10-06",
   "7.0.72": "2016-09-14",
   "8.0.37": "2016-09-01",
   "8.5.5": "2016-08-31",
   "8.5.4": "2016-07-06",
   "7.0.70": "2016-06-15",
-  "8.0.36": "2016-06-09",
   "8.5.3": "2016-06-09",
-  "8.0.35": "2016-05-11",
+  "8.0.36": "2016-06-09",
   "8.5.2": "2016-05-11",
+  "8.0.35": "2016-05-11",
   "7.0.69": "2016-04-11",
   "8.0.33": "2016-03-18",
   "8.5.0": "2016-03-17",
diff --git a/src/maven.py b/src/maven.py
index 95185bff..d3a76f6d 100644
--- a/src/maven.py
+++ b/src/maven.py
@@ -64,7 +64,10 @@ def update_releases(product_filter=None):
 
 def write_file(product_name, releases):
     with open("releases/%s.json" % product_name, "w") as f:
-        f.write(json.dumps(releases, indent=2))
+        f.write(json.dumps(dict(
+            # sort by date then version (desc)
+            sorted(releases.items(), key=lambda x: (x[1], x[0]), reverse=True)
+        ), indent=2))