change unzip reading method for byte to byte instead of chars

src/main/java/org/jenkinsci/plugins/pipeline/utility/steps/zip/UnZipStepExecution.java

@@ -36,12 +36,15 @@
 
 import javax.inject.Inject;
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.zip.ZipEntry;
@@ -144,17 +147,12 @@ public Map<String, String> invoke(File zipFile, VirtualChannel channel) throws I
                         } else {
                             logger.print("Reading: ");
                             logger.println(entry.getName());
-                            try (BufferedReader reader = new BufferedReader(new InputStreamReader(zip.getInputStream(entry), Charset.defaultCharset()))) {
-                                String line = reader.readLine();
-                                StringBuilder str = new StringBuilder();
-                                while (line != null) {
-                                    if (str.length() >= 0) {
-                                        str.append('\n');
-                                    }
-                                    str.append(line);
-                                    line = reader.readLine();
-                                }
-                                strMap.put(entry.getName(), str.toString().trim());
+                            // we need to copy byte by byte everything to be sure that no carriage return characters are skipped
+                            // readLine skips the carriage return and for example files ending with only one carriage return are trimmed
+
+                            try (InputStream is = zip.getInputStream(entry); ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+                                IOUtils.copyLarge(is, output);
+                                strMap.put(entry.getName(), new String(output.toByteArray(), Charset.defaultCharset()));
                             }
                         }
                     }

src/test/java/org/jenkinsci/plugins/pipeline/utility/steps/conf/mf/ReadManifestStepTest.java

@@ -66,6 +66,24 @@ public void configRoundTrip() throws Exception {
         j.assertEqualDataBoundBeans(step, step2);
     }
 
+    @Test
+    public void testJarWithGradleManifest() throws Exception {
+        URL resource = getClass().getResource("gradle-manifest.war");
+
+        String remoting = new File(resource.getPath()).getAbsolutePath();
+        p.setDefinition(new CpsFlowDefinition(
+                "node('slaves') {\n" +
+                        "  def man = readManifest file: '" + remoting + "'\n" +
+                        "  assert man != null\n" +
+                        "  assert man.main != null\n" +
+                        "  echo man.main['Implementation-Version']\n" +
+                        "  assert man.main['Implementation-Version'] == '1.0'\n" +
+                        "}\n"
+                , false));
+        WorkflowRun run = j.assertBuildStatusSuccess(p.scheduleBuild2(0));
+        j.assertLogContains("Reading: META-INF/MANIFEST.MF", run);
+    }
+
     @Test
     public void testJar() throws Exception {
         String remoting = new File(j.getWebAppRoot(), "WEB-INF/remoting.jar").getAbsolutePath();