Skip to content

Commit

Permalink
[MJAVADOC-807] Simplify IT for MJAVADOC-498
Browse files Browse the repository at this point in the history
This closes #309
  • Loading branch information
michael-o committed Aug 17, 2024
1 parent 43e901f commit 0a850a1
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 47 deletions.
19 changes: 5 additions & 14 deletions src/it/projects/MJAVADOC-498_aggr_modulepath/baz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -58,4 +49,4 @@
</dependency>
</dependencies>

</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,3 +16,4 @@
# under the License.

invoker.java.version = 9+
invoker.goals = compile javadoc:javadoc
9 changes: 0 additions & 9 deletions src/it/projects/MJAVADOC-498_aggr_modulepath/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions src/it/projects/MJAVADOC-498_mm_modulepath/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,3 +16,4 @@
# under the License.

invoker.java.version = 9+
invoker.goals = compile javadoc:javadoc
9 changes: 0 additions & 9 deletions src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/it/projects/MJAVADOC-498_modulepath/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
# under the License.

invoker.java.version = 9+
invoker.goals = compile javadoc:javadoc javadoc:test-javadoc
9 changes: 0 additions & 9 deletions src/it/projects/MJAVADOC-498_modulepath/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions src/it/projects/MJAVADOC-498_modulepath/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 0a850a1

Please sign in to comment.