diff --git a/bonita-engine/build.gradle b/bonita-engine/build.gradle index a091b5b5826..abc74dca1d2 100644 --- a/bonita-engine/build.gradle +++ b/bonita-engine/build.gradle @@ -48,7 +48,14 @@ dependencyManagement { entry 'httpmime' } dependency libs.xstream.get() as String - dependency libs.tomcatDbcp.get() as String + dependencySet(group: 'org.apache.tomcat', version: libs.versions.tomcatVersion.get()) { + entry 'tomcat-dbcp' + entry 'tomcat' + entry 'tomcat-catalina' + } + dependencySet(group: 'org.apache.tomcat.embed', version: libs.versions.tomcatVersion.get()) { + entry 'tomcat-embed-core' + } dependency libs.narayanaJta.get() as String dependency libs.jakartaActivation.get() as String dependency(libs.quartz.get() as String) diff --git a/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/bpm/process/DeleteProcessInstancesIT.java b/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/bpm/process/DeleteProcessInstancesIT.java index f3784f756fb..ed03e448b15 100644 --- a/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/bpm/process/DeleteProcessInstancesIT.java +++ b/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/bpm/process/DeleteProcessInstancesIT.java @@ -14,21 +14,22 @@ package org.bonitasoft.engine.bpm.process; import static java.util.Arrays.asList; +import static java.util.Map.entry; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; +import static org.awaitility.Awaitility.await; import static org.bonitasoft.engine.data.instance.api.DataInstanceContainer.ACTIVITY_INSTANCE; import static org.bonitasoft.engine.data.instance.api.DataInstanceContainer.PROCESS_INSTANCE; import static org.junit.Assert.fail; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.Callable; +import java.util.*; import org.bonitasoft.engine.bpm.bar.BarResource; import org.bonitasoft.engine.bpm.bar.BusinessArchiveBuilder; import org.bonitasoft.engine.bpm.bar.actorMapping.Actor; import org.bonitasoft.engine.bpm.bar.actorMapping.ActorMapping; import org.bonitasoft.engine.bpm.connector.ConnectorEvent; +import org.bonitasoft.engine.bpm.contract.FileInputValue; import org.bonitasoft.engine.bpm.contract.Type; import org.bonitasoft.engine.bpm.document.DocumentValue; import org.bonitasoft.engine.bpm.process.impl.ProcessDefinitionBuilder; @@ -64,7 +65,17 @@ public void should_delete_complete_archived_process_instances() throws Exception List userTaskInstances = new ArrayList<>(); for (int i = 0; i < 2; i++) { long id = getProcessAPI().startProcessWithInputs(mainProcess.getId(), - Collections.singletonMap("simpleInput1", "singleInputValue")).getId(); + Map.ofEntries(entry("simpleInput1", "singleInputValue"), + entry("myFile", new FileInputValue("testFile", "testFile".getBytes())))) + .getId(); + var archivedFileInput = await().until(() -> inTx( + () -> getServiceAccessor().getContractDataService().getArchivedProcessDataValue(id, "myFile")), + Objects::nonNull); + assertThat(archivedFileInput) + .as("File input content of archived contract data should be null") + .isInstanceOf(FileInputValue.class) + .extracting("content") + .isNull(); long userTask1 = waitForUserTask(id, "userTask1"); userTaskInstances.add(userTask1); getProcessAPI().assignUserTask(userTask1, user.getId()); @@ -80,7 +91,7 @@ public void should_delete_complete_archived_process_instances() throws Exception getProcessAPI().deleteArchivedProcessInstancesInAllStates(processInstances); - getServiceAccessor().getUserTransactionService().executeInTransaction((Callable) () -> { + inTx(() -> { for (Long userTaskInstance : userTaskInstances) { try { getServiceAccessor().getContractDataService().getArchivedUserTaskDataValue(userTaskInstance, @@ -139,7 +150,9 @@ public void should_delete_process_instance_currently_executing() throws Exceptio ProcessDefinition sub2 = createSubProcessDefinitionWithUserTask(user); long id = getProcessAPI().startProcessWithInputs(mainProcess.getId(), - Collections.singletonMap("simpleInput1", "singleInputValue")).getId(); + Map.ofEntries(entry("simpleInput1", "singleInputValue"), + entry("myFile", new FileInputValue("testFile", "testFile".getBytes())))) + .getId(); waitForUserTask(id, "userTask1"); waitForUserTask("taskOfSubProcess"); waitForUserTask("taskOfSubProcess"); @@ -183,7 +196,9 @@ protected List getAllFlowNodes() throws Exception { protected ProcessDefinition createMainProcessDefinition() throws Exception { ProcessDefinitionBuilder mainProcessBuilder = new ProcessDefinitionBuilder() .createNewInstance("mainProcess", "1.0"); - mainProcessBuilder.addContract().addInput("simpleInput1", Type.TEXT, "a simple input"); + mainProcessBuilder.addContract() + .addInput("simpleInput1", Type.TEXT, "a simple input") + .addFileInput("myFile", "A file input"); mainProcessBuilder.addActor("actor"); mainProcessBuilder.addUserTask("userTask1", "actor").addContract().addInput("simpleInputTask", Type.TEXT, "a simple task input"); diff --git a/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/test/CommonAPILocalIT.java b/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/test/CommonAPILocalIT.java index 532f2ee0444..9713426faa9 100644 --- a/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/test/CommonAPILocalIT.java +++ b/bonita-integration-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/test/CommonAPILocalIT.java @@ -13,6 +13,8 @@ **/ package org.bonitasoft.engine.test; +import java.util.concurrent.Callable; + import org.bonitasoft.engine.CommonAPIIT; import org.bonitasoft.engine.exception.BonitaRuntimeException; import org.bonitasoft.engine.service.ServiceAccessor; @@ -44,4 +46,8 @@ protected static void cleanSession() throws Exception { sessionAccessor.deleteSessionId(); } + protected T inTx(Callable callable) throws Exception { + return getServiceAccessor().getUserTransactionService().executeInTransaction(callable); + } + } diff --git a/bpm/bonita-core/bonita-contract-data/build.gradle b/bpm/bonita-core/bonita-contract-data/build.gradle index 9f6f88764d8..23c7b74d3a4 100644 --- a/bpm/bonita-core/bonita-contract-data/build.gradle +++ b/bpm/bonita-core/bonita-contract-data/build.gradle @@ -6,10 +6,14 @@ dependencies { api project(':services:bonita-log') api project(':services:bonita-archive') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" + implementation platform(libs.bonitaArtifactsModelBom) + implementation 'org.bonitasoft.engine:bonita-process-definition-model' testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - + testImplementation libs.junit5api + testImplementation libs.junit4 + testRuntimeOnly(libs.junitJupiterEngine) + testRuntimeOnly(libs.junitVintageEngine) annotationProcessor libs.lombok compileOnly libs.lombok } diff --git a/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/ContractDataServiceImpl.java b/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/ContractDataServiceImpl.java index ebc8dc6faa1..45de62692bd 100644 --- a/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/ContractDataServiceImpl.java +++ b/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/ContractDataServiceImpl.java @@ -351,7 +351,8 @@ public Serializable getArchivedProcessDataValue(final long processInstanceId, fi final SAProcessContractData contractData = readPersistenceService.selectOne(descriptor); if (contractData == null) { throw new SContractDataNotFoundException( - "No contract data found named: " + dataName + " of process instance: " + processInstanceId); + "No archived contract data found named: " + dataName + " of process instance: " + + processInstanceId); } return contractData.getValue(); } diff --git a/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/SAContractData.java b/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/SAContractData.java index 4b14c2f8bef..bca70b1243b 100644 --- a/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/SAContractData.java +++ b/bpm/bonita-core/bonita-contract-data/src/main/java/org/bonitasoft/engine/core/contract/data/SAContractData.java @@ -20,6 +20,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.bonitasoft.engine.bpm.contract.FileInputValue; import org.bonitasoft.engine.persistence.PersistentObject; import org.bonitasoft.engine.persistence.PersistentObjectId; import org.bonitasoft.engine.persistence.SAPersistenceObjectImpl; @@ -46,14 +47,27 @@ public abstract class SAContractData extends SAPersistenceObjectImpl { @Column protected long scopeId; - public SAContractData(long sourceObjectId, String name, Serializable value, long scopeId) { + protected SAContractData(long sourceObjectId, String name, Serializable value, long scopeId) { super(sourceObjectId); this.name = name; this.scopeId = scopeId; - this.value = value; + this.value = clearFileInputContent(value); } - public SAContractData(SContractData contractData) { + /** + * Remove the {@link FileInputValue} content from Archived Contract Data + * + * @param value, The contract input value + * @return The contract input value without file content in case of a {@link FileInputValue} + */ + private static Serializable clearFileInputContent(Serializable value) { + if (value instanceof FileInputValue inputValue) { + inputValue.setContent(null); + } + return value; + } + + protected SAContractData(SContractData contractData) { this(contractData.getId(), contractData.getName(), contractData.getValue(), contractData.getScopeId()); } diff --git a/bpm/bonita-core/bonita-contract-data/src/test/java/org/bonitasoft/engine/core/contract/data/SAProcessContractDataTest.java b/bpm/bonita-core/bonita-contract-data/src/test/java/org/bonitasoft/engine/core/contract/data/SAProcessContractDataTest.java index bea12c43d0a..52a1fa05b68 100644 --- a/bpm/bonita-core/bonita-contract-data/src/test/java/org/bonitasoft/engine/core/contract/data/SAProcessContractDataTest.java +++ b/bpm/bonita-core/bonita-contract-data/src/test/java/org/bonitasoft/engine/core/contract/data/SAProcessContractDataTest.java @@ -15,12 +15,27 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.bonitasoft.engine.bpm.contract.FileInputValue; +import org.junit.jupiter.api.Test; -public class SAProcessContractDataTest { +class SAProcessContractDataTest { @Test - public void creatingSAProcessContractDataShouldCopyNonArchivedValues() throws Exception { + void clearFileInputContent() { + var contractData = new SProcessContractData(); + contractData.setId(1); + contractData.setName("myFile"); + contractData.setValue(new FileInputValue("theFile", "content".getBytes())); + + var archivedContractData = new SAProcessContractData(contractData); + + assertThat(archivedContractData.getValue()).isInstanceOf(FileInputValue.class) + .extracting("content") + .isNull(); + } + + @Test + void creatingSAProcessContractDataShouldCopyNonArchivedValues() { long processInstanceId = 555L; String some_name = "some_name"; long value = 999999L; @@ -31,11 +46,11 @@ public void creatingSAProcessContractDataShouldCopyNonArchivedValues() throws Ex final SAProcessContractData saProcessContractData = new SAProcessContractData(processContractData); - assertThat(saProcessContractData.getTenantId()).isEqualTo(0L); // not set yet by Persistence service - assertThat(saProcessContractData.getId()).isEqualTo(0L); + assertThat(saProcessContractData.getTenantId()).isZero(); // not set yet by Persistence service + assertThat(saProcessContractData.getId()).isZero(); assertThat(saProcessContractData.getName()).isEqualTo(some_name); assertThat(saProcessContractData.getScopeId()).isEqualTo(processInstanceId); - assertThat(saProcessContractData.getArchiveDate()).isEqualTo(0L); + assertThat(saProcessContractData.getArchiveDate()).isZero(); assertThat(saProcessContractData.getSourceObjectId()).isEqualTo(originalProcessDataId); assertThat(saProcessContractData.getValue()).isEqualTo(value); } diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po index 331fa6d1b35..78280f20081 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: es-ES\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal-js.pot\n" -"X-Crowdin-File-ID: 72894\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal-js.pot\n" +"X-Crowdin-File-ID: 60594\n" "Language-Team: Spanish\n" "Language: es_ES\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po index 630ea5a50d7..3f9d62b53aa 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: fr\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal-js.pot\n" -"X-Crowdin-File-ID: 72894\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal-js.pot\n" +"X-Crowdin-File-ID: 60594\n" "Language-Team: French\n" "Language: fr_FR\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po index c3fc251eea4..5ae5a10e44b 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: ja\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal-js.pot\n" -"X-Crowdin-File-ID: 72894\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal-js.pot\n" +"X-Crowdin-File-ID: 60594\n" "Language-Team: Japanese\n" "Language: ja_JP\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po index 3b9aabd5ac0..6752f0499c3 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: pt-BR\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal-js.pot\n" -"X-Crowdin-File-ID: 72894\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal-js.pot\n" +"X-Crowdin-File-ID: 60594\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po index 9a299f73d69..84a53e79451 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-28 14:29+0000\n" +"POT-Creation-Date: 2024-04-01 14:34+0000\n" "PO-Revision-Date: 2024-01-01 00:00\n" "Last-Translator: \n" "Language-Team: Spanish\n" @@ -14,8 +14,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: es-ES\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal.po\n" -"X-Crowdin-File-ID: 72886\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal.po\n" +"X-Crowdin-File-ID: 60581\n" msgid "%attribute% file format is not allowed. Only %file_formats% files are allowed." msgstr "%attribute% formato de archivo no permitido. Sólo se permiten archivos %file_formats%." diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po index 51b350b3b6e..434ab7111c8 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-28 14:29+0000\n" +"POT-Creation-Date: 2024-04-01 14:34+0000\n" "PO-Revision-Date: 2024-01-01 00:00\n" "Last-Translator: \n" "Language-Team: French\n" @@ -14,8 +14,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: fr\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal.po\n" -"X-Crowdin-File-ID: 72886\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal.po\n" +"X-Crowdin-File-ID: 60581\n" msgid "%attribute% file format is not allowed. Only %file_formats% files are allowed." msgstr "le format de fichier %attribute% n'est pas autorisé. Utiliser les fichiers de format %file_formats%." diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po index c20e469431e..849a9dfffe4 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-28 14:29+0000\n" +"POT-Creation-Date: 2024-04-01 14:34+0000\n" "PO-Revision-Date: 2024-01-01 00:00\n" "Last-Translator: \n" "Language-Team: Japanese\n" @@ -14,8 +14,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: ja\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal.po\n" -"X-Crowdin-File-ID: 72886\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal.po\n" +"X-Crowdin-File-ID: 60581\n" msgid "%attribute% file format is not allowed. Only %file_formats% files are allowed." msgstr "%attribute% ファイルの形式は許可されていません。%file_formats%のファイルのみが許可されます。" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po index 315e735c4e2..36e35621d88 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-28 14:29+0000\n" +"POT-Creation-Date: 2024-04-01 14:34+0000\n" "PO-Revision-Date: 2024-01-01 00:00\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" @@ -14,8 +14,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: pt-BR\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/portal/portal.po\n" -"X-Crowdin-File-ID: 72886\n" +"X-Crowdin-File: /dev/bonita-web/portal/portal.po\n" +"X-Crowdin-File-ID: 60581\n" msgid "%attribute% file format is not allowed. Only %file_formats% files are allowed." msgstr "formato de arquivo %attribute% não é permitido. Apenas arquivos %file_formats% são permitidos." diff --git a/bpm/bonita-web-server/src/main/resources/i18n/resources_es.po b/bpm/bonita-web-server/src/main/resources/i18n/resources_es.po index 6e232ac5c5e..ced556c456b 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/resources_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/resources_es.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: es-ES\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/distrib/resources.pot\n" -"X-Crowdin-File-ID: 72900\n" +"X-Crowdin-File: /dev/bonita-web/distrib/resources.pot\n" +"X-Crowdin-File-ID: 61547\n" "Language-Team: Spanish\n" "Language: es_ES\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/resources_fr.po b/bpm/bonita-web-server/src/main/resources/i18n/resources_fr.po index c36238ec8e6..cf52157c458 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/resources_fr.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/resources_fr.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: fr\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/distrib/resources.pot\n" -"X-Crowdin-File-ID: 72900\n" +"X-Crowdin-File: /dev/bonita-web/distrib/resources.pot\n" +"X-Crowdin-File-ID: 61547\n" "Language-Team: French\n" "Language: fr_FR\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/resources_ja.po b/bpm/bonita-web-server/src/main/resources/i18n/resources_ja.po index 70465ad7682..31f5200e0d0 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/resources_ja.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/resources_ja.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: ja\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/distrib/resources.pot\n" -"X-Crowdin-File-ID: 72900\n" +"X-Crowdin-File: /dev/bonita-web/distrib/resources.pot\n" +"X-Crowdin-File-ID: 61547\n" "Language-Team: Japanese\n" "Language: ja_JP\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/resources_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/resources_pt_BR.po index 651a4fc9921..939d70942e5 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/resources_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/resources_pt_BR.po @@ -7,8 +7,8 @@ msgstr "" "X-Crowdin-Project: bonita\n" "X-Crowdin-Project-ID: 13316\n" "X-Crowdin-Language: pt-BR\n" -"X-Crowdin-File: /release-10.2.0/bonita-web/distrib/resources.pot\n" -"X-Crowdin-File-ID: 72900\n" +"X-Crowdin-File: /dev/bonita-web/distrib/resources.pot\n" +"X-Crowdin-File-ID: 61547\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" "PO-Revision-Date: 2024-01-01 00:00\n" diff --git a/gradle.properties b/gradle.properties index f8eab8c3857..9fb2b9db304 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ org.gradle.jvmargs=--add-opens java.base/java.util=ALL-UNNAMED --add-opens java. org.gradle.caching=true org.gradle.vfs.watch=true -version=10.2-SNAPSHOT -brandingVersion=2024.3-SNAPSHOT +version=10.3-SNAPSHOT +brandingVersion=2025.1-SNAPSHOT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3bc291388c3..382affb2cfa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,17 +1,17 @@ [versions] # The groovy version must be in synch with the bonita-project-parent POM (bonita-project repository): -groovyVersion = "3.0.21" +groovyVersion = "3.0.22" springVersion = "5.3.37" springSessionVersion = "2.7.4" springBootVersion = "2.7.18" commonsLangVersion = "3.14.0" -junit5Version = "5.10.2" +junit5Version = "5.10.3" bonitaArtifactsModelVersion = "1.1.1" commonsIOVersion = "2.16.1" commonsFileUploadVersion = "1.5" commonsBeanutilsVersion = "1.9.4" commonsCollectionsVersion = "4.4" -tomcatDbcpVersion = "9.0.89" +tomcatVersion = "9.0.91" commonsCLIVersion = "1.8.0" semver4jVersion = '3.1.0' slf4jVersion = "1.7.36" @@ -21,7 +21,7 @@ hibernateVersion = "5.4.33" javassistVersion = "3.27.0-GA" # javax.persistence-api is used by hibernate: javaxPersistenceApiVersion = "2.2" -jacksonBomVersion = "2.17.1" +jacksonBomVersion = "2.17.2" jakartaTransactionVersion = "1.3.3" jakartaServletVersion = "4.0.4" # Keep this until all client projects have migrated to jakarta or it will break their builds ! @@ -34,18 +34,18 @@ jakartaActivationVersion = "1.2.2" quartzVersion = "2.3.2" micrometerVersion = "1.13.1" # DB drivers: -mysqlVersion = "8.2.0" -msSqlServerVersion = "8.4.1.jre8" -oracleVersion = "19.3.0.0" -postgresqlVersion = "42.4.4" +mysqlVersion = "8.4.0" +msSqlServerVersion = "9.4.1.jre11" +oracleVersion = "19.23.0.0" +postgresqlVersion = "42.7.3" narayanaVersion = "5.10.6.Final" logbackVersion = "1.2.13" -jaxbVersion = "2.3.1" +jaxbVersion = "2.3.9" javaxAnnotationsVersion = "1.3.2" hazelcastVersion = "5.4.0" # Also update http://www.hazelcast.com/schema/config/hazelcast-config-.xsd if needed -jcacheVersion = "1.0.0" -guavaVersion = "32.1.2-jre" +jcacheVersion = "1.1.1" +guavaVersion = "33.2.1-jre" antlr4RuntimeVersion = "4.7.2" [libraries] @@ -103,7 +103,7 @@ commonsIO = { group = "commons-io", name = "commons-io", version.ref = "commonsI commonsFileUpload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commonsFileUploadVersion" } commonsBeanUtils = { group = "commons-beanutils", name = "commons-beanutils", version.ref = "commonsBeanutilsVersion" } commonsCollections = { group = "org.apache.commons", name = "commons-collections4", version.ref = "commonsCollectionsVersion" } -tomcatDbcp = { group = "org.apache.tomcat", name = "tomcat-dbcp", version.ref = "tomcatDbcpVersion" } +tomcatDbcp = { group = "org.apache.tomcat", name = "tomcat-dbcp", version.ref = "tomcatVersion" } commonsCLI = { group = "commons-cli", name = "commons-cli", version.ref = "commonsCLIVersion" } semver4j = { group = "com.vdurmont", name = "semver4j", version.ref = "semver4jVersion" } slf4jApi = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4jVersion" } @@ -146,7 +146,7 @@ msSqlServer = { group = "com.microsoft.sqlserver", name = "mssql-jdbc", version. oracle = { group = "com.oracle.database.jdbc", name = "ojdbc8", version.ref = "oracleVersion" } postgresql = { group = "org.postgresql", name = "postgresql", version.ref = "postgresqlVersion" } -lombok = "org.projectlombok:lombok:1.18.32" +lombok = "org.projectlombok:lombok:1.18.34" logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logbackVersion" }