Skip to content

Commit

Permalink
Manual merge (2.19->master) for #4977
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Feb 24, 2025
1 parent 608f796 commit f0e380e
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
<version.bytebuddy>1.15.10</version.bytebuddy>
<version.mockito>5.15.2</version.mockito>

<jacocoStrict>true</jacocoStrict>

<!-- Can not use default, since group id != Java package name here -->
<osgi.export>tools.jackson.databind.*;version=${project.version}</osgi.export>
<!-- fix for databind#2299: using jackson-databind in an OSGi environment under Android -->
Expand Down Expand Up @@ -253,6 +255,35 @@
</executions>
</plugin>

<!-- Important: enable enforcer plug-in: -->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions> <!-- or? combine.children="merge"> -->
<execution>
<id>enforce-properties</id>
<phase>validate</phase>
<goals><goal>enforce</goal></goals>
</execution>
<execution>
<id>enforce-jacoco-exec</id>
<phase>verify</phase>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireFilesExist>
<files>
<file>${project.build.directory}/jacoco.exec</file>
</files>
</requireFilesExist>
</rules>
<fail>${jacocoStrict}</fail>
</configuration>
</execution>
</executions>
</plugin>

<!-- 03-Nov-2020, tatu: Add LICENSE from main level -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down

0 comments on commit f0e380e

Please sign in to comment.