Skip to content

Commit

Permalink
chore(deps): update minor dependencies (#134)
Browse files Browse the repository at this point in the history
* chore(deps): update minor dependencies

* style: clean up pom

* chore(renovate): add temp exclusion for eclipse deps

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Nicolas Senave <nicolas.senave@gmail.com>
  • Loading branch information
renovate[bot] and nsenave authored Jul 11, 2024
1 parent faff6e6 commit fc50710
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 34 deletions.
90 changes: 56 additions & 34 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>fr.insee.pogues</groupId>
<artifactId>pogues-model</artifactId>
<version>1.3.14</version>
<packaging>jar</packaging>
<version>1.3.13</version>

<name>Pogues Model</name>
<description>Classes and converters for the Pogues model</description>
<url>https://inseefr.github.io/Pogues-Model/</url>

<properties>
<!-- Java version -->
<maven.compiler.release>21</maven.compiler.release>
<!-- Project encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Dependency version properties -->
<junit.version>5.10.2</junit.version>
</properties>

<licenses>
<license>
<name>MIT License</name>
Expand Down Expand Up @@ -56,28 +49,60 @@
</repository>
</distributionManagement>

<properties>
<!-- Java version -->
<maven.compiler.release>21</maven.compiler.release>
<!-- Project encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Dependency versions -->
<jaxb-api.version>2.3.1</jaxb-api.version>
<eclipse.version>2.6.0</eclipse.version>
<commons-io.version>2.16.1</commons-io.version>
<slf4j.version>2.0.13</slf4j.version>
<junit.version>5.10.3</junit.version>
<jsonassert.version>1.5.3</jsonassert.version>
<xmlunit.version>2.10.0</xmlunit.version>
<log4j-slf4j2.version>2.23.1</log4j-slf4j2.version>
<!-- Build plugin versions -->
<surefire.plugin.version>2.22.2</surefire.plugin.version>
<jaxb2.plugin.version>2.5.0</jaxb2.plugin.version>
<resources.plugin.version>3.3.1</resources.plugin.version>
<build-helper.plugin.version>1.12</build-helper.plugin.version>
</properties>

<dependencies>
<!-- Main dependencies -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
<version>2.6.0</version>
<version>${eclipse.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>2.6.0</version>
<version>${eclipse.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<version>${commons-io.version}</version>
</dependency>

<!-- Logging API -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.13</version>
<version>${slf4j.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand All @@ -93,39 +118,34 @@
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.1</version>
<version>${jsonassert.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-assertj3</artifactId>
<version>2.10.0</version>
<version>${xmlunit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>2.23.1</version>
<version>${log4j-slf4j2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>

<!-- Build plugins -->
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>21</source>
<target>21</target>
<encoding>UTF-8</encoding>
<source>${maven.compiler.release}</source>
<target>${maven.compiler.release}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
Expand All @@ -134,16 +154,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>${surefire.plugin.version}</version>
<configuration>
<encoding>UTF-8</encoding>
<encoding>${project.build.sourceEncoding}</encoding>
<argLine>-Djavax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.0</version>
<version>${jaxb2.plugin.version}</version>
<executions>
<execution>
<id>xjc</id>
Expand All @@ -155,17 +175,17 @@
</executions>
<configuration>
<packageName>fr.insee.pogues.model</packageName>
<encoding>UTF-8</encoding>
<encoding>${project.build.sourceEncoding}</encoding>
<sources>
<source>src/main/resources/xsd/Questionnaire.xsd</source>
</sources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>${resources.plugin.version}</version>
<configuration>
<encoding>UTF-8</encoding>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
<executions>
<execution>
Expand All @@ -192,7 +212,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<version>${build-helper.plugin.version}</version>
<executions>
<execution>
<id>add-source</id>
Expand All @@ -211,6 +231,7 @@
</plugins>
</build>

<!-- Deploy plugins -->
<profiles>
<profile>
<id>deploy</id>
Expand Down Expand Up @@ -245,7 +266,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down Expand Up @@ -277,4 +298,5 @@
</build>
</profile>
</profiles>

</project>
9 changes: 9 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@
"groupName": "all minor dependencies",
"groupSlug": "all-minor-patch",
"matchPackagePatterns": ["*"],
"excludePackagePatterns": ["org.eclipse.*"],
"matchUpdateTypes": ["minor", "patch"],
"bumpVersion": "patch",
"dependencyDashboardApproval": false
},
{
"groupName": "eclipse dependencies",
"groupSlug": "eclipse-patch",
"matchPackagePatterns": ["org.eclipse.*"],
"matchUpdateTypes": ["minor", "patch"],
"bumpVersion": "patch",
"dependencyDashboardApproval": false
Expand Down

0 comments on commit fc50710

Please sign in to comment.