Merge pull request #90 from rgdoliveira/sync_main

Sync main branch with Apache main branch

Author: rgdoliveira

.ci/jenkins/tests/pom.xml

@@ -55,7 +55,7 @@
         <logback.configration>logback-test.xml</logback.configration>
         <logdir>${project.build.directory}/log</logdir>
         <test.loglevel>ERROR</test.loglevel>
-        <log.logback.version>1.2.13</log.logback.version>
+        <log.logback.version>1.3.15</log.logback.version>
         <log.slf4j.version>1.7.25</log.slf4j.version>
         <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
 

NOTICE

@@ -1,5 +1,5 @@
 Apache KIE
-Copyright 2023-2024 The Apache Software Foundation
+Copyright 2023-2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

addons/common/jbpm-usertask-storage-jpa/src/main/resources/kie-flyway/db/user-tasks/h2/V1.0.2__jBPM_user_tasks_comments_increase_comment_size.sql

@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ALTER TABLE jbpm_user_tasks_comments ALTER COLUMN comment SET DATA TYPE VARCHAR(1000);

addons/common/jbpm-usertask-storage-jpa/src/main/resources/kie-flyway/db/user-tasks/postgresql/V1.0.2__jBPM_user_tasks_comments_increase_comment_size.sql

@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ALTER TABLE jbpm_user_tasks_comments ALTER COLUMN comment TYPE VARCHAR(1000);

jbpm/jbpm-flow/src/test/java/org/jbpm/process/core/timer/BusinessCalendarImplTest.java

@@ -222,20 +222,41 @@ void rollCalendarToNightlyWorkingHour() {
     }
 
     @Test
-    void rollCalendarAfterHolidays() {
-        Instant now = Instant.now();
-        int holidayLeft = 4;
-        Instant startHolidayInstant = now.minus(2, DAYS);
-        Instant endHolidayInstant = now.plus(holidayLeft, DAYS);
-        Date startHoliday = Date.from(startHolidayInstant);
-        Date endHoliday = Date.from(endHolidayInstant);
-        List<BusinessCalendarImpl.TimePeriod> holidays = Collections.singletonList(new BusinessCalendarImpl.TimePeriod(startHoliday, endHoliday));
+    void rollCalendarAfterHolidaysWithoutYearRollover() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, 360);
+        calendar.set(Calendar.YEAR, 2025);
+        Instant currentInstant = calendar.toInstant();
+
+        Instant startHolidayInstant = currentInstant.minus(2, DAYS);
+        Instant endHolidayInstant = currentInstant.plus(4, DAYS);
+        List<BusinessCalendarImpl.TimePeriod> holidays = Collections.singletonList(
+                new BusinessCalendarImpl.TimePeriod(Date.from(startHolidayInstant), Date.from(endHolidayInstant)));
         List<Integer> weekendDays = Collections.emptyList();
+
+        BusinessCalendarImpl.rollCalendarAfterHolidays(calendar, holidays, weekendDays, false);
+
+        int expectedDayOfYear = 360 + 4 + 1; //last day of the year, as it is not leap year
+        assertThat(calendar.get(Calendar.DAY_OF_YEAR)).isEqualTo(expectedDayOfYear);
+    }
+
+    @Test
+    void rollCalendarAfterHolidaysWithYearRollover() {
         Calendar calendar = Calendar.getInstance();
-        int currentDayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
+        calendar.set(Calendar.DAY_OF_YEAR, 361);
+        calendar.set(Calendar.YEAR, 2025);
+        Instant currentInstant = calendar.toInstant();
+
+        Instant startHolidayInstant = currentInstant.minus(2, DAYS);
+        Instant endHolidayInstant = currentInstant.plus(4, DAYS);
+        List<BusinessCalendarImpl.TimePeriod> holidays = Collections.singletonList(
+                new BusinessCalendarImpl.TimePeriod(Date.from(startHolidayInstant), Date.from(endHolidayInstant)));
+        List<Integer> weekendDays = Collections.emptyList();
+
         BusinessCalendarImpl.rollCalendarAfterHolidays(calendar, holidays, weekendDays, false);
-        int expected = currentDayOfYear + holidayLeft + 1;
-        assertThat(calendar.get(Calendar.DAY_OF_YEAR)).isEqualTo(expected);
+
+        int expectedDayOfYear = 1; //since 2025 is not leap year
+        assertThat(calendar.get(Calendar.DAY_OF_YEAR)).isEqualTo(expectedDayOfYear);
     }
 
     @Test