Skip to content

Commit

Permalink
Merge branch '3.1.x' into 4.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
marcingrzejszczak committed Jun 27, 2023
2 parents a145789 + a2e2ff9 commit 21a1839
Showing 1 changed file with 24 additions and 6 deletions.
30 changes: 24 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@
<duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>true</duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>
<duplicate-finder-maven-plugin.includePomProjects>false</duplicate-finder-maven-plugin.includePomProjects>
<maven-gpg-plugin.phase>verify</maven-gpg-plugin.phase>
<generate-docs.phase>prepare-package</generate-docs.phase>
<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -1194,7 +1197,7 @@
<executions>
<execution>
<id>generate-html-documentation</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
Expand Down Expand Up @@ -1229,7 +1232,7 @@
</execution>
<execution>
<id>generate-htmlsingle-documentation</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
Expand Down Expand Up @@ -1257,7 +1260,7 @@
</execution>
<execution>
<id>generate-pdf-documentation</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
Expand Down Expand Up @@ -1341,7 +1344,7 @@
</execution>
<execution>
<id>assert-no-unresolved-links</id>
<phase>prepare-package</phase>
<phase>${generate-docs.phase}</phase>
<goals>
<goal>run</goal>
</goals>
Expand All @@ -1363,7 +1366,7 @@
</execution>
<execution>
<id>copy-missing-html-files</id>
<phase>package</phase>
<phase>${copy-missing-html-files.phase}</phase>
<goals>
<goal>run</goal>
</goals>
Expand All @@ -1378,7 +1381,7 @@
</execution>
<execution>
<id>package-and-attach-docs-zip</id>
<phase>package</phase>
<phase>${package-and-attach-docs-zip.phase}</phase>
<goals>
<goal>run</goal>
</goals>
Expand Down Expand Up @@ -1632,5 +1635,20 @@
</plugins>
</build>
</profile>
<profile>
<id>CI</id>
<activation>
<property>
<name>env.GITHUB_API_URL</name>
</property>
</activation>
<properties>
<!-- Because of this we will not be catching broken docs in the PRs -->
<generate-docs.phase>none</generate-docs.phase>
<copy-missing-html-files.phase>none</copy-missing-html-files.phase>
<package-and-attach-docs-zip.phase>none</package-and-attach-docs-zip.phase>
<upload-docs-zip.phase>none</upload-docs-zip.phase>
</properties>
</profile>
</profiles>
</project>

0 comments on commit 21a1839

Please sign in to comment.