Update 'pom.xml'

fix conflict
This commit is contained in:
Roberto Cirillo 2024-04-05 15:22:51 +02:00
parent 55fbff788a
commit b93e86e7a8
1 changed files with 3 additions and 2 deletions

View File

@ -78,7 +78,8 @@
<javadoc.opts>-Xdoclint:none</javadoc.opts> <javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties> </properties>
</profile> </profile>
<!--profile set-local-classpath commented see #26841> <!--profile set-local-classpath commented see #26841-->
<!--profile>
<id>set-local-classpath</id> <id>set-local-classpath</id>
<activation> <activation>
<jdk>[1.8,)</jdk> <jdk>[1.8,)</jdk>
@ -90,7 +91,7 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</profile--> </profile-->
<profile> <profile>
<id>generate-distribution-packages</id> <id>generate-distribution-packages</id>
<activation> <activation>