[maven] branch MNG-6826 updated (3c94061 -> 06842d6)

[kh...@apache.org]

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

khmarbaise pushed a change to branch MNG-6826
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard 3c94061  Conditions to check for JDK8+ in FileSizeFormatTest test cases are obsolete with the lift to JDK8.
     new 06842d6  [MNG-6826] - Remove condition check for JDK8+ in FileSizeFormatTest  - The conditions to check for JDK8+ in test cases is    obsolete with the lift to JDK8.

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   (3c94061)
            \
             N -- N -- N   refs/heads/MNG-6826 (06842d6)

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:

[maven] 01/01: [MNG-6826] - Remove condition check for JDK8+ in FileSizeFormatTest - The conditions to check for JDK8+ in test cases is obsolete with the lift to JDK8.

[kh...@apache.org]

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

khmarbaise pushed a commit to branch MNG-6826
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 06842d6b961a81e79a3f0cd86a0507e9afa2766f
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Dec 15 04:15:13 2019 +0100

    [MNG-6826] - Remove condition check for JDK8+ in FileSizeFormatTest
     - The conditions to check for JDK8+ in test cases is
       obsolete with the lift to JDK8.
---
 .../maven/cli/transfer/FileSizeFormatTest.java      | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
index a870411..e595ace 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
@@ -21,13 +21,11 @@ package org.apache.maven.cli.transfer;
 
 import java.util.Locale;
 
-import org.apache.commons.lang3.JavaVersion;
-import org.apache.commons.lang3.SystemUtils;
 import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat;
 import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat.ScaleUnit;
+import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import org.junit.Test;
 
 public class FileSizeFormatTest {
 
@@ -136,10 +134,7 @@ public class FileSizeFormatTest {
         long _50_bytes = 50L;
         assertEquals( "50 B", format.format( _50_bytes ) );
         assertEquals( "50 B", format.format( _50_bytes, ScaleUnit.BYTE ) );
-        if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
-        {
-            assertEquals( "0.1 kB", format.format( _50_bytes, ScaleUnit.KILOBYTE ) );
-        }
+        assertEquals( "0.1 kB", format.format( _50_bytes, ScaleUnit.KILOBYTE ) );
         assertEquals( "0 MB", format.format( _50_bytes, ScaleUnit.MEGABYTE ) );
         assertEquals( "0 GB", format.format( _50_bytes, ScaleUnit.GIGABYTE ) );
 
@@ -168,10 +163,7 @@ public class FileSizeFormatTest {
         assertEquals( "50 kB", format.format( _50_kilobytes ) );
         assertEquals( "50000 B", format.format( _50_kilobytes, ScaleUnit.BYTE ) );
         assertEquals( "50 kB", format.format( _50_kilobytes, ScaleUnit.KILOBYTE ) );
-        if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
-        {
-            assertEquals( "0.1 MB", format.format( _50_kilobytes, ScaleUnit.MEGABYTE ) );
-        }
+        assertEquals( "0.1 MB", format.format( _50_kilobytes, ScaleUnit.MEGABYTE ) );
         assertEquals( "0 GB", format.format( _50_kilobytes, ScaleUnit.GIGABYTE ) );
 
         long _999_kilobytes = 999L * 1000L;
@@ -200,10 +192,7 @@ public class FileSizeFormatTest {
         assertEquals( "50000000 B", format.format( _50_megabytes, ScaleUnit.BYTE ) );
         assertEquals( "50000 kB", format.format( _50_megabytes, ScaleUnit.KILOBYTE ) );
         assertEquals( "50 MB", format.format( _50_megabytes, ScaleUnit.MEGABYTE ) );
-        if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
-        {
-            assertEquals( "0.1 GB", format.format( _50_megabytes, ScaleUnit.GIGABYTE ) );
-        }
+        assertEquals( "0.1 GB", format.format( _50_megabytes, ScaleUnit.GIGABYTE ) );
 
         long _999_megabytes = 999L * 1000L * 1000L;
         assertEquals( "999 MB", format.format( _999_megabytes ) );
@@ -310,4 +299,4 @@ public class FileSizeFormatTest {
          assertEquals( "15 GB", format.formatProgress( _15_gigabytes, _15_gigabytes ) );
     }
 
-}
+}
\ No newline at end of file