[maven-javadoc-plugin] branch fix-it-failure updated (ac5e166 -> 42225cc)

[gb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 discard ac5e166  verify that issue was windows lowercase drive letter
 discard 1c57e1d  archive invoker output to see what is going on...
 discard e3c9b8c  restrict to windows, maven 3.5, jdk 8
 discard 9ab9d7b  print logs and only include detectLinks to see what is wrong faster
 discard a540a3b  see if issue is with old version of surefire and Windows long paths...
     new 42225cc  Fix IT failures on CI

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ac5e166)
            \
             N -- N -- N   refs/heads/fix-it-failure (42225cc)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Jenkinsfile                                        | 194 +--------------------
 pom.xml                                            |   4 -
 .../MJAVADOC-280-2-projects/pom.xml                |   5 +
 .../projects/dependencySource-2/invoker.properties |   4 +-
 .../MJAVADOC-280-4-projects/pom.xml                |   5 +
 .../projects/dependencySource-4/invoker.properties |   4 +-
 src/it/projects/detectLinks/invoker.properties     |   2 +-
 7 files changed, 17 insertions(+), 201 deletions(-)

[maven-javadoc-plugin] 01/01: Fix IT failures on CI

[gb...@apache.org]

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é <gb...@apache.org>
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" );