From 21038d8d56e7f5f437ca52c231d321f2c0fa9d49 Mon Sep 17 00:00:00 2001
From: lhameury <43-lhameury@users.noreply.gitlab.libriciel.fr>
Date: Fri, 21 Mar 2025 14:11:12 +0100
Subject: [PATCH] Prepare 4.7.26-rc.2
---
iparapheur-amp/pom.xml | 8 ++++----
iparapheur-core/pom.xml | 6 +++---
.../atolcd/parapheur/repo/impl/DossierServiceImpl.java | 7 +------
.../parapheur/repo/impl/ParapheurServiceImpl.java | 1 -
.../repo/jscript/DossierServiceScriptable.java | 10 +++-------
.../module/parapheur/core/parapheur-version.properties | 2 +-
iparapheur-mobile-webscripts/pom.xml | 4 ++--
iparapheur-rules/pom.xml | 4 ++--
pom.xml | 2 +-
9 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/iparapheur-amp/pom.xml b/iparapheur-amp/pom.xml
index f3c3d1d..e173295 100644
--- a/iparapheur-amp/pom.xml
+++ b/iparapheur-amp/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
</parent>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-amp</artifactId>
<description>Parapheur electronique</description>
<packaging>war</packaging>
- <version>4.7.26-rc.1-for-Alf3.4.c</version>
+ <version>4.7.26-rc.2-for-Alf3.4.c</version>
<name>i-Parapheur AMP packaging</name>
<url>http://maven.apache.org</url>
<properties>
@@ -65,13 +65,13 @@
<dependency>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-core</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
</dependency>
<dependency>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-mobile-webscripts</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
</dependency>
<dependency>
diff --git a/iparapheur-core/pom.xml b/iparapheur-core/pom.xml
index aa2eea1..ca885a8 100644
--- a/iparapheur-core/pom.xml
+++ b/iparapheur-core/pom.xml
@@ -5,14 +5,14 @@
<parent>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-core</artifactId>
<packaging>jar</packaging>
<name>iparapheur core module</name>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
<description>Parapheur electronique</description>
<!-- General Info -->
<url>https://adullact.net/projects/paraphelec/</url>
@@ -294,7 +294,7 @@
<dependency>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-rules</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
<!-- exclusions>
<exclusion>
<artifactId>asm</artifactId>
diff --git a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/DossierServiceImpl.java b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/DossierServiceImpl.java
index ce458e9..3f85589 100644
--- a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/DossierServiceImpl.java
+++ b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/DossierServiceImpl.java
@@ -2216,14 +2216,9 @@ public class DossierServiceImpl implements DossierService {
String setDossierPropertiesWithAuditTrail(@NotNull NodeRef dossierRef, @Nullable NodeRef parapheur,
@NotNull Map<QName, Serializable> properties, boolean onlyAudit) {
+ properties.put(ParapheurModel.PROP_FULL_CREATED, true);
String result = null;
- transactionService.getRetryingTransactionHelper().doInTransaction(() -> {
- properties.put(ParapheurModel.PROP_FULL_CREATED, true);
- nodeService.setProperty(dossierRef, ParapheurModel.PROP_FULL_CREATED, true);
- return null;
- });
-
if (!onlyAudit) {
Map<String, Serializable> propertiesString = new HashMap<String, Serializable>();
for (Map.Entry<QName, Serializable> entry : properties.entrySet()) {
diff --git a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java
index a7be583..b2d49a8 100755
--- a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java
+++ b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java
@@ -178,7 +178,6 @@ public final class ParapheurServiceImpl implements ParapheurService, Initializin
private static Logger loggerTRACE = Logger.getLogger("TRACE." + ParapheurService.class.getName()); // BLEX
private static Runtime rt = Runtime.getRuntime();
@Autowired
- @Qualifier("NodeService")
private NodeService nodeService;
@Autowired
private CopyService copyService;
diff --git a/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/jscript/DossierServiceScriptable.java b/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/jscript/DossierServiceScriptable.java
index a116aac..508b379 100644
--- a/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/jscript/DossierServiceScriptable.java
+++ b/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/jscript/DossierServiceScriptable.java
@@ -141,13 +141,9 @@ public class DossierServiceScriptable extends BaseProcessorExtension {
public String beginCreateDossier(String bureauRefStr) {
String retVal = null;
- try {
- NodeRef dossierRef = dossierService.beginCreateDossier(new NodeRef("workspace://SpacesStore/" + bureauRefStr));
- if (dossierRef != null) {
- retVal = dossierRef.getId();
- }
- } catch(Exception e) {
- e.printStackTrace();
+ NodeRef dossierRef = dossierService.beginCreateDossier(new NodeRef("workspace://SpacesStore/" + bureauRefStr));
+ if (dossierRef != null) {
+ retVal = dossierRef.getId();
}
return retVal;
}
diff --git a/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties b/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties
index 7940c8f..cef2a6c 100755
--- a/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties
+++ b/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties
@@ -1,2 +1,2 @@
-ph_version=4.7.26-rc.1
+ph_version=4.7.25
ph_build=20250130
diff --git a/iparapheur-mobile-webscripts/pom.xml b/iparapheur-mobile-webscripts/pom.xml
index 287bb9c..d61ca12 100644
--- a/iparapheur-mobile-webscripts/pom.xml
+++ b/iparapheur-mobile-webscripts/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>iparapheur</artifactId>
<groupId>org.adullact.iparapheur</groupId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-core</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
<scope>provided</scope>
</dependency>
diff --git a/iparapheur-rules/pom.xml b/iparapheur-rules/pom.xml
index 60a6811..12a7920 100644
--- a/iparapheur-rules/pom.xml
+++ b/iparapheur-rules/pom.xml
@@ -5,10 +5,10 @@
<parent>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
</parent>
<artifactId>iparapheur-rules</artifactId>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
<name>iparapheur-rules</name>
<url>http://maven.apache.org</url>
<properties>
diff --git a/pom.xml b/pom.xml
index a458379..f7513ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<artifactId>iparapheur</artifactId>
<packaging>pom</packaging>
<name>iparapheur</name>
- <version>4.7.26-rc.1</version>
+ <version>4.7.26-rc.2</version>
<description>Parapheur electronique</description>
<url>https://adullact.net/projects/paraphelec/</url>
--
GitLab