Skip to content

Commit

Permalink
Manual merge of pom.xml for #1264
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed May 5, 2024
1 parent adb2b07 commit ac121b2
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,12 @@ tools.jackson.core.*;version=${project.version}
<relocations>
<relocation>
<pattern>ch/randelshofer/fastdoubleparser</pattern>
<shadedPattern>com/fasterxml/jackson/core/io/doubleparser</shadedPattern>
<!-- 04-May-2024, tatu: [core#1264] Shade with version-specific package
to prevent reuse by downstream deps.
NOTE: `project.version.underscore' comes from `jackson-base/pom.xml`
parent pom
-->
<shadedPattern>tools/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
</relocation>
<relocation>
<pattern>META-INF/LICENSE</pattern>
Expand All @@ -174,19 +179,19 @@ tools.jackson.core.*;version=${project.version}
</relocation>
<relocation>
<pattern>META-INF/versions/11/ch/randelshofer/fastdoubleparser</pattern>
<shadedPattern>META-INF/versions/11/com/fasterxml/jackson/core/io/doubleparser</shadedPattern>
<shadedPattern>META-INF/versions/11/tools/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
</relocation>
<relocation>
<pattern>META-INF/versions/17/ch/randelshofer/fastdoubleparser</pattern>
<shadedPattern>META-INF/versions/17/com/fasterxml/jackson/core/io/doubleparser</shadedPattern>
<shadedPattern>META-INF/versions/17/tools/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
</relocation>
<relocation>
<pattern>META-INF/versions/21/ch/randelshofer/fastdoubleparser</pattern>
<shadedPattern>META-INF/versions/21/com/fasterxml/jackson/core/io/doubleparser</shadedPattern>
<shadedPattern>META-INF/versions/21/tools/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
</relocation>
<relocation>
<pattern>META-INF/versions/22/ch/randelshofer/fastdoubleparser</pattern>
<shadedPattern>META-INF/versions/22/com/fasterxml/jackson/core/io/doubleparser</shadedPattern>
<shadedPattern>META-INF/versions/22/tools/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
</relocation>
</relocations>
</configuration>
Expand Down

0 comments on commit ac121b2

Please sign in to comment.