This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MJAVADOC-807 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 0a850a16589ff0e1e8379fe841159d04e686acfb Author: Michael Osipov <micha...@apache.org> AuthorDate: Wed Aug 14 23:37:00 2024 +0200 [MJAVADOC-807] Simplify IT for MJAVADOC-498 This closes #309 --- .../projects/MJAVADOC-498_aggr_modulepath/baz/pom.xml | 19 +++++-------------- .../MJAVADOC-498_aggr_modulepath/invoker.properties | 5 +++-- src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml | 9 --------- .../MJAVADOC-498_mm_modulepath/invoker.properties | 5 +++-- src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml | 9 --------- .../MJAVADOC-498_modulepath/invoker.properties | 1 + src/it/projects/MJAVADOC-498_modulepath/pom.xml | 9 --------- src/it/projects/MJAVADOC-498_modulepath/verify.groovy | 5 +++-- 8 files changed, 15 insertions(+), 47 deletions(-) diff --git a/src/it/projects/MJAVADOC-498_aggr_modulepath/baz/pom.xml b/src/it/projects/MJAVADOC-498_aggr_modulepath/baz/pom.xml index 0a63d7cf..3ae2e95b 100644 --- a/src/it/projects/MJAVADOC-498_aggr_modulepath/baz/pom.xml +++ b/src/it/projects/MJAVADOC-498_aggr_modulepath/baz/pom.xml @@ -33,19 +33,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>javadoc-aggregate</id> - <phase>package</phase> - <goals> - <goal>javadoc-no-fork</goal> - </goals> - <configuration> - <includeDependencySources>true</includeDependencySources> - <includeTransitiveDependencySources>true</includeTransitiveDependencySources> - </configuration> - </execution> - </executions> + <configuration> + <includeDependencySources>true</includeDependencySources> + <includeTransitiveDependencySources>true</includeTransitiveDependencySources> + </configuration> </plugin> </plugins> </build> @@ -58,4 +49,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/src/it/projects/MJAVADOC-498_aggr_modulepath/invoker.properties b/src/it/projects/MJAVADOC-498_aggr_modulepath/invoker.properties index 95117185..bc21f474 100644 --- a/src/it/projects/MJAVADOC-498_aggr_modulepath/invoker.properties +++ b/src/it/projects/MJAVADOC-498_aggr_modulepath/invoker.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,3 +16,4 @@ # under the License. invoker.java.version = 9+ +invoker.goals = compile javadoc:javadoc diff --git a/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml b/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml index f7176e66..3d3818ad 100644 --- a/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml +++ b/src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml @@ -53,15 +53,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>@project.version@</version> - <executions> - <execution> - <id>attach-javadocs</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/src/it/projects/MJAVADOC-498_mm_modulepath/invoker.properties b/src/it/projects/MJAVADOC-498_mm_modulepath/invoker.properties index 95117185..bc21f474 100644 --- a/src/it/projects/MJAVADOC-498_mm_modulepath/invoker.properties +++ b/src/it/projects/MJAVADOC-498_mm_modulepath/invoker.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,3 +16,4 @@ # under the License. invoker.java.version = 9+ +invoker.goals = compile javadoc:javadoc diff --git a/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml b/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml index 94ab3320..a512b3c4 100644 --- a/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml +++ b/src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml @@ -52,15 +52,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>@project.version@</version> - <executions> - <execution> - <id>attach-javadocs</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/src/it/projects/MJAVADOC-498_modulepath/invoker.properties b/src/it/projects/MJAVADOC-498_modulepath/invoker.properties index 10a36d0a..a800680c 100644 --- a/src/it/projects/MJAVADOC-498_modulepath/invoker.properties +++ b/src/it/projects/MJAVADOC-498_modulepath/invoker.properties @@ -16,3 +16,4 @@ # under the License. invoker.java.version = 9+ +invoker.goals = compile javadoc:javadoc javadoc:test-javadoc diff --git a/src/it/projects/MJAVADOC-498_modulepath/pom.xml b/src/it/projects/MJAVADOC-498_modulepath/pom.xml index c90dd04f..d8e8d27b 100644 --- a/src/it/projects/MJAVADOC-498_modulepath/pom.xml +++ b/src/it/projects/MJAVADOC-498_modulepath/pom.xml @@ -61,15 +61,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>@project.version@</version> - <executions> - <execution> - <id></id> - <goals> - <goal>jar</goal> - <goal>test-jar</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/src/it/projects/MJAVADOC-498_modulepath/verify.groovy b/src/it/projects/MJAVADOC-498_modulepath/verify.groovy index f3c82741..f91aff5c 100644 --- a/src/it/projects/MJAVADOC-498_modulepath/verify.groovy +++ b/src/it/projects/MJAVADOC-498_modulepath/verify.groovy @@ -17,5 +17,6 @@ * under the License. */ def log = new File( basedir, 'build.log').text - -assert log.count( " --module-path" ) == 3 +def count = log.count( " --module-path" ) +// depends on Maven version (<= 3.8.x, then 2; otherwise 3) +assert count == 2 || count == 3