From 6327408a31898f0fd616369bcbfae07ba9a9f3c9 Mon Sep 17 00:00:00 2001
From: Romuald Lemesle <romuald.lemesle@filigran.io>
Date: Tue, 5 Dec 2023 10:18:22 +0100
Subject: [PATCH] rebase

---
 .circleci/config.yml                          | 36 -------------------
 openex-api/pom.xml                            | 18 +++-------
 .../rest/security/SecurityExpression.java     |  1 -
 .../src/test/resources/application.properties |  3 +-
 openex-injectors                              |  2 +-
 openex-model/pom.xml                          |  7 ----
 6 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cca56ec664..cf3b2b035f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -273,41 +273,6 @@ workflows:
             branches:
               only:
                 - master
-      - deploy_demo:
-          requires:
-            - build_platform
-          filters:
-            branches:
-              only:
-                - master
-      - deploy_reference:
-          requires:
-            - build_platform
-          filters:
-            branches:
-              only:
-                - master
-      - deploy_lab:
-          requires:
-            - build_platform
-          filters:
-            branches:
-              only:
-                - master
-      - deploy_testing:
-          requires:
-            - build_platform
-          filters:
-            branches:
-              only:
-                - master
-      - deploy_production:
-          requires:
-            - build_platform
-          filters:
-            branches:
-              only:
-                - master
       - docker_build_platform_rolling:
           requires:
             - build_frontend
@@ -339,4 +304,3 @@ workflows:
               only: /[0-9]+(\.[0-9]+)+(\.[0-9]+)*/
             branches:
               ignore: /.*/
-
diff --git a/openex-api/pom.xml b/openex-api/pom.xml
index 0d6acdac20..cfe23bfd4f 100644
--- a/openex-api/pom.xml
+++ b/openex-api/pom.xml
@@ -55,6 +55,11 @@
                     <artifactId>openex-injector-ssh</artifactId>
                     <version>3.4.2-SNAPSHOT</version>
                 </dependency>
+                <dependency>
+                    <groupId>io.openex</groupId>
+                    <artifactId>openex-collector-users</artifactId>
+                    <version>3.4.2-SNAPSHOT</version>
+                </dependency>
             </dependencies>
         </profile>
     </profiles>
@@ -218,19 +223,6 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/openex-api/src/main/java/io/openex/rest/security/SecurityExpression.java b/openex-api/src/main/java/io/openex/rest/security/SecurityExpression.java
index aea940cc6b..b8e528a69e 100644
--- a/openex-api/src/main/java/io/openex/rest/security/SecurityExpression.java
+++ b/openex-api/src/main/java/io/openex/rest/security/SecurityExpression.java
@@ -133,4 +133,3 @@ public Object getThis() {
   }
   // endregion
 }
-
diff --git a/openex-api/src/test/resources/application.properties b/openex-api/src/test/resources/application.properties
index 40060e075d..f66e84d8d0 100644
--- a/openex-api/src/test/resources/application.properties
+++ b/openex-api/src/test/resources/application.properties
@@ -34,7 +34,7 @@ spring.quartz.properties.org.quartz.threadPool.threadCount=1
 spring.data.rest.basePath=/api
 
 # Database Properties
-spring.datasource.url = jdbc:h2:mem:test;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url = jdbc:h2:mem:test
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.H2Dialect
 spring.flyway.enabled=false
 
@@ -84,4 +84,3 @@ openex.mail.imap.ssl.trust=*
 openex.mail.imap.ssl.enable=true
 openex.mail.imap.auth=true
 openex.mail.imap.starttls.enable=true
-
diff --git a/openex-injectors b/openex-injectors
index ce6185c3af..1f2018a000 160000
--- a/openex-injectors
+++ b/openex-injectors
@@ -1 +1 @@
-Subproject commit ce6185c3af651308b40dd68ac0768021080df3cc
+Subproject commit 1f2018a000f4e728879d6af91a5f9d3c8c04071b
diff --git a/openex-model/pom.xml b/openex-model/pom.xml
index 4286ac3d48..8aed23305b 100644
--- a/openex-model/pom.xml
+++ b/openex-model/pom.xml
@@ -15,7 +15,6 @@
 
     <properties>
         <commons-validator.version>1.7</commons-validator.version>
-        <lombok.version>1.18.26</lombok.version>
     </properties>
 
     <dependencies>
@@ -62,11 +61,5 @@
             <artifactId>commons-validator</artifactId>
             <version>${commons-validator.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>