From dc768cd32502d6f4d72d82798ad505afbaad3240 Mon Sep 17 00:00:00 2001
From: Github Action <github-action@noreply>
Date: Thu, 27 Jun 2024 06:03:59 +0000
Subject: [PATCH 1/2] Version 2.0.26-SNAPSHOT [skip ci]

---
 batch/pom.xml | 2 +-
 core/pom.xml  | 2 +-
 pom.xml       | 2 +-
 web/pom.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/batch/pom.xml b/batch/pom.xml
index 1fac4fd..1b2e3d7 100644
--- a/batch/pom.xml
+++ b/batch/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>fr.abes.cidemis</groupId>
 		<artifactId>cidemisbackoffice</artifactId>
-		<version>2.0.25</version>
+		<version>2.0.26-SNAPSHOT</version>
 	</parent>
 	<artifactId>batch</artifactId>
 	<packaging>jar</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index 2b1547d..89d7ad6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fr.abes.cidemis</groupId>
         <artifactId>cidemisbackoffice</artifactId>
-        <version>2.0.25</version>
+        <version>2.0.26-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>core</artifactId>
diff --git a/pom.xml b/pom.xml
index a674231..f7e30a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.abes.cidemis</groupId>
     <artifactId>cidemisbackoffice</artifactId>
-    <version>2.0.25</version>
+    <version>2.0.26-SNAPSHOT</version>
     <modules>
         <module>core</module>
         <module>web</module>
diff --git a/web/pom.xml b/web/pom.xml
index 4c80dcb..168ebf8 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fr.abes.cidemis</groupId>
         <artifactId>cidemisbackoffice</artifactId>
-        <version>2.0.25</version>
+        <version>2.0.26-SNAPSHOT</version>
     </parent>
     <artifactId>web</artifactId>
     <packaging>war</packaging>

From e1667c6105cb268bc3148e98ce9028603c42b240 Mon Sep 17 00:00:00 2001
From: pierre-maraval <pierre.maraval@gmail.com>
Date: Mon, 1 Jul 2024 09:13:26 +0200
Subject: [PATCH 2/2] FIX : ajout installation pgrep dans dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index f34f097..6db35e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,6 +45,7 @@ WORKDIR /scripts/
 # systeme pour les crontab
 # cronie: remplacant de crond qui support le CTRL+C dans docker (sans ce système c'est compliqué de stopper le conteneur)
 # gettext: pour avoir envsubst qui permet de gérer le template tasks.tmpl
+RUN yum install -y procps
 RUN dnf install -y cronie gettext && \
     crond -V && rm -rf /etc/cron.*/*
 COPY ./docker/batch/tasks.tmpl /etc/cron.d/tasks.tmpl