From 19b0491e70fd62e1076a235f43210909ddff0c90 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 11 Jan 2024 18:23:56 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Huiti=C3=A8me=20jet=20CI/CD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 34 +++++++---------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07f85ba..cb0daa5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ stages:
 cache:
   paths:
     - .m2/repository
+    - target
 
 build_job:
   stage: build
@@ -21,12 +22,6 @@ build_job:
     - mvn clean compile test-compile
     - ls -lha /usr/bin/tokei
     - /usr/bin/tokei --version
-  artifacts:
-    paths:
-      - target
-      - sava-core/target
-      - sava-core-jarkarta/target
-      - sava-example/jarkarta/target
 
 test_job:
   stage: test
@@ -52,36 +47,24 @@ install_job:
   script:
     - echo "Maven packaging started"
     - mvn install -DskipTests
-  artifacts:
-    paths:
-      - target
-      - sava-core/target
-      - sava-core-jarkarta/target
-      - sava-example/jarkarta/target
+
+checkstyle_job:
+  stage: code-check
+  needs: ["install_job"]
+  script:
+    - mvn checkstyle:checkstyle
 
 pmd_job:
   stage: code-check
   needs: ["install_job"]
   script:
     - mvn pmd:pmd
-  artifacts:
-    paths:
-      - target
-      - sava-core/target
-      - sava-core-jarkarta/target
-      - sava-example/jarkarta/target
 
 cpd_job:
   stage: code-check
   needs: ["install_job"]
   script:
     - mvn pmd:cpd
-  artifacts:
-    paths:
-      - target
-      - sava-core/target
-      - sava-core-jarkarta/target
-      - sava-example/jarkarta/target
 
 cobertura_job:
   stage: deploy
@@ -96,9 +79,6 @@ cobertura_job:
       $CI_PROJECT_DIR/sava-core-jakarta/src/main/java/
       $CI_PROJECT_DIR/sava-example/src/main/java/
       > target/cobertura.xml
-  artifacts:
-    paths:
-      - target
 
 deploy_job:
   stage: deploy
-- 
GitLab


From 7b777c3921252e7f4885e64b87f8e58a40a46bf0 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 11 Jan 2024 18:29:04 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Neuvi=C3=A8me=20jet=20CI/CD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb0daa5..0a136da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,9 @@ cache:
   paths:
     - .m2/repository
     - target
+    - sava-core/target
+    - sava-core-jarkarta/target
+    - sava-example/jarkarta/target
 
 build_job:
   stage: build
-- 
GitLab


From 4a003bff5948e08d52e33c14535e2e3a26a90fa7 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 11 Jan 2024 18:39:01 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Dixi=C3=A8me=20jet=20CI/CD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml |  2 +-
 pom.xml        | 37 +++++++++++++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a136da..406e89f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,7 +89,7 @@ deploy_job:
     - main
   script:
     - echo "Maven deploy started"
-    - mvn -s .gitlab/settings.xml deploy --projects sava-core sava-core-jakarta
+    - mvn -s .gitlab/settings.xml -Pgitlab-ci deploy --projects .,sava-core,sava-core-jakarta
 
 # https://agroclim.pages.mia.inra.fr/sava/
 pages:
diff --git a/pom.xml b/pom.xml
index 0c07461..b296a16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,22 +92,27 @@
 		<metadata.long-description xml:lang="fr"><![CDATA[SAVA est une bibliothèque Java développée dans l'unité INRAE AgroClim pour le suivi de ses applications en utilisant le format Prometheus.]]></metadata.long-description>
 	</properties>
 
-  <repositories>
-    <repository>
-      <id>gitlab-maven</id>
-      <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
-    </repository>
-  </repositories>
-  <distributionManagement>
-    <repository>
-      <id>gitlab-maven</id>
-      <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
-    </repository>
-    <snapshotRepository>
-      <id>gitlab-maven</id>
-      <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
-    </snapshotRepository>
-  </distributionManagement>
+  <profiles>
+    <profile>
+      <id>gitlab-ci</id>
+        <repositories>
+          <repository>
+            <id>gitlab-maven</id>
+            <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
+          </repository>
+        </repositories>
+        <distributionManagement>
+          <repository>
+            <id>gitlab-maven</id>
+            <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
+          </repository>
+          <snapshotRepository>
+            <id>gitlab-maven</id>
+            <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
+          </snapshotRepository>
+        </distributionManagement>
+    </profile>
+  </profiles>
 
 	<dependencyManagement>
 		<dependencies>
-- 
GitLab