You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/03/24 15:11:25 UTC

[sling-slingfeature-maven-plugin] 02/02: SLING-9253 : Feature archive gives EOFException while reading

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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git

commit dd75d365949713c92d68bb980bf62a2d3f26b571
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Mar 24 16:11:01 2020 +0100

    SLING-9253 : Feature archive gives EOFException while reading
---
 .../maven/mojos/AttachFeatureArchivesMojo.java     | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeatureArchivesMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeatureArchivesMojo.java
index edcdcac..14850f8 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeatureArchivesMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeatureArchivesMojo.java
@@ -155,20 +155,20 @@ public class AttachFeatureArchivesMojo extends AbstractIncludingFeatureMojo {
         outputFile.getParentFile().mkdirs();
 
         getLog().info("Creating feature archive " + outputFile.getName());
-        try ( final FileOutputStream fos = new FileOutputStream(outputFile)) {
-            final JarOutputStream jos = ArchiveWriter.write(fos,
-                    createBaseManifest(features.size() == 1 ? features.get(0) : null), id -> {
-
-                    try {
-                        return ProjectHelper.getOrResolveArtifact(project, mavenSession, artifactHandlerManager,
-                                artifactResolver, id).getFile().toURI().toURL();
-                    } catch (final MalformedURLException e) {
-                        getLog().debug("Malformed url " + e.getMessage(), e);
-                        // ignore
-                        return null;
+        try ( final FileOutputStream fos = new FileOutputStream(outputFile);
+              final JarOutputStream jos = ArchiveWriter.write(fos,
+                        createBaseManifest(features.size() == 1 ? features.get(0) : null), id -> {
+
+                        try {
+                            return ProjectHelper.getOrResolveArtifact(project, mavenSession, artifactHandlerManager,
+                                    artifactResolver, id).getFile().toURI().toURL();
+                        } catch (final MalformedURLException e) {
+                            getLog().debug("Malformed url " + e.getMessage(), e);
+                            // ignore
+                            return null;
+                        }
                     }
-                }
-                    , features.toArray(new Feature[features.size()]));
+                        , features.toArray(new Feature[features.size()]))) {
 
             // handle license etc.
             jos.setLevel(Deflater.BEST_COMPRESSION);