[maven-archiver] 01/01: merge master

[el...@apache.org]

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

elharo pushed a commit to branch close
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git

commit 5a171c76541e6a0a84bb1c23279b348ef3dabc14
Merge: 0c1577b c4fe61e
Author: Elliotte Harold <el...@ibiblio.org>
AuthorDate: Mon Nov 16 12:06:58 2020 -0500

    merge master

 src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 2 --
 1 file changed, 2 deletions(-)

diff --cc src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 07e2876,b4f16bf..c6d8a88
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@@ -270,9 -273,7 +270,7 @@@ public class MavenArchiverTes
          }
  
          archiver.createArchive( session, project, config );
--        
-         assertThat( time ).as( "History " + history + " time:" + time ).isEqualTo( jarFile.lastModified() );
 +
          config.setForced( true );
          archiver.createArchive( session, project, config );
          // I'm not sure if it could only be greater than time or if it is sufficient to be greater or equal..