diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bea61612..7671ef0eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: - name: Maven build run: | - mvn install site -B -e + mvn install site -B -e -ntp - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@8aff97f12c99086bdb92ff62ae06dbbcdf07941b #codeql-bundle-20221105 diff --git a/src/main/java/org/joda/time/tz/ZoneInfoCompiler.java b/src/main/java/org/joda/time/tz/ZoneInfoCompiler.java index e3999c8d6..749aaa248 100644 --- a/src/main/java/org/joda/time/tz/ZoneInfoCompiler.java +++ b/src/main/java/org/joda/time/tz/ZoneInfoCompiler.java @@ -501,7 +501,7 @@ public Map compile(File outputDir, File[] sources) throws } } - // store "back" links as aliases (where name is permanently mapped + // store "back" links as aliases (where name is permanently mapped) for (int pass = 0; pass < 2; pass++) { for (int i = 0; i < iBackLinks.size(); i += 2) { String id = iBackLinks.get(i); @@ -636,7 +636,10 @@ 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 (backward || alias.equals("US/Pacific-New") || alias.startsWith("Etc/") || alias.equals("GMT")) { + if (alias.equals("WET") || alias.equals("CET") || alias.equals("MET") || alias.equals("EET")) { + iGoodLinks.add(real); + iGoodLinks.add(alias); + } else if (backward || alias.equals("US/Pacific-New") || alias.startsWith("Etc/") || alias.equals("GMT")) { iBackLinks.add(real); iBackLinks.add(alias); } else {