diff -Nru libjoda-time-java-2.10.5/debian/changelog libjoda-time-java-2.10.6/debian/changelog --- libjoda-time-java-2.10.5/debian/changelog 2020-01-27 15:37:20.000000000 +0000 +++ libjoda-time-java-2.10.6/debian/changelog 2020-06-07 20:21:56.000000000 +0000 @@ -1,3 +1,10 @@ +libjoda-time-java (2.10.6-1) unstable; urgency=medium + + * New upstream release + * Switch to debhelper level 12 + + -- Emmanuel Bourg Sun, 07 Jun 2020 22:21:56 +0200 + libjoda-time-java (2.10.5-1) unstable; urgency=medium * New upstream release diff -Nru libjoda-time-java-2.10.5/debian/compat libjoda-time-java-2.10.6/debian/compat --- libjoda-time-java-2.10.5/debian/compat 2020-01-27 15:06:57.000000000 +0000 +++ libjoda-time-java-2.10.6/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru libjoda-time-java-2.10.5/debian/control libjoda-time-java-2.10.6/debian/control --- libjoda-time-java-2.10.5/debian/control 2020-01-27 15:37:11.000000000 +0000 +++ libjoda-time-java-2.10.6/debian/control 2020-06-07 20:21:09.000000000 +0000 @@ -7,7 +7,7 @@ Varun Hiremath , Emmanuel Bourg Build-Depends: - debhelper (>= 11), + debhelper-compat (= 12), default-jdk, default-jdk-doc, junit, diff -Nru libjoda-time-java-2.10.5/.github/workflows/build.yml libjoda-time-java-2.10.6/.github/workflows/build.yml --- libjoda-time-java-2.10.5/.github/workflows/build.yml 1970-01-01 00:00:00.000000000 +0000 +++ libjoda-time-java-2.10.6/.github/workflows/build.yml 2020-04-24 09:48:53.000000000 +0000 @@ -0,0 +1,50 @@ +# build does not work on Java 9 or later as Java 5 is not a valid target + +name: Build + +on: + push: + branches: + - '*' + tags: + - 'v*' + - 'website*' + pull_request: + branches: + - 'master' + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Checkout + uses: actions/checkout@v2 + - name: Maven cache + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}-${{ hashFiles('.github/workflows/build.yml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Maven version + run: | + mkdir -p ./.mvn + echo '-e -B -DtrimStackTrace=false' > ./.mvn/maven.config + mvn --version + mkdir -p target + - name: Maven build + run: | + mvn install site + + - name: Website + if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/website') || startsWith(github.ref, 'refs/tags/v')) + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_PERSONAL_TOKEN }} + run: | + chmod +x ./.github/website.sh + .github/website.sh diff -Nru libjoda-time-java-2.10.5/.github/workflows/tzdbupdate.yml libjoda-time-java-2.10.6/.github/workflows/tzdbupdate.yml --- libjoda-time-java-2.10.5/.github/workflows/tzdbupdate.yml 1970-01-01 00:00:00.000000000 +0000 +++ libjoda-time-java-2.10.6/.github/workflows/tzdbupdate.yml 2020-04-24 09:48:53.000000000 +0000 @@ -0,0 +1,99 @@ +name: TZDB check + +on: + schedule: + - cron: '0 3 * * 1,3,5' + +jobs: + tzdbcheck: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_PERSONAL_TOKEN }} + - name: Maven cache + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ hashFiles('.github/workflows/tzdbupdate.yml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Maven version + run: | + mkdir -p ./.mvn + echo '-e -B -DtrimStackTrace=false' > ./.mvn/maven.config + mvn --version + mkdir -p target + + - name: Get current version + run: | + CURRENT_TZDB=$(mvn help:evaluate -Dexpression=tz.database.version -q -DforceStdout) + echo "current: $CURRENT_TZDB" + echo "::set-env name=CURRENT_TZDB::$CURRENT_TZDB" + - name: Get latest version + working-directory: target + run: | + git clone https://github.com/eggert/tz.git + cd tz + LATEST_TZDB=$(git describe --abbrev=0 --tags) + echo "latest: $LATEST_TZDB" + echo "::set-env name=LATEST_TZDB::$LATEST_TZDB" + - name: Compare versions + run: | + echo "current: $CURRENT_TZDB" + echo "latest: $LATEST_TZDB" + if [ "$CURRENT_TZDB" == "$LATEST_TZDB" ]; then echo "::set-env name=NOOP::true"; fi + + - name: Checkout tzdb release + if: env.NOOP != 'true' + working-directory: target/tz + run: | + git checkout master + git reset --hard ${LATEST_TZDB} -- + git status + - name: Copy files + if: env.NOOP != 'true' + run: | + ls -l target/tz + \cp target/tz/africa src/main/java/org/joda/time/tz/src + \cp target/tz/antarctica src/main/java/org/joda/time/tz/src + \cp target/tz/asia src/main/java/org/joda/time/tz/src + \cp target/tz/australasia src/main/java/org/joda/time/tz/src + \cp target/tz/backward src/main/java/org/joda/time/tz/src + \cp target/tz/etcetera src/main/java/org/joda/time/tz/src + \cp target/tz/europe src/main/java/org/joda/time/tz/src + \cp target/tz/northamerica src/main/java/org/joda/time/tz/src + \cp target/tz/pacificnew src/main/java/org/joda/time/tz/src + \cp target/tz/southamerica src/main/java/org/joda/time/tz/src + \cp target/tz/systemv src/main/java/org/joda/time/tz/src + ls -l src/main/java/org/joda/time/tz/src + - name: Update build with new tzdb + if: env.NOOP != 'true' + run: | + sed -i 's/$CURRENT_TZDB/${LATEST_TZDB}/g' src/main/java/org/joda/time/tz/src/Readme.txt + mvn versions:set-property -DnewVersion=${LATEST_TZDB} -Dproperty=tz.database.version -DgenerateBackupPoms=false + mvn install + + - name: Create Pull Request + if: env.NOOP != 'true' + id: createpr + uses: peter-evans/create-pull-request@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_PERSONAL_TOKEN }} + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: 'Update TZDB to ${{ env.LATEST_TZDB }}' + committer: Stephen Colebourne (CI) + author: Stephen Colebourne (CI) + title: 'Update TZDB to ${{ env.LATEST_TZDB }}' + body: 'Updates TZDB data to ${{ env.LATEST_TZDB }}' + assignees: jodastephen + labels: TZDB + branch: bot/update-tzdb diff -Nru libjoda-time-java-2.10.5/.gitignore libjoda-time-java-2.10.6/.gitignore --- libjoda-time-java-2.10.5/.gitignore 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/.gitignore 2020-04-24 09:48:53.000000000 +0000 @@ -9,6 +9,7 @@ /nbproject/ .idea *.iml +/.mvn/ /build/ /lib/ diff -Nru libjoda-time-java-2.10.5/pom.xml libjoda-time-java-2.10.6/pom.xml --- libjoda-time-java-2.10.5/pom.xml 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/pom.xml 2020-04-24 09:48:53.000000000 +0000 @@ -8,7 +8,7 @@ joda-time jar Joda-Time - 2.10.5 + 2.10.6 Date and time library to replace JDK date handling https://www.joda.org/joda-time/ @@ -277,6 +277,10 @@ https://github.com/alshopov + Michael Sotnikov + https://github.com/stari4ek + + Francois Staes @@ -894,7 +898,7 @@ de.jutzig github-release-plugin - 1.3.0 + 1.4.0 Release v${project.version} See the [change notes](https://www.joda.org/joda-time/changes-report.html#a${project.version}) for more information. @@ -1024,6 +1028,6 @@ UTF-8 UTF-8 - 2019c + 2020a diff -Nru libjoda-time-java-2.10.5/README.md libjoda-time-java-2.10.6/README.md --- libjoda-time-java-2.10.5/README.md 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/README.md 2020-04-24 09:48:53.000000000 +0000 @@ -51,7 +51,7 @@ ### Releases -[Release 2.10.5](https://www.joda.org/joda-time/download.html) is the current latest release. +[Release 2.10.6](https://www.joda.org/joda-time/download.html) is the current latest release. This release is considered stable and worthy of the 2.x tag. It depends on JDK 1.5 or later. @@ -62,13 +62,13 @@ joda-time joda-time - 2.10.5 + 2.10.6 ``` **Gradle configuration:** ```groovy -compile 'joda-time:joda-time:2.10.5' +compile 'joda-time:joda-time:2.10.6' ``` ![Tidelift dependency check](https://tidelift.com/badges/github/JodaOrg/joda-time) diff -Nru libjoda-time-java-2.10.5/src/changes/changes.xml libjoda-time-java-2.10.6/src/changes/changes.xml --- libjoda-time-java-2.10.5/src/changes/changes.xml 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/changes/changes.xml 2020-04-24 09:48:53.000000000 +0000 @@ -8,6 +8,15 @@ + + + DateTimeZone data updated to version 2020a. + + + Add localization for Ukraine. + Fixes #523. + + Updated Joda-Convert version. diff -Nru libjoda-time-java-2.10.5/src/conf/MANIFEST.MF libjoda-time-java-2.10.6/src/conf/MANIFEST.MF --- libjoda-time-java-2.10.5/src/conf/MANIFEST.MF 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/conf/MANIFEST.MF 2020-04-24 09:48:53.000000000 +0000 @@ -5,19 +5,19 @@ Specification-Version: 2.10 Implementation-Vendor: Joda.org Implementation-Title: org.joda.time -Implementation-Version: 2.10.5 +Implementation-Version: 2.10.6 Implementation-Vendor-Id: org.joda Bundle-ManifestVersion: 2 Bundle-Vendor: Joda.org Bundle-Name: Joda-Time Bundle-SymbolicName: joda-time -Bundle-Version: 2.10.5 -Export-Package: org.joda.time;version=2.10.5, - org.joda.time.base;version=2.10.5, - org.joda.time.chrono;version=2.10.5, - org.joda.time.convert;version=2.10.5, - org.joda.time.field;version=2.10.5, - org.joda.time.format;version=2.10.5, - org.joda.time.tz;version=2.10.5 +Bundle-Version: 2.10.6 +Export-Package: org.joda.time;version=2.10.6, + org.joda.time.base;version=2.10.6, + org.joda.time.chrono;version=2.10.6, + org.joda.time.convert;version=2.10.6, + org.joda.time.field;version=2.10.6, + org.joda.time.format;version=2.10.6, + org.joda.time.tz;version=2.10.6 Bundle-License: Apache 2.0 Bundle-DocURL: https://www.joda.org/joda-time/ diff -Nru libjoda-time-java-2.10.5/src/main/java/org/joda/time/format/messages_uk.properties libjoda-time-java-2.10.6/src/main/java/org/joda/time/format/messages_uk.properties --- libjoda-time-java-2.10.5/src/main/java/org/joda/time/format/messages_uk.properties 1970-01-01 00:00:00.000000000 +0000 +++ libjoda-time-java-2.10.6/src/main/java/org/joda/time/format/messages_uk.properties 2020-04-24 09:48:53.000000000 +0000 @@ -0,0 +1,23 @@ +PeriodFormat.space=\u0020 +PeriodFormat.comma=, +PeriodFormat.commandand=,\u0438 +PeriodFormat.commaspaceand=, \u0438 +PeriodFormat.commaspace=,\u0020 +PeriodFormat.spaceandspace=\ \u0438\u0020 +PeriodFormat.regex.separator=% +PeriodFormat.years.regex=^1$%[0-9]*(?=1 2:00 0 CAT Rule Namibia 1995 2017 - Apr Sun>=1 2:00 -1:00 WAT -# Rearguard section, for parsers that do not support negative DST. +# Rearguard section, for parsers lacking negative DST; see ziguard.awk. #Rule Namibia 1994 only - Mar 21 0:00 0 WAT #Rule Namibia 1994 2017 - Sep Sun>=1 2:00 1:00 CAT #Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 WAT @@ -1193,7 +1199,7 @@ 2:00 - SAST 1990 Mar 21 # independence # Vanguard section, for zic and other parsers that support negative DST. 2:00 Namibia %s -# Rearguard section, for parsers that do not support negative DST. +# Rearguard section, for parsers lacking negative DST; see ziguard.awk. # 2:00 - CAT 1994 Mar 21 0:00 # From Paul Eggert (2017-04-07): # The official date of the 2017 rule change was 2017-10-24. See: diff -Nru libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/asia libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/asia --- libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/asia 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/asia 2020-04-24 09:48:53.000000000 +0000 @@ -286,6 +286,27 @@ # China +# From Phake Nick (2020-04-15): +# According to this news report: +# http://news.sina.com.cn/c/2004-09-01/19524201403.shtml +# on April 11, 1919, newspaper in Shanghai said clocks in Shanghai will spring +# forward for an hour starting from midnight of that Saturday. The report did +# not mention what happened in Shanghai thereafter, but it mentioned that a +# similar trial in Tianjin which ended at October 1st as citizens are told to +# recede the clock on September 30 from 12:00pm to 11:00pm. The trial at +# Tianjin got terminated in 1920. +# +# From Paul Eggert (2020-04-15): +# The Returns of Trade and Trade Reports, page 711, says "Daylight saving was +# given a trial during the year, and from the 12th April to the 1st October +# the clocks were all set one hour ahead of sun time. Though the scheme was +# generally esteemed a success, it was announced early in 1920 that it would +# not be repeated." +# +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Shang 1919 only - Apr 12 24:00 1:00 D +Rule Shang 1919 only - Sep 30 24:00 0 S + # From Paul Eggert (2018-10-02): # The following comes from Table 1 of: # Li Yu. Research on the daylight saving movement in 1940s Shanghai. @@ -294,6 +315,89 @@ # The table lists dates only; I am guessing 00:00 and 24:00 transition times. # Also, the table lists the planned end of DST in 1949, but the corresponding # zone line cuts this off on May 28, when the Communists took power. + +# From Phake Nick (2020-04-15): +# +# For the history of time in Shanghai between 1940-1942, the situation is +# actually slightly more complex than the table [below].... At the time, +# there were three different authorities in Shanghai, including Shanghai +# International Settlement, a settlement established by western countries with +# its own westernized form of government, Shanghai French Concession, similar +# to the international settlement but is controlled by French, and then the +# rest of the city of Shanghai, which have already been controlled by Japanese +# force through a puppet local government (Wang Jingwei regime). It was +# additionally complicated by the circumstances that, according to the 1940s +# Shanghai summer time essay cited in the database, some +# departments/businesses/people in the Shanghai city itself during that time +# period, refused to change their clock and instead only changed their opening +# hours. +# +# For example, as quoted in the article, in 1940, other than the authority +# itself, power, tram, bus companies, cinema, department stores, and other +# public service organizations have all decided to follow the summer time and +# spring forward the clock. On the other hand, the custom office refused to +# spring forward the clock because of worry on mechanical wear to the physical +# clock, postal office refused to spring forward because of disruption to +# business and log-keeping, although they did changed their office hour to +# match rest of the city. So is travel agents, and also weather +# observatory. It is said both time standards had their own supporters in the +# city at the time, those who prefer new time standard would have moved their +# clock while those who prefer the old time standard would keep their clock +# unchange, and there were different clocks that use different time standard +# in the city at the time for people who use different time standard to adjust +# their clock to their preferred time. +# +# a. For the 1940 May 31 spring forward, the essay claim that it was +# coordinared between the international settlement authority and the French +# concession authority and have gathered support from Hong Kong and Xiamen, +# that it would spring forward an hour from May 31 "midnight", and the essay +# claim "Hong Kong government implemented the spring forward in the same time +# on the same date as Shanghai". +# +# b. For the 1940 fall back, it was said that they initially intended to do +# so on September 30 00:59 at night, however they postponed it to October 12 +# after discussion with relevant parties. However schools restored to the +# original schedule ten days earlier. +# +# c. For the 1941 spring forward, it is said to start from March 15 +# "following the previous year's method", and in addition to that the essay +# cited an announcement in 1941 from the Wang regime which said the Special +# City of Shanghai under Wang regime control will follow the DST rule set by +# the Settlements, irrespective of the original DST plan announced by the Wang +# regime for other area under its control(April 1 to September 30). (no idea +# to situation before that announcement) +# +# d. For the 1941 fall back, it was said that the fall back would occurs at +# the end of September (A newspaper headline cited by the essay, published on +# October 1, 1941, have the headlines which said "French Concession would +# rewind to the old clock this morning), but it ultimately didn't happen due +# to disagreement between the international settlement authority and the +# French concession authority, and the fall back ultimately occurred on +# November 1. +# +# e. In 1941 December, Japan have officially started war with the United +# States and the United Kingdom, and in Shanghai they have marched into the +# international settlement, taken over its control +# +# f. For the 1942 spring forward, the essay said that the spring forward +# started on January 31. It said this time the custom office and postal +# department will also change their clocks, unlike before. +# +# g. The essay itself didn't cover any specific changes thereafter until the +# end of the war, it quoted a November 1942 command from the government of the +# Wang regime, which claim the daylight saving time applies year round during +# the war. However, the essay ambiguously said the period is "February 1 to +# September 30", which I don't really understand what is the meaning of such +# period in the context of year round implementation here.. More researches +# might be needed to show exactly what happened during that period of time. + +# From Phake Nick (2020-04-15): +# According to a Japanese tour bus pamphlet in Nanjing area believed to be +# from around year 1941: http://www.tt-museum.jp/tairiku_0280_nan1941.html , +# the schedule listed was in the format of Japanese time. Which indicate some +# use of the Japanese time (instead of syncing by DST) might have occurred in +# the Yangtze river delta area during that period of time although the scope +# of such use will need to be investigated to determine. # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Shang 1940 only - Jun 1 0:00 1:00 D @@ -572,7 +676,7 @@ 6:00 - +06 -# Hong Kong (Xianggang) +# Hong Kong # Milne gives 7:36:41.7; round this. @@ -582,9 +686,7 @@ # it is not [an] observatory, but the official meteorological agency of HK, # and also serves as the official timing agency), there are some missing # and incorrect rules. Although the exact switch over time is missing, I -# think 3:30 is correct. The official DST record for Hong Kong can be -# obtained from -# http://www.hko.gov.hk/gts/time/Summertime.htm +# think 3:30 is correct. # From Phake Nick (2018-10-27): # According to Singaporean newspaper @@ -695,10 +797,10 @@ # Resolution of the Legislative Council passed on 9 May 1979 # https://www.legco.gov.hk/yr78-79/english/lc_sitg/hansard/h790509.pdf#page=39 -# From Paul Eggert (2019-05-31): +# From Paul Eggert (2020-04-15): # Here are the dates given at -# https://www.hko.gov.hk/gts/time/Summertime.htm -# as of 2014-06-19: +# https://www.hko.gov.hk/en/gts/time/Summertime.htm +# as of 2020-02-10: # Year Period # 1941 15 Jun to 30 Sep # 1942 Whole year @@ -1828,6 +1930,47 @@ # '9:00' and 'JST' is from Guy Harris. +# From Paul Eggert (2020-01-19): +# Starting in the 7th century, Japan generally followed an ancient Chinese +# timekeeping system that divided night and day into six hours each, +# with hour length depending on season. In 1873 the government +# started requiring the use of a Western style 24-hour clock. See: +# Yulia Frumer, "Making Time: Astronomical Time Measurement in Tokugawa Japan" +# . As the tzdb code and +# data support only 24-hour clocks, its tables model timestamps before +# 1873 using Western-style local mean time. + +# From Hideyuki Suzuki (1998-11-09): +# 'Tokyo' usually stands for the former location of Tokyo Astronomical +# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N. +# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996' +# edited by National Astronomical Observatory of Japan.... +# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST). +# The law is enacted on 1886-07-07. + +# From Hideyuki Suzuki (1998-11-16): +# The ordinance No. 51 (1886) established "standard time" in Japan, +# which stands for the time on 135° E. +# In the ordinance No. 167 (1895), "standard time" was renamed to "central +# standard time". And the same ordinance also established "western standard +# time", which stands for the time on 120° E.... But "western standard +# time" was abolished in the ordinance No. 529 (1937). In the ordinance No. +# 167, there is no mention regarding for what place western standard time is +# standard.... +# +# I wrote "ordinance" above, but I don't know how to translate. +# In Japanese it's "chokurei", which means ordinance from emperor. + +# From Yu-Cheng Chuang (2013-07-12): +# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause +# about standard time" ... The adoption began from Jan 1, 1896. +# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時) +# +# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which +# means the whole Japan territory, including later occupations, adopt Japan +# Central Time (UT+9). The adoption began on Oct 1, 1937. +# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件 + # From Paul Eggert (1995-03-06): # Today's _Asahi Evening News_ (page 4) reports that Japan had # daylight saving between 1948 and 1951, but "the system was discontinued @@ -1876,37 +2019,6 @@ Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D -# From Hideyuki Suzuki (1998-11-09): -# 'Tokyo' usually stands for the former location of Tokyo Astronomical -# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N. -# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996' -# edited by National Astronomical Observatory of Japan.... -# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST). -# The law is enacted on 1886-07-07. - -# From Hideyuki Suzuki (1998-11-16): -# The ordinance No. 51 (1886) established "standard time" in Japan, -# which stands for the time on 135° E. -# In the ordinance No. 167 (1895), "standard time" was renamed to "central -# standard time". And the same ordinance also established "western standard -# time", which stands for the time on 120° E.... But "western standard -# time" was abolished in the ordinance No. 529 (1937). In the ordinance No. -# 167, there is no mention regarding for what place western standard time is -# standard.... -# -# I wrote "ordinance" above, but I don't know how to translate. -# In Japanese it's "chokurei", which means ordinance from emperor. - -# From Yu-Cheng Chuang (2013-07-12): -# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause -# about standard time" ... The adoption began from Jan 1, 1896. -# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時) -# -# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which -# means the whole Japan territory, including later occupations, adopt Japan -# Central Time (UT+9). The adoption began on Oct 1, 1937. -# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件 - # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u 9:00 Japan J%sT @@ -3086,22 +3198,9 @@ # [T]he Palestinian cabinet decision (Mar 8th 2016) published on # http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf # states that summer time will end on Oct 29th at 01:00. -# -# From Tim Parenti (2016-10-19): -# Predict fall transitions on October's last Saturday at 01:00 from now on. -# This is consistent with the 2016 transition as well as our spring -# predictions. -# -# From Paul Eggert (2016-10-19): -# It's also consistent with predictions in the following URLs today: -# https://www.timeanddate.com/time/change/gaza-strip/gaza -# https://www.timeanddate.com/time/change/west-bank/hebron # From Sharef Mustafa (2018-03-16): -# Palestine summer time will start on Mar 24th 2018 by advancing the -# clock by 60 minutes as per Palestinian cabinet decision published on -# the official website, though the decree did not specify the exact -# time of the time shift. +# Palestine summer time will start on Mar 24th 2018 ... # http://www.palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e7a42ab7-ee23-435a-b9c8-a4f7e81f3817 # From Even Scharning (2019-03-23): @@ -3111,15 +3210,20 @@ # From Sharif Mustafa (2019-03-26): # The Palestinian cabinet announced today that the switch to DST will # be on Fri Mar 29th 2019 by advancing the clock by 60 minutes. -# The decree signing date is Mar 12th but it was not published till today. -# The decree does not specify the exact time of switch. # http://palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e54e9ea1-50ee-4137-84df-0d6c78da259b # # From Even Scharning (2019-04-10): # Our source in Palestine said it happened Friday 29 at 00:00 local time.... + +# From Sharef Mustafa (2019-10-18): +# Palestine summer time will end on midnight Oct 26th 2019 ... +# http://www.palestinecabinet.gov.ps/website/ar/ViewDetails?ID=43948 # # From Paul Eggert (2019-04-10): # For now, guess spring-ahead transitions are March's last Friday at 00:00. +# +# From Tim Parenti (2016-10-19): +# Predict fall transitions on October's last Saturday at 01:00 from now on. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S diff -Nru libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/backward libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/backward --- libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/backward 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/backward 2020-04-24 09:48:53.000000000 +0000 @@ -17,6 +17,7 @@ Link America/Argentina/Cordoba America/Cordoba Link America/Tijuana America/Ensenada Link America/Indiana/Indianapolis America/Fort_Wayne +Link America/Nuuk America/Godthab Link America/Indiana/Indianapolis America/Indianapolis Link America/Argentina/Jujuy America/Jujuy Link America/Indiana/Knox America/Knox_IN diff -Nru libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/europe libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/europe --- libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/europe 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/europe 2020-04-24 09:48:53.000000000 +0000 @@ -549,12 +549,13 @@ 0:00 1:00 IST 1947 Nov 2 2:00s 0:00 - GMT 1948 Apr 18 2:00s 0:00 GB-Eire GMT/IST 1968 Oct 27 -# The next line is for when negative SAVE values are used. +# Vanguard section, for zic and other parsers that support negative DST. 1:00 Eire IST/GMT -# These three lines are for when SAVE values are always nonnegative. +# Rearguard section, for parsers lacking negative DST; see ziguard.awk. # 1:00 - IST 1971 Oct 31 2:00u # 0:00 GB-Eire GMT/IST 1996 # 0:00 EU GMT/IST +# End of rearguard section. ############################################################################### @@ -1018,7 +1019,7 @@ 1:00 Czech CE%sT 1946 Dec 1 3:00 # Vanguard section, for zic and other parsers that support negative DST. 1:00 -1:00 GMT 1947 Feb 23 2:00 -# Rearguard section, for parsers that do not support negative DST. +# Rearguard section, for parsers lacking negative DST; see ziguard.awk. # 0:00 - GMT 1947 Feb 23 2:00 # End of rearguard section. 1:00 Czech CE%sT 1979 @@ -1175,14 +1176,17 @@ -3:00 - -03 1980 Apr 6 2:00 -3:00 EU -03/-02 1996 0:00 - GMT +# +# Use the old name Scoresbysund, as the current name Ittoqqortoormiit +# exceeds tzdb's 14-letter limit and has no common English abbreviation. Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit -2:00 - -02 1980 Apr 6 2:00 -2:00 C-Eur -02/-01 1981 Mar 29 -1:00 EU -01/+00 -Zone America/Godthab -3:26:56 - LMT 1916 Jul 28 # Nuuk +Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb -3:00 - -03 1980 Apr 6 2:00 -3:00 EU -03/-02 -Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik air base +Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik -4:00 Thule A%sT # Estonia @@ -1552,7 +1556,7 @@ # # From January 1st, 1908 the whole of Iceland was standardised at 1 hour # behind GMT. Previously, local mean solar time was used in different parts -# of Iceland, the almanak had been based on Reykjavik mean solar time which +# of Iceland, the almanak had been based on Reykjavík mean solar time which # was 1 hour and 28 minutes behind GMT. # # "first day of winter" referred to [below] means the first day of the 26 weeks diff -Nru libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/northamerica libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/northamerica --- libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/northamerica 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/northamerica 2020-04-24 09:48:53.000000000 +0000 @@ -86,7 +86,7 @@ # For more about the first ten years of DST in the United States, see # Robert Garland, Ten years of daylight saving from the Pittsburgh standpoint # (Carnegie Library of Pittsburgh, 1927). -# http://www.clpgh.org/exhibit/dst.html +# https://web.archive.org/web/20160517155308/http://www.clpgh.org/exhibit/dst.html # # Shanks says that DST was called "War Time" in the US in 1918 and 1919. # However, DST was imposed by the Standard Time Act of 1918, which @@ -1470,7 +1470,8 @@ -4:00 Canada A%sT -# west Labrador, Nova Scotia, Prince Edward I +# west Labrador, Nova Scotia, Prince Edward I, +# Îles-de-la-Madeleine, Listuguj reserve # From Brian Inglis (2015-07-20): # From the historical weather station records available at: @@ -1489,6 +1490,13 @@ # in Canada to observe DST in 1971 but not 1970; for now we'll assume # this is a typo. +# From Jeffery Nichols (2020-01-09): +# America/Halifax ... also applies to Îles-de-la-Madeleine and the Listuguj +# reserve in Quebec. Officially, this came into effect on January 1, 2007 +# (Legal Time Act, CQLR c T-5.1), but the legislative debates surrounding that +# bill say that it is "accommodating the customs and practices" of those +# regions, which suggests that they have always been in-line with Halifax. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Halifax 1916 only - Apr 1 0:00 1:00 D Rule Halifax 1916 only - Oct 1 0:00 0 S @@ -1582,19 +1590,20 @@ # Quebec -# From Paul Eggert (2015-03-24): +# From Paul Eggert (2020-01-10): # See America/Toronto for most of Quebec, including Montreal. +# See America/Halifax for the Îles de la Madeleine and the Listuguj reserve. # # Matthews and Vincent (1998) also write that Quebec east of the -63 # meridian is supposed to observe AST, but residents as far east as # Natashquan use EST/EDT, and residents east of Natashquan use AST. # The Quebec department of justice writes in # "The situation in Minganie and Basse-Côte-Nord" -# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm +# https://www.justice.gouv.qc.ca/en/department/ministre/functions-and-responsabilities/legal-time-in-quebec/the-situation-in-minganie-and-basse-cote-nord/ # that the coastal strip from just east of Natashquan to Blanc-Sablon # observes Atlantic standard time all year round. -# https://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en -# says this common practice was codified into law as of 2007. +# This common practice was codified into law as of 2007; see Legal Time Act, +# CQLR c T-5.1 . # For lack of better info, guess this practice began around 1970, contra to # Shanks & Pottenger who have this region observing AST/ADT. @@ -1613,6 +1622,15 @@ # Nipigon (EST) and Rainy River (CST) are the largest that we know of. # Far west Ontario is like Winnipeg; far east Quebec is like Halifax. +# From Jeffery Nichols (2020-02-06): +# According to the [Shanks] atlas, those western Ontario zones are huge, +# covering most of Ontario northwest of Sault Ste Marie and Timmins. +# The zones seem to include towns bigger than the ones they're named after, +# like Dryden in America/Rainy_River and Wawa (and maybe Attawapiskat) in +# America/Nipigon. I assume it's too much trouble to change the name of the +# zone (like when you found out that America/Glace_Bay includes Sydney, Nova +# Scotia).... + # From Mark Brader (2003-07-26): # [According to the Toronto Star] Orillia, Ontario, adopted DST # effective Saturday, 1912-06-22, 22:00; the article mentions that @@ -2419,6 +2437,18 @@ # obtained in November 2008 should be ignored... # I apologize for reporting incorrect information in 2008. +# From Tim Parenti (2020-03-05): +# The government of Yukon announced [yesterday] the cessation of seasonal time +# changes. "After clocks are pushed ahead one hour on March 8, the territory +# will remain on [UTC-07]. ... [The government] found 93 per cent of +# respondents wanted to end seasonal time changes and, of that group, 70 per +# cent wanted 'permanent Pacific Daylight Saving Time.'" +# https://www.cbc.ca/news/canada/north/yukon-end-daylight-saving-time-1.5486358 +# +# Although the government press release prefers PDT, we prefer MST for +# consistency with nearby Dawson Creek, Creston, and Fort Nelson. +# https://yukon.ca/en/news/yukon-end-seasonal-time-change + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule NT_YK 1918 only - Apr 14 2:00 1:00 D Rule NT_YK 1918 only - Oct 27 2:00 0 S @@ -2473,11 +2503,13 @@ Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20 -9:00 NT_YK Y%sT 1967 May 28 0:00 -8:00 NT_YK P%sT 1980 - -8:00 Canada P%sT + -8:00 Canada P%sT 2020 Mar 8 2:00 + -7:00 - MST Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 -9:00 NT_YK Y%sT 1973 Oct 28 0:00 -8:00 NT_YK P%sT 1980 - -8:00 Canada P%sT + -8:00 Canada P%sT 2020 Mar 8 2:00 + -7:00 - MST ############################################################################### diff -Nru libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/Readme.txt libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/Readme.txt --- libjoda-time-java-2.10.5/src/main/java/org/joda/time/tz/src/Readme.txt 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/main/java/org/joda/time/tz/src/Readme.txt 2020-04-24 09:48:53.000000000 +0000 @@ -1,2 +1,2 @@ The data files in this directory were obtained from the public IANA time zone database, -https://www.iana.org/time-zones, version 2019c. +https://www.iana.org/time-zones, version 2020a. diff -Nru libjoda-time-java-2.10.5/src/site/markdown/index.md libjoda-time-java-2.10.6/src/site/markdown/index.md --- libjoda-time-java-2.10.5/src/site/markdown/index.md 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/src/site/markdown/index.md 2020-04-24 09:48:53.000000000 +0000 @@ -130,7 +130,7 @@ ## Releases -[Release 2.10.5](download.html) is the current latest release. +[Release 2.10.6](download.html) is the current latest release. This release is considered stable and worthy of the 2.x tag. See the [change notes](changes-report.html) for full details. @@ -144,7 +144,7 @@ joda-time joda-time - 2.10.5 + 2.10.6 ``` diff -Nru libjoda-time-java-2.10.5/.travis.yml libjoda-time-java-2.10.6/.travis.yml --- libjoda-time-java-2.10.5/.travis.yml 2019-10-24 14:08:04.000000000 +0000 +++ libjoda-time-java-2.10.6/.travis.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# build does not work on Java 9 or later as Java 5 is not a valid target - -language: java -jdk: - - openjdk8 -cache: - directories: - - "$HOME/.m2/repository" -before_cache: - - rm -rf $HOME/.m2/repository/org/joda/time -# install -install: - - mvn --version -script: - - mvn install site -e -B -after_success: - - if [[ $TRAVIS_TAG =~ ^website.*$ ]] && [ "$TRAVIS_JDK_VERSION" == "openjdk8" ]; then chmod +x ./.github/website.sh; .github/website.sh; fi - - if [[ $TRAVIS_TAG =~ ^v.*$ ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_JDK_VERSION" == "openjdk8" ]; then chmod +x ./.github/website.sh; .github/website.sh; fi -# secure keys for GITHUB_TOKEN -env: - global: - secure: UK9A4eHPOP6XkYbST1kpv3gVEZTBqp79eCF0nqpXejbXihY58MNVZ0aGt8IM/ZThO/UoK+AxWjaSLljE2Neo4ehxvRHsRG0bIhAoCBUjP6f6vuMYTZlRNb9W+NM3RjXvrQGnCM3PTckWaFQ6i5Ny4e1GuETSdh96Yk7WNn6DMJM=