Skip to content

Commit

Permalink
Manual merge of pom.xml changes wrt #1028 to master as well
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed May 18, 2023
1 parent a74ed7b commit 8223147
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,6 @@ tools.jackson.core.*;version=${project.version}
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>de.jjohannes</groupId>
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
<!-- 27-Apr-2023, tatu: [core#999]: Need to exclude shaded FDP
dependency from GMM
-->
<configuration>
<removedDependencies>
<dependency>
<groupId>ch.randelshofer</groupId>
<artifactId>fastdoubleparser</artifactId>
</dependency>
</removedDependencies>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down Expand Up @@ -213,6 +197,21 @@ tools.jackson.core.*;version=${project.version}
</execution>
</executions>
</plugin>
<plugin>
<groupId>de.jjohannes</groupId>
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
<!-- 27-Apr-2023, tatu: [core#999]: Need to exclude shaded FDP
dependency from GMM
-->
<configuration>
<removedDependencies>
<dependency>
<groupId>ch.randelshofer</groupId>
<artifactId>fastdoubleparser</artifactId>
</dependency>
</removedDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down

0 comments on commit 8223147

Please sign in to comment.