This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-747
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
The following commit(s) were added to refs/heads/MSHARED-747 by this push:
new 9b69c6d fixup! fixup! fixup! [MSHARED-747] - Upgrade maven-plugins
parent to version 32
9b69c6d is described below
commit 9b69c6dd7f164a08aaaea3edfa495389b454e7f9
Author: Karl Heinz Marbaise <[email protected]>
AuthorDate: Sat Jul 28 22:27:59 2018 +0200
fixup! fixup! fixup! [MSHARED-747] - Upgrade maven-plugins parent to
version 32
---
.../apache/maven/archiver/MavenArchiverTest.java | 24 +++++++++++++---------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 8f640f9..bb94b67 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -182,7 +182,7 @@ public class MavenArchiverTest
Model model = new Model();
model.setArtifactId( "dummy" );
- MavenProject project = new MavenProject( model)
+ MavenProject project = new MavenProject( model )
{
public List<String> getRuntimeClasspathElements()
{
@@ -234,23 +234,27 @@ public class MavenArchiverTest
FileUtils.deleteDirectory( "target/maven-archiver" );
archiver.createArchive( session, project, config );
assertTrue( jarFile.exists() );
- jarFile.setLastModified( System.currentTimeMillis() - 60000L );
+
+ long history = System.currentTimeMillis() - 60000L;
+ System.out.println( "History: " + history );
+ jarFile.setLastModified( history );
long time = jarFile.lastModified();
+ System.out.println( "Time:" + time );
List<File> files = FileUtils.getFiles( new File(
"target/maven-archiver" ), "**/**", null, true );
for ( File file : files )
{
- assertTrue(file.setLastModified( time ));
+ assertTrue( file.setLastModified( time ) );
}
archiver.createArchive( session, project, config );
- // Is the assumption correct that the jar file itself
+ // Is the assumption correct that the jar file itself
// should have the same last modified time as the files itself ?
- assertEquals( jarFile.lastModified(), time );
+ assertEquals( "History " + history + " time:" + time ,
jarFile.lastModified(), time );
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..
+ // I'm not sure if it could only be greater than time or if it is
sufficient to be greater or equal..
assertTrue( jarFile.lastModified() >= time );
}
@@ -421,7 +425,7 @@ public class MavenArchiverTest
config.getManifest().setAddDefaultImplementationEntries( true );
config.addManifestEntry( "Description", project.getDescription() );
// config.addManifestEntry( "EntryWithTab", " foo tab " + ( '\u0009' )
+ ( '\u0009' ) // + " bar tab" + ( //
-
// '\u0009' // ) );
+ // '\u0009' // ) );
archiver.createArchive( session, project, config );
assertTrue( jarFile.exists() );
@@ -749,7 +753,7 @@ public class MavenArchiverTest
config.getManifest().setAddClasspath( true );
config.getManifest().setClasspathPrefix( "lib" );
config.getManifest().setClasspathLayoutType(
ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
- config.getManifest().setCustomClasspathLayout(
MavenArchiver.SIMPLE_LAYOUT);
+ config.getManifest().setCustomClasspathLayout(
MavenArchiver.SIMPLE_LAYOUT );
archiver.createArchive( session, project, config );
assertTrue( jarFile.exists() );
@@ -788,7 +792,7 @@ public class MavenArchiverTest
config.getManifest().setAddClasspath( true );
config.getManifest().setClasspathPrefix( "lib" );
config.getManifest().setClasspathLayoutType(
ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
- config.getManifest().setCustomClasspathLayout(
MavenArchiver.SIMPLE_LAYOUT_NONUNIQUE);
+ config.getManifest().setCustomClasspathLayout(
MavenArchiver.SIMPLE_LAYOUT_NONUNIQUE );
archiver.createArchive( session, project, config );
assertTrue( jarFile.exists() );
@@ -1339,7 +1343,7 @@ public class MavenArchiverTest
URL resource =
Thread.currentThread().getContextClassLoader().getResource( file );
if ( resource == null )
{
- fail("Cannot retrieve java.net.URL for file: " + file + " on the
current test classpath." );
+ fail( "Cannot retrieve java.net.URL for file: " + file + " on the
current test classpath." );
}
URI uri = new File( resource.getPath() ).toURI().normalize();