tree 37bc4ba820d121e5585dfc10f9bfac2dbb6ef677
parent dd668dd4504b5513a39c49fb7140136942ad0a32
parent 8f9ee789d272cf702aaf390004b78b73b78db4f1
author Guillaume Nodet <gnodet@gmail.com> 1665497494 +0200
committer Guillaume Nodet <gnodet@gmail.com> 1665497494 +0200

Merge remote-tracking branch 'origin/master' into dependency-convergence

# Conflicts:
#	maven-plugin-plugin/pom.xml
#	maven-plugin-tools-generators/pom.xml
#	pom.xml