Repository: urlaubsverwaltung/urlaubsverwaltung
Pull request #4362 (2023-12-06 19:05:05)

Jollyday upgrade
<!--

Thanks for contributing to the Urlaubsverwaltung.
Please review the following notes before submitting you pull request.

Please look for other issues or pull requests which already work on this topic. Is somebody already on it? Do you need to synchronize?

# Security Vulnerabilities

🛑 STOP! 🛑 If your contribution fixes a security vulnerability, please do not submit it.
Instead, please open a report of a security vulnerability via
[Report a security vulnerability](https://github.com/urlaubsverwaltung/urlaubsverwaltung/security/advisories/new)


# Describing Your Changes

If, having reviewed the notes above, you're ready to submit your pull request, please
provide a brief description of the proposed changes.

If they:
 🐞 fix a bug, please describe the broken behaviour and how the changes fix it.
    Please label with 'type: bug' and 'status: new'
    
 🎁 make an enhancement, please describe the new functionality and why you believe it's useful.
    Please label with 'type: enhancement' and 'status: new'
 
If your pull request relates to any existing issues,
please reference them by using the issue number prefixed with #.

-->



Patch:
diff --git a/pom.xml b/pom.xml
index 26051f5de..fe05d881b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     <java.version>21</java.version>
     <uv-extension-api.version>0.9.0</uv-extension-api.version>
-    <jollyday.version>0.21.0</jollyday.version>
+    <jollyday.version>0.22.0</jollyday.version>
 
     <docker-publish-registry>registry.example.com</docker-publish-registry>
     <docker-publish-registry-path>path/example</docker-publish-registry-path>
diff --git a/src/main/java/org/synyx/urlaubsverwaltung/workingtime/FederalState.java b/src/main/java/org/synyx/urlaubsverwaltung/workingtime/FederalState.java
index 3a01389a2..1acb116c2 100644
--- a/src/main/java/org/synyx/urlaubsverwaltung/workingtime/FederalState.java
+++ b/src/main/java/org/synyx/urlaubsverwaltung/workingtime/FederalState.java
@@ -39,15 +39,15 @@ public enum FederalState {
 
     GREECE_GREECE("gr", "gr"),
 
-    AUSTRIA_BURGENLAND("at", "b"),
-    AUSTRIA_KAERNTEN("at", "k"),
-    AUSTRIA_NIEDEROESTERREICH("at", "la"),
-    AUSTRIA_OBEROESTERREICH("at", "ua"),
-    AUSTRIA_SALZBURG("at", "s"),
-    AUSTRIA_STEIERMARK("at", "st"),
-    AUSTRIA_TIROL("at", "t"),
-    AUSTRIA_VORARLBERG("at", "va"),
-    AUSTRIA_WIEN("at", "w"),
+    AUSTRIA_BURGENLAND("at", "1"),
+    AUSTRIA_KAERNTEN("at", "2"),
+    AUSTRIA_NIEDEROESTERREICH("at", "3"),
+    AUSTRIA_OBEROESTERREICH("at", "4"),
+    AUSTRIA_SALZBURG("at", "5"),
+    AUSTRIA_STEIERMARK("at", "6"),
+    AUSTRIA_TIROL("at", "7"),
+    AUSTRIA_VORARLBERG("at", "8"),
+    AUSTRIA_WIEN("at", "9"),
 
     SWITZERLAND_AARGAU("ch", "ag"),
     SWITZERLAND_APPENZELL_INNERRHODEN("ch", "ai"),
diff --git a/src/main/resources/Holidays_at.xml b/src/main/resources/Holidays_at.xml
index 76a47ace3..aae13032f 100644
--- a/src/main/resources/Holidays_at.xml
+++ b/src/main/resources/Holidays_at.xml
@@ -22,56 +22,56 @@
     <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
   </Holidays>
 
-  <SubConfigurations hierarchy="b" description="Burgenland">
+  <SubConfigurations hierarchy="1" description="Burgenland">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="MARTINS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="k" description="Kärnten">
+  <SubConfigurations hierarchy="2" description="Kärnten">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
       <Fixed month="OCTOBER" day="10" descriptionPropertiesKey="PLEBISCITE"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="la" description="Niederösterreich">
+  <SubConfigurations hierarchy="3" description="Niederösterreich">
     <Holidays>
       <Fixed month="NOVEMBER" day="15" descriptionPropertiesKey="LEOPOLD"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ua" description="Oberösterreich">
+  <SubConfigurations hierarchy="4" description="Oberösterreich">
     <Holidays>
       <Fixed month="MAY" day="4" descriptionPropertiesKey="FLORIAN"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="s" description="Salzburg">
+  <SubConfigurations hierarchy="5" description="Salzburg">
     <Holidays>
       <Fixed month="SEPTEMBER" day="24" descriptionPropertiesKey="RUPERT"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="st" description="Steiermark">
+  <SubConfigurations hierarchy="6" description="Steiermark">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="t" description="Tirol">
+  <SubConfigurations hierarchy="7" description="Tirol">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="va" description="Vorarlberg">
+  <SubConfigurations hierarchy="8" description="Vorarlberg">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="w" description="Wien">
+  <SubConfigurations hierarchy="9" description="Wien">
     <Holidays>
       <Fixed month="NOVEMBER" day="15" descriptionPropertiesKey="LEOPOLD"/>
     </Holidays>
diff --git a/src/main/resources/Holidays_it.xml b/src/main/resources/Holidays_it.xml
index ffaf7db9c..498dea0f6 100644
--- a/src/main/resources/Holidays_it.xml
+++ b/src/main/resources/Holidays_it.xml
@@ -19,7 +19,8 @@
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
     <ChristianHoliday type="EASTER_MONDAY" validFrom="1642" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
   </Holidays>
-  <SubConfigurations hierarchy="bz" description="Südtirol">
+
+  <SubConfigurations hierarchy="32" description="Südtirol">
     <Holidays>
       <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
     </Holidays>


Test patch:
diff --git a/src/test/java/org/synyx/urlaubsverwaltung/workingtime/FederalStateTest.java b/src/test/java/org/synyx/urlaubsverwaltung/workingtime/FederalStateTest.java
index 33fe15794..6cc57f747 100644
--- a/src/test/java/org/synyx/urlaubsverwaltung/workingtime/FederalStateTest.java
+++ b/src/test/java/org/synyx/urlaubsverwaltung/workingtime/FederalStateTest.java
@@ -114,15 +114,15 @@ class FederalStateTest {
 
             Arguments.of(GREECE_GREECE, "gr", null),
 
-            Arguments.of(AUSTRIA_BURGENLAND, "b", null),
-            Arguments.of(AUSTRIA_KAERNTEN, "k", null),
-            Arguments.of(AUSTRIA_NIEDEROESTERREICH, "la", null),
-            Arguments.of(AUSTRIA_OBEROESTERREICH, "ua", null),
-            Arguments.of(AUSTRIA_SALZBURG, "s", null),
-            Arguments.of(AUSTRIA_STEIERMARK, "st", null),
-            Arguments.of(AUSTRIA_TIROL, "t", null),
-            Arguments.of(AUSTRIA_VORARLBERG, "va", null),
-            Arguments.of(AUSTRIA_WIEN, "w", null),
+            Arguments.of(AUSTRIA_BURGENLAND, "1", null),
+            Arguments.of(AUSTRIA_KAERNTEN, "2", null),
+            Arguments.of(AUSTRIA_NIEDEROESTERREICH, "3", null),
+            Arguments.of(AUSTRIA_OBEROESTERREICH, "4", null),
+            Arguments.of(AUSTRIA_SALZBURG, "5", null),
+            Arguments.of(AUSTRIA_STEIERMARK, "6", null),
+            Arguments.of(AUSTRIA_TIROL, "7", null),
+            Arguments.of(AUSTRIA_VORARLBERG, "8", null),
+            Arguments.of(AUSTRIA_WIEN, "9", null),
 
             Arguments.of(SWITZERLAND_AARGAU, "ag", null),
             Arguments.of(SWITZERLAND_APPENZELL_INNERRHODEN, "ai", null),