Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Jollyday to 0.23.2 #4033

Merged
merged 1 commit into from Jan 14, 2024
Merged

Upgrade Jollyday to 0.23.2 #4033

merged 1 commit into from Jan 14, 2024

Conversation

wborn
Copy link
Member

@wborn wborn commented Jan 11, 2024

Upgrades Jollyday 0.5.10 (de.jollyday) to 0.23.2 of a more actively maintained fork (de.focus-shift).

For release notes, see:

https://github.com/focus-shift/jollyday/releases

Fixes #3544

@wborn wborn added enhancement An enhancement or new feature of the Core dependencies Pull requests that update a dependency file labels Jan 11, 2024
@jlaur
Copy link
Contributor

jlaur commented Jan 11, 2024

@wborn - great, thanks! A small note - this work-around should then be removed (the file deleted):

<?xml version="1.0" encoding="UTF-8"?>
<tns:Configuration hierarchy="dk" description="Denmark" xmlns:tns="http://www.example.org/Holiday"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
<tns:Holidays>
<tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
<tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
<tns:Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
<tns:ChristianHoliday type="EASTER"/>
<tns:ChristianHoliday type="MAUNDY_THURSDAY"/>
<tns:ChristianHoliday type="GOOD_FRIDAY"/>
<tns:ChristianHoliday type="EASTER_MONDAY"/>
<tns:ChristianHoliday type="GENERAL_PRAYER_DAY" validTo="2023"/>
<tns:ChristianHoliday type="ASCENSION_DAY"/>
<tns:ChristianHoliday type="WHIT_MONDAY"/>
<tns:ChristianHoliday type="PENTECOST"/>
</tns:Holidays>
</tns:Configuration>

and this test should still work:

@Test
public void testIsBankHolidayWhenGeneralPrayerDay2024() {
ZonedDateTime generalPrayerDay = ZonedDateTime.of(2024, 04, 26, 0, 0, 0, 0, ZoneId.of("Europe/Paris"));
ephemerisManager.modified(Map.of(CONFIG_COUNTRY, COUNTRY_DENMARK_KEY));
assertFalse(ephemerisManager.isBankHoliday(generalPrayerDay));
}

because upstream is well maintained:
https://github.com/focus-shift/jollyday/blob/8f6d5d97f45889a26d9a77a43d03f5ac2419938d/jollyday-core/src/main/resources/holidays/Holidays_dk.xml#L15

The work-around for ending the Danish Great Prayer Day was introduced by #3573.

@wborn
Copy link
Member Author

wborn commented Jan 11, 2024

The test still succeeds after removal!

@wborn wborn marked this pull request as ready for review January 12, 2024 13:11
@wborn wborn requested a review from a team as a code owner January 12, 2024 13:11
@wborn wborn force-pushed the upgrade-jollyday branch 3 times, most recently from eba2337 to 5e56688 Compare January 12, 2024 15:46
@wborn wborn changed the title Upgrade Jollyday to 0.23.0 Upgrade Jollyday to 0.23.1 Jan 12, 2024
wborn added a commit to wborn/openhab-docs that referenced this pull request Jan 13, 2024
Updates the URLs to the GitHub repo of the actively maintained Jollyday fork.

Related to: openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
wborn added a commit to wborn/openhab-docs that referenced this pull request Jan 13, 2024
Updates the URLs to the GitHub repo of the actively maintained Jollyday fork.

Related to: openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
wborn added a commit to wborn/openhab-addons that referenced this pull request Jan 13, 2024
Related to openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
stefan-hoehn pushed a commit to openhab/openhab-docs that referenced this pull request Jan 13, 2024
Updates the URLs to the GitHub repo of the actively maintained Jollyday fork.

Related to: openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
Upgrades Jollyday 0.5.10 (de.jollyday) to 0.23.2 of a more actively maintained fork (de.focus-shift).

* This adds many missing holidays.
* Also removes the workaround for the Danish Great Prayer Day introduced by openhab#3573.

For release notes, see:

https://github.com/focus-shift/jollyday/releases

Fixes openhab#3544

Signed-off-by: Wouter Born <github@maindrain.net>
@wborn wborn changed the title Upgrade Jollyday to 0.23.1 Upgrade Jollyday to 0.23.2 Jan 14, 2024
wborn added a commit to wborn/openhab-addons that referenced this pull request Jan 14, 2024
Related to openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
wborn added a commit to wborn/openhab-distro that referenced this pull request Jan 14, 2024
Related to: openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
Copy link
Member

@kaikreuzer kaikreuzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kaikreuzer kaikreuzer merged commit 6495f4e into openhab:main Jan 14, 2024
3 checks passed
@kaikreuzer kaikreuzer added this to the 4.2 milestone Jan 14, 2024
@wborn wborn deleted the upgrade-jollyday branch January 14, 2024 14:40
kaikreuzer pushed a commit to openhab/openhab-distro that referenced this pull request Jan 14, 2024
Related to: openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
kaikreuzer pushed a commit to openhab/openhab-addons that referenced this pull request Jan 14, 2024
Related to openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
pgfeller pushed a commit to pgfeller/openhab-docs that referenced this pull request Jan 15, 2024
Updates the URLs to the GitHub repo of the actively maintained Jollyday fork.

Related to: openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
cipianpascu pushed a commit to cipianpascu/openhab-core that referenced this pull request Jan 17, 2024
Upgrades Jollyday 0.5.10 (de.jollyday) to 0.23.2 of a more actively maintained fork (de.focus-shift).

* This adds many missing holidays.
* Also removes the workaround for the Danish Great Prayer Day introduced by openhab#3573.

For release notes, see:

https://github.com/focus-shift/jollyday/releases

Fixes openhab#3544

Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
andrasU pushed a commit to andrasU/openhab-addons that referenced this pull request Jan 27, 2024
Related to openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Andras Uhrin <andras.uhrin@gmail.com>
austvik pushed a commit to austvik/openhab-addons that referenced this pull request Mar 27, 2024
Related to openhab/openhab-core#4033

Signed-off-by: Wouter Born <github@maindrain.net>
Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file enhancement An enhancement or new feature of the Core
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ephemeris] Upgrade/replace Jollyday
3 participants