fix conflict with master
This commit is contained in:
parent
2542cc2eca
commit
0b40060d28
|
@ -1,8 +1,9 @@
|
|||
# Changelog for Maven-Parent
|
||||
|
||||
## [v1.2.0] - 2023-10-13
|
||||
## [v1.2.0] - 2024-04-03
|
||||
|
||||
### Bug
|
||||
* update maven-javadoc-plugin to from 2.6.8 to 3.6.3. #25877
|
||||
* update groovy-all plugin dependency from 3.0.0-beta to 3.0.13 #25872
|
||||
|
||||
### Features
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -1545,7 +1545,7 @@
|
|||
<plugin.assembly.version>2.6</plugin.assembly.version>
|
||||
<plugin.compiler.version>3.10.1</plugin.compiler.version>
|
||||
<plugin.source.version>2.1.2</plugin.source.version>
|
||||
<plugin.javadoc.version>2.8</plugin.javadoc.version>
|
||||
<plugin.javadoc.version>3.6.3</plugin.javadoc.version>
|
||||
<plugin.resources.version>3.1.0</plugin.resources.version>
|
||||
|
||||
<!-- default value for the distro directory -->
|
||||
|
|
Loading…
Reference in New Issue