Update time zone data to 2024bgtz

JodaOrg · Sep 15, 2024 · f132149 · f132149
1 parent 6c525f8
commit f132149
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,10 +26,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c  #v3.3.0
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332  #v4.1.7
 
     - name: Set up JDK
-      uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98  #v3.10.0
+      uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88  #v4.3.0
       with:
         java-version: 8
         distribution: 'temurin'

diff --git a/src/main/java/org/joda/time/tz/ZoneInfoCompiler.java b/src/main/java/org/joda/time/tz/ZoneInfoCompiler.java
@@ -636,9 +636,12 @@ public void parseDataFile(BufferedReader in, boolean backward) throws IOExceptio
                     // links in "backward" are deprecated names
                     // links in other files should be kept
                     // special case a few to try to repair terrible damage to tzdb
-                    if (alias.equals("WET") || alias.equals("CET") || alias.equals("MET") || alias.equals("EET")) {
+                    if (alias.equals("WET") || alias.equals("CET") || alias.equals("EET")) {
                         iGoodLinks.add(real);
                         iGoodLinks.add(alias);
+                    } else if (alias.equals("MET")) {
+                        iBackLinks.add("CET");  // map MET -> CET (not Europe/Brussels)
+                        iBackLinks.add(alias);
                     } else if (backward || alias.equals("US/Pacific-New") || alias.startsWith("Etc/") || alias.equals("GMT")) {
                         iBackLinks.add(real);
                         iBackLinks.add(alias);
@@ -965,7 +968,9 @@ public void addRecurring(DateTimeZoneBuilder builder, int standardMillis, String
 
             // if negative SAVE values, then patch standard millis and name format
             if (negativeSave < 0) {
-                System.out.println("Fixed negative save values for rule '" + iRules.get(0).iName + "'");
+                if (ZoneInfoLogger.verbose()) {
+                    System.out.println("Fixed negative save values for rule '" + iRules.get(0).iName + "'");
+                }
                 standardMillis += negativeSave;
                 int slashPos = nameFormat.indexOf("/");
                 if (slashPos > 0) {