From c75b9b0436f0fd34b2755d729be6a1753cfbb659 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Mon, 8 Jan 2024 17:56:21 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Mettre=20=C3=A0=20jour=20les=20versions=20d?=
=?UTF-8?q?es=20d=C3=A9pendances.=20Ajout=20CI.=20V0.2.=20refs=20agroclim/?=
=?UTF-8?q?agrometinfo/AgroMetInfo=5F2.0#69?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 106 +++++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 26 ++++++------
2 files changed, 119 insertions(+), 13 deletions(-)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..61f1303
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,106 @@
+variables:
+ MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
+
+image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest
+
+stages:
+ - build
+ - test
+ - code-check
+ - package
+ - deploy
+
+cache:
+ paths:
+ - .m2/repository
+
+build_job:
+ stage: build
+ script:
+ - echo "Maven compile started"
+ - mvn clean compile test-compile
+ - ls -lha /usr/bin/tokei
+ - /usr/bin/tokei --version
+ artifacts:
+ paths:
+ - target
+
+test_job:
+ stage: test
+ needs: ["build_job"]
+ script:
+ - echo "Maven test started"
+ - mvn test
+ artifacts:
+ when: always
+ paths:
+ - target
+ reports:
+ junit:
+ - target/surefire-reports/TEST-*.xml
+ - target/failsafe-reports/TEST-*.xml
+
+checkstyle_job:
+ stage: code-check
+ needs: ["build_job"]
+ script:
+ - mvn checkstyle:checkstyle
+ artifacts:
+ paths:
+ - target
+
+pmd_job:
+ stage: code-check
+ needs: ["build_job"]
+ script:
+ - mvn pmd:pmd
+ artifacts:
+ paths:
+ - target
+
+cpd_job:
+ stage: code-check
+ needs: ["build_job"]
+ script:
+ - mvn pmd:cpd
+ artifacts:
+ paths:
+ - target
+
+cobertura_job:
+ stage: deploy
+ needs: ["test_job"]
+ script:
+ # convert report from jacoco to cobertura, using relative project path
+ - python /opt/cover2cover.py target/site/jacoco/jacoco.xml $CI_PROJECT_DIR/src/main/java/ > target/cobertura.xml
+ artifacts:
+ paths:
+ - target
+
+package_job:
+ stage: package
+ script:
+ - echo "Maven packaging started"
+ - mvn package -DskipTests
+ artifacts:
+ paths:
+ - target
+
+deploy_job:
+ stage: deploy
+ only:
+ - main
+ script:
+ - echo "Maven deploy started"
+
+pages:
+ stage: deploy
+ needs: ["package_job"]
+ script:
+ - mvn site -DskipTests
+ artifacts:
+ paths:
+ - target/site
+ publish: target/site
+ only:
+ - tags
diff --git a/pom.xml b/pom.xml
index 6fd283e..98cc598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.agrometinfo</groupId>
<artifactId>season-handler</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.2</version>
<packaging>jar</packaging>
<name>AgroMetInfo SEASON handler</name>
<description>SEASON handler for AgroMetInfo</description>
@@ -36,12 +36,12 @@
</ciManagement>
<properties>
<!-- Dependencies versions -->
- <hibernate.version>5.6.11.Final</hibernate.version>
- <junit.version>5.10.0</junit.version>
- <log4j.version>2.20.0</log4j.version>
- <lombok.version>1.18.28</lombok.version>
+ <hibernate.version>5.6.15.Final</hibernate.version>
+ <junit.version>5.10.1</junit.version>
+ <log4j.version>2.22.0</log4j.version>
+ <lombok.version>1.18.30</lombok.version>
<picoli.version>4.7.4</picoli.version>
- <season.version>1.2.3</season.version>
+ <season.version>1.2.4</season.version>
<!-- Maven environment values -->
<build.date>${maven.build.timestamp}</build.date>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
@@ -57,15 +57,15 @@
<checkstyle.includeResources>false</checkstyle.includeResources>
<checkstyle.includeTestResources>false</checkstyle.includeTestResources>
<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
- <checkstyle.version>3.3.0</checkstyle.version>
+ <checkstyle.version>3.3.1</checkstyle.version>
<jacoco.version>0.8.10</jacoco.version>
<compiler-plugin.version>3.11.0</compiler-plugin.version>
- <javadoc.version>3.5.0</javadoc.version>
+ <javadoc.version>3.6.2</javadoc.version>
<javase.api.link>https://docs.oracle.com/en/java/javase/17/docs/api/</javase.api.link>
<exec.mainClass>fr.agrometinfo.seasonhandler.Main</exec.mainClass>
<pmd.version>3.21.0</pmd.version>
<sloccount.path>bin/sloccount.sh</sloccount.path>
- <spotbugs.version>4.7.0.0</spotbugs.version>
+ <spotbugs.version>4.8.1.0</spotbugs.version>
<!-- Text format -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -182,7 +182,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.2</version>
</plugin>
<!-- Compute buildNumber -->
@@ -232,7 +232,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -471,7 +471,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.4.3</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -518,7 +518,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
GitLab
From acf0cd0fc3bceda06ded3655e0bc7b5f4a7e546b Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Mon, 8 Jan 2024 17:58:32 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Enlever=20CI=20tant=20que=20SEASON=20n'est?=
=?UTF-8?q?=20pas=20dans=20le=20d=C3=A9p=C3=B4t=20de=20la=20forge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 106 -------------------------------------------------
1 file changed, 106 deletions(-)
delete mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 61f1303..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-variables:
- MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
-
-image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest
-
-stages:
- - build
- - test
- - code-check
- - package
- - deploy
-
-cache:
- paths:
- - .m2/repository
-
-build_job:
- stage: build
- script:
- - echo "Maven compile started"
- - mvn clean compile test-compile
- - ls -lha /usr/bin/tokei
- - /usr/bin/tokei --version
- artifacts:
- paths:
- - target
-
-test_job:
- stage: test
- needs: ["build_job"]
- script:
- - echo "Maven test started"
- - mvn test
- artifacts:
- when: always
- paths:
- - target
- reports:
- junit:
- - target/surefire-reports/TEST-*.xml
- - target/failsafe-reports/TEST-*.xml
-
-checkstyle_job:
- stage: code-check
- needs: ["build_job"]
- script:
- - mvn checkstyle:checkstyle
- artifacts:
- paths:
- - target
-
-pmd_job:
- stage: code-check
- needs: ["build_job"]
- script:
- - mvn pmd:pmd
- artifacts:
- paths:
- - target
-
-cpd_job:
- stage: code-check
- needs: ["build_job"]
- script:
- - mvn pmd:cpd
- artifacts:
- paths:
- - target
-
-cobertura_job:
- stage: deploy
- needs: ["test_job"]
- script:
- # convert report from jacoco to cobertura, using relative project path
- - python /opt/cover2cover.py target/site/jacoco/jacoco.xml $CI_PROJECT_DIR/src/main/java/ > target/cobertura.xml
- artifacts:
- paths:
- - target
-
-package_job:
- stage: package
- script:
- - echo "Maven packaging started"
- - mvn package -DskipTests
- artifacts:
- paths:
- - target
-
-deploy_job:
- stage: deploy
- only:
- - main
- script:
- - echo "Maven deploy started"
-
-pages:
- stage: deploy
- needs: ["package_job"]
- script:
- - mvn site -DskipTests
- artifacts:
- paths:
- - target/site
- publish: target/site
- only:
- - tags
--
GitLab