This is an automated email from the ASF dual-hosted git repository. gboue pushed a commit to branch fix-it-failure in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 42225cc8275d480f5306a7f354f1e0fa4b15193f Author: Guillaume Boué <[email protected]> AuthorDate: Fri Aug 17 23:43:15 2018 +0200 Fix IT failures on CI - dependencySource-[24]: it is a Windows long path issue that hits a surefire bug, solved by updating surefire. - detectLinks: the base directory of the project is canonicalized so we also need to do it in the IT (so that, e.g., Windows drive letter case is consistent). --- src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml | 5 +++++ src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml | 5 +++++ src/it/projects/detectLinks/verify.bsh | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml b/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml index 2fdc256..284d57a 100644 --- a/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml +++ b/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml @@ -58,6 +58,11 @@ under the License. </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.0</version> + </plugin> </plugins> </pluginManagement> </build> diff --git a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml index b67ffed..fb19c79 100644 --- a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml +++ b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml @@ -84,6 +84,11 @@ under the License. </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.0</version> + </plugin> </plugins> </pluginManagement> </build> diff --git a/src/it/projects/detectLinks/verify.bsh b/src/it/projects/detectLinks/verify.bsh index 3669ab0..145ebb4 100644 --- a/src/it/projects/detectLinks/verify.bsh +++ b/src/it/projects/detectLinks/verify.bsh @@ -97,9 +97,9 @@ try System.err.println( "module2 -linkoffline module1 not added: " + options2 ); return false; } - if ( !contentOptions2.substring( linkoffline2 ).contains( apidocs1.getAbsolutePath().replaceAll( "\\\\", "/" ) ) ) + if ( !contentOptions2.substring( linkoffline2 ).contains( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) ) ) { - System.err.println( apidocs1.getAbsolutePath().replaceAll( "\\\\", "/" ) + " not added: " + options2 ); + System.err.println( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) + " not added: " + options2 ); return false; } int link2 = contentOptions2.indexOf( "-link" );
