Skip to content

Commit

Permalink
Change when the default attach-javadocs execution runs
Browse files Browse the repository at this point in the history
- to prevent it from running after moditect, that causes issues otherwise
  • Loading branch information
marko-bekhta authored and yrodiere committed Sep 5, 2023
1 parent f25d516 commit 7aff831
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
11 changes: 11 additions & 0 deletions build/parents/public/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,17 @@
</goals>
<phase>process-resources</phase>
</execution>
<execution>
<!--
This is the default name of an execution that is added automatically if release profile is enabled.
We want to "override" it so that we can control when it is actually executed.
-->
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<phase>${javadoc.generate.jar.phase}</phase>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@
<!-- Overridden in profiles to disable the plugin (which doesn't have a 'skip' property...) -->
<injection-plugin.phase>compile</injection-plugin.phase>

<javadoc.generate.jar.phase>none</javadoc.generate.jar.phase>

<!-- Test settings -->

<!-- Properties overridden in profiles to disable certain tests that only work with specific Java versions -->
Expand Down Expand Up @@ -1392,6 +1394,10 @@
<value>true</value>
</property>
</activation>
<properties>
<!-- We want this execution to happen before moditect (which executes at package phase) -->
<javadoc.generate.jar.phase>prepare-package</javadoc.generate.jar.phase>
</properties>
<build>
<plugins>
<plugin>
Expand Down

0 comments on commit 7aff831

Please sign in to comment.