From a7320d19001bf8df8bb440128d4b840c03ae2ef5 Mon Sep 17 00:00:00 2001
From: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Date: Thu, 14 Mar 2024 12:26:42 +0100
Subject: [PATCH] Use maven orb to build on CircleCI

---
 .circleci/config.yml                          | 56 ++++++-------------
 ...rcleci-m2-settings.xml => m2-settings.xml} |  0
 2 files changed, 16 insertions(+), 40 deletions(-)
 rename .circleci/{circleci-m2-settings.xml => m2-settings.xml} (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c309ad..114dd7c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,53 +1,27 @@
 version: 2.1
 
+orbs:
+  maven: circleci/maven@1.4.1
+
 executors:
   openjdk8:
     docker:
       - image: cimg/openjdk:8.0
 
-jobs:
-  build:
-    executor: openjdk8
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "pom.xml" }}
-          - v1-dependencies-
-
-      - run:
-          name: Build
-          command: mvn -s .circleci/circleci-m2-settings.xml clean install
-
-      - save_cache:
-          paths:
-            - ~/.m2
-          key: v1-dependencies-{{ checksum "pom.xml" }}
-  deploy:
-    executor: openjdk8
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "pom.xml" }}
-          - v1-dependencies-
-
-      - run:
-          name: Deploy
-          command: mvn -s .circleci/circleci-m2-settings.xml clean deploy -P cloudsoft-release -P sonatype-release
-
 workflows:
   build-and-deploy:
     jobs:
-      - build:
+      - maven/test:
+          name: build
+          executor: openjdk8
           filters:
             branches:
-              only: master
-      - deploy:
+              only:
+                - master
+          settings_file: .circleci/m2-settings.xml
+      - maven/test:
+          name: deploy
+          executor: openjdk8
           requires:
             - build
           context:
@@ -55,5 +29,7 @@ workflows:
             - cloudsoft-artifactory
           filters:
             branches:
-              only: master
-
+              only:
+                - master
+          settings_file: .circleci/m2-settings.xml
+          command: deploy -DskipTests -P cloudsoft-release -P sonatype-release
diff --git a/.circleci/circleci-m2-settings.xml b/.circleci/m2-settings.xml
similarity index 100%
rename from .circleci/circleci-m2-settings.xml
rename to .circleci/m2-settings.xml