From 4f1e97c58e2d4345a15903cf51091b9fc5f2b1ba Mon Sep 17 00:00:00 2001
From: lhameury <lukas.hameury@libriciel.coop>
Date: Fri, 26 May 2023 16:58:08 +0200
Subject: [PATCH] Prepare 4.7.16
---
docker-compose.yml | 9 +++++----
iparapheur-amp/pom.xml | 8 ++++----
iparapheur-core/pom.xml | 6 +++---
.../parapheur/repo/impl/ParapheurServiceImpl.java | 11 +----------
.../parapheur/core/parapheur-version.properties | 4 ++--
iparapheur-mobile-webscripts/pom.xml | 4 ++--
iparapheur-rules/pom.xml | 4 ++--
pom.xml | 2 +-
8 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index f091a8f..127a55d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,10 +96,11 @@ services:
- ./conf/iParapheur-mysql.cnf:/etc/mysql/conf.d/iParapheur-mysql.cnf
pes-viewer:
- image: registry.libriciel.fr:443/public/signature/pes-viewer:1.5.1
+ image: registry.libriciel.fr:443/public/signature/pes-viewer:2.0.5
restart: unless-stopped
mem_limit: 1536M
environment:
+ - SERVER_SERVLET_CONTEXT_PATH=/bl-xemwebviewer
- MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE=health
- SERVER_FORWARD_HEADERS_STRATEGY=FRAMEWORK
volumes:
@@ -108,7 +109,7 @@ services:
- ./data/xwv-shared:/var/tmp/bl-xemwebviewer/xwv-shared
crypto:
- image: registry.libriciel.fr:443/public/signature/crypto:3.0.1
+ image: registry.libriciel.fr:443/public/signature/crypto:3.0.5
restart: unless-stopped
mem_limit: 1G
environment:
@@ -118,14 +119,14 @@ services:
- '127.0.0.1:8004:8080'
pdf-stamp:
- image: registry.libriciel.fr/public/signature/pdf-stamp:2.5.3
+ image: registry.libriciel.fr/public/signature/pdf-stamp:2.6.0
restart: unless-stopped
mem_limit: 512M
environment:
- MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE=health
pastell-connector:
- image: registry.libriciel.fr/public/signature/pastell-connector:1.3.5
+ image: registry.libriciel.fr/public/signature/pastell-connector:1.3.8
restart: unless-stopped
mem_limit: 512M
environment:
diff --git a/iparapheur-amp/pom.xml b/iparapheur-amp/pom.xml
index e5c97a4..652de40 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.15</version>
+ <version>4.7.16</version>
</parent>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-amp</artifactId>
<description>Parapheur electronique</description>
<packaging>war</packaging>
- <version>4.7.15-for-Alf3.4.c</version>
+ <version>4.7.16-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.15</version>
+ <version>4.7.16</version>
</dependency>
<dependency>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-mobile-webscripts</artifactId>
- <version>4.7.15</version>
+ <version>4.7.16</version>
</dependency>
<dependency>
diff --git a/iparapheur-core/pom.xml b/iparapheur-core/pom.xml
index 6500831..7b88f0f 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.15</version>
+ <version>4.7.16</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.15</version>
+ <version>4.7.16</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.15</version>
+ <version>4.7.16</version>
<!-- exclusions>
<exclusion>
<artifactId>asm</artifactId>
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 6b3d287..8b5b3bc 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
@@ -3854,7 +3854,6 @@ public final class ParapheurServiceImpl implements ParapheurService, Initializin
* Assemblage des PDFs en un seul, apposition des calques d'impression
*/
if (!tmpFiles.isEmpty()) {
- File tmpMerged = TempFileProvider.createTempFile("tmpconvfinal", ".pdf");
File archive = TempFileProvider.createTempFile("tmpconvfinal", ".pdf");
String firstPagePath = tmpFiles.get(0).getAbsolutePath();
@@ -3863,19 +3862,11 @@ public final class ParapheurServiceImpl implements ParapheurService, Initializin
for(int i = 1; i < tmpFiles.size(); i++) {
allpaths.add(tmpFiles.get(i).getAbsolutePath());
}
- boolean result = utils.merge(firstPagePath, tmpMerged.getAbsolutePath(), allpaths);
+ boolean result = utils.merge(firstPagePath, archive.getAbsolutePath(), allpaths);
if(!result) {
throw new RuntimeException("Erreur lors de la fusion des documents. Fonction Merge");
- } else {
- result = utils.unlock(tmpMerged.getAbsolutePath(), archive.getAbsolutePath());
- if (!result) {
- throw new RuntimeException("Erreur lors de la fusion des documents. Fonction Unlock");
- }
}
- // Delete tmp file
- tmpMerged.delete();
-
return archive;
}
return null;
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 60983f2..7f8981d 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.15
-ph_build=20230106
+ph_version=4.7.16
+ph_build=20230526
diff --git a/iparapheur-mobile-webscripts/pom.xml b/iparapheur-mobile-webscripts/pom.xml
index 63a7f37..83891ff 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.15</version>
+ <version>4.7.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.adullact.iparapheur</groupId>
<artifactId>iparapheur-core</artifactId>
- <version>4.7.15</version>
+ <version>4.7.16</version>
<scope>provided</scope>
</dependency>
diff --git a/iparapheur-rules/pom.xml b/iparapheur-rules/pom.xml
index b4ebed2..cc44b7c 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.15</version>
+ <version>4.7.16</version>
</parent>
<artifactId>iparapheur-rules</artifactId>
- <version>4.7.15</version>
+ <version>4.7.16</version>
<name>iparapheur-rules</name>
<url>http://maven.apache.org</url>
<properties>
diff --git a/pom.xml b/pom.xml
index e451eac..f30baab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<artifactId>iparapheur</artifactId>
<packaging>pom</packaging>
<name>iparapheur</name>
- <version>4.7.15</version>
+ <version>4.7.16</version>
<description>Parapheur electronique</description>
<url>https://adullact.net/projects/paraphelec/</url>
--
GitLab