From 1bf8a2e8953b01ce3f8b33d808a0a1dd49f56281 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Mon, 3 Feb 2025 11:33:24 +0100
Subject: [PATCH] chore: version 1.0.1
---
.gitignore | 2 ++
README.md | 9 +++++++--
codemeta.json | 14 +++++++-------
pom.xml | 33 +++++++++++++++++++++------------
publiccode.yml | 4 ++--
sava-core-jakarta/pom.xml | 6 ++----
sava-core/pom.xml | 6 ++----
sava-example/pom.xml | 10 +++++-----
8 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/.gitignore b/.gitignore
index 955ccfb..0c51678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
/bin/tokei
.checkstyle
.classpath
+.factorypath
jshell.history
/nb-configuration.xml
.pmd
.pmdruleset.xml
+pom.xml.versionsBackup
/.project
/.settings/
/src/main/webapp/META-INF/context.xml
diff --git a/README.md b/README.md
index b3c0a32..d6c6df3 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Suivi des Applications jaVa d'Agroclim
SAVA is a Maven project, using Java 11.
Maven modules are:
+
- `sava-core contains` all the classes to use SAVA.
- `sava-core-jakarta` contains all the classes to use SAVA on Jakarta (e.g.: Tomcat 10).
- `sava-example` shows an use case of integration in a simple application, with only the servlet exposing demo values.
@@ -26,6 +27,7 @@ To generate `sava-core-jakarta`, run `bin/update_sava-core-jakarta.sh`.
**1. Add SAVA to your project**
If you use Java EE (<= Tomcat 9), add to your dependencies in `pom.xml`:
+
```xml
<dependency>
<groupId>fr.inrae.agroclim</groupId>
@@ -35,6 +37,7 @@ If you use Java EE (<= Tomcat 9), add to your dependencies in `pom.xml`:
```
If you use Jakarta (>= Tomcat 10), add to your dependencies in `pom.xml`:
+
```xml
<dependency>
<groupId>fr.inrae.agroclim</groupId>
@@ -51,7 +54,7 @@ By default, histograms for all requests are created.
```
SavaUtils.addCounter("app_version", "Version number of the application, "", "version");
-SavaUtils.incrementCounter("app_vendor", "1.0.0");
+SavaUtils.incrementCounter("app_vendor", "1.0.1");
```
**4. Example to add information about PostgreSQL**
@@ -82,6 +85,7 @@ Add key and password for HTTP Basic Authentication of MetricsBasicAuthServlet im
With values generated by randomizer.
Eg. for AgroClim:
+
- [random_string.py](https://forgemia.inra.fr/agroclim/common/devops/-/blob/main/scripts/random_string.py?ref_type=heads) or
- [random_string.sh](https://forgemia.inra.fr/agroclim/common/devops/-/blob/main/scripts/random_string.sh?ref_type=heads)
```sh
@@ -113,4 +117,5 @@ See [`AUTHORS.md`](AUTHORS.md) file.
See [`LICENSE`](LICENSE) file.
## Project status
-Development in progress
+
+Stable
diff --git a/codemeta.json b/codemeta.json
index 51a3ccd..fc5a81d 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -10,17 +10,17 @@
"author": [
{
"@type": "Person",
- "affiliation": {
- "@id": "https://agroclim.inrae.fr/"
- },
+ "affiliation": {
+ "@id": "https://agroclim.inrae.fr/"
+ },
"familyName": "Maury",
"givenName": "Olivier"
},
{
"@type": "Person",
- "affiliation": {
- "@id": "https://agroclim.inrae.fr/"
- },
+ "affiliation": {
+ "@id": "https://agroclim.inrae.fr/"
+ },
"familyName": "Tromel",
"givenName": "Louis"
}
@@ -43,5 +43,5 @@
"Java",
"Java 11"
],
- "version": "1.0.0"
+ "version": "1.0.1"
}
diff --git a/pom.xml b/pom.xml
index ad77cc2..06c7bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.inrae.agroclim</groupId>
<artifactId>sava</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<packaging>pom</packaging>
<name>SAVA</name>
<description>Suivi des Applications jaVa d'Agroclim</description>
@@ -58,8 +58,9 @@
</ciManagement>
<properties>
<!-- Dependencies versions -->
- <log4j.version>2.22.1</log4j.version>
- <lombok.version>1.18.30</lombok.version>
+ <junit.version>5.11.4</junit.version>
+ <log4j.version>2.24.2</log4j.version>
+ <lombok.version>1.18.36</lombok.version>
<weld.version>3.1.6.Final</weld.version>
<!-- Maven environment values -->
@@ -77,9 +78,11 @@
<checkstyle.includeTestResources>false</checkstyle.includeTestResources>
<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
<!-- Fix checkstyle version to ensure sun_checks.xml matches. -->
- <checkstyle.version>3.1.1</checkstyle.version>
- <pmd.version>3.17.0</pmd.version>
- <spotbugs.version>4.7.0.0</spotbugs.version>
+ <checkstyle.version>3.6.0</checkstyle.version>
+ <jacoco.version>0.8.12</jacoco.version>
+ <pmd.version>3.26.0</pmd.version>
+ <spotbugs.version>4.8.6.6</spotbugs.version>
+ <surefire-plugin.version>3.5.2</surefire-plugin.version>
<!-- Text format -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -132,6 +135,12 @@
<scope>provided</scope>
</dependency>
+ <!-- JUnit -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -154,14 +163,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${surefire-plugin.version}</version>
</plugin>
<!-- Count lines of code. -->
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.4.0</version>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -180,7 +189,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.8</version>
+ <version>${jacoco.version}</version>
<executions>
<execution>
<id>jacoco-initialize</id>
@@ -267,14 +276,14 @@
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.1</version>
+ <version>3.21.0</version>
<configuration>
<locales>fr</locales>
</configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -341,7 +350,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.6.0</version>
</plugin>
<!-- Generates a report regarding the code style used by the developers. -->
diff --git a/publiccode.yml b/publiccode.yml
index 30c4171..1c24292 100644
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -24,9 +24,9 @@ legal:
authorsFile: AUTHORS.md
license: GNU General Public License
name: SAVA
-releaseDate: 2023-12-07
+releaseDate: 2025-02-03
softwareType: library
-softwareVersion: 1.0.0
+softwareVersion: 1.0.1
url: https://forgemia.inra.fr/agroclim/sava.git
usedBy:
- Agroclim
diff --git a/sava-core-jakarta/pom.xml b/sava-core-jakarta/pom.xml
index e9bd9da..d84d8e1 100644
--- a/sava-core-jakarta/pom.xml
+++ b/sava-core-jakarta/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.inrae.agroclim</groupId>
<artifactId>sava</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</parent>
<artifactId>sava-core-jakarta</artifactId>
<name>SAVA library for Jakarta</name>
@@ -15,7 +15,6 @@
<client_java.version>0.16.0</client_java.version>
<jaxrs.version>3.1.0</jaxrs.version>
<jersey.version>2.35</jersey.version>
- <junit.version>5.10.1</junit.version>
<servlet-api.version>5.0.0</servlet-api.version>
<checkstyle.config.location>file://${basedir}/../config/sun_checks.xml</checkstyle.config.location>
</properties>
@@ -35,7 +34,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- Lombok -->
@@ -76,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.6.2</version>
+ <version>3.11.1</version>
<configuration>
<links>
<link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
diff --git a/sava-core/pom.xml b/sava-core/pom.xml
index d1ade6c..ed55eb4 100644
--- a/sava-core/pom.xml
+++ b/sava-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.inrae.agroclim</groupId>
<artifactId>sava</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</parent>
<artifactId>sava-core</artifactId>
<name>SAVA library</name>
@@ -15,7 +15,6 @@
<client_java.version>0.16.0</client_java.version>
<jaxrs.version>3.1.0</jaxrs.version>
<jersey.version>2.35</jersey.version>
- <junit.version>5.10.1</junit.version>
<servlet-api.version>3.1.0</servlet-api.version>
<checkstyle.config.location>file://${basedir}/../config/sun_checks.xml</checkstyle.config.location>
</properties>
@@ -35,7 +34,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- Lombok -->
@@ -76,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.6.2</version>
+ <version>3.11.1</version>
<configuration>
<links>
<link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
diff --git a/sava-example/pom.xml b/sava-example/pom.xml
index c0b7ad3..5a16ddc 100644
--- a/sava-example/pom.xml
+++ b/sava-example/pom.xml
@@ -5,16 +5,16 @@
<parent>
<groupId>fr.inrae.agroclim</groupId>
<artifactId>sava</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</parent>
<artifactId>sava-example</artifactId>
<name>SAVA Example</name>
<description>SAVA libraries use case example</description>
<packaging>war</packaging>
- <properties>
- <checkstyle.config.location>file://${basedir}/../config/sun_checks.xml</checkstyle.config.location>
- </properties>
+ <properties>
+ <checkstyle.config.location>file://${basedir}/../config/sun_checks.xml</checkstyle.config.location>
+ </properties>
<dependencies>
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.4.0</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
--
GitLab