From 7d6b917e6cca1ba9032c3bd7e355395db0bf8f94 Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Wed, 17 Apr 2019 09:59:04 +0200
Subject: Write application files at top level inside zip

---
 .../main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java   | 4 +---
 .../src/main/java/com/yahoo/container/plugin/mojo/Compression.java   | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
index e499e8ad47b..c8c12a21d8a 100644
--- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
+++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
@@ -4,7 +4,6 @@ package com.yahoo.container.plugin.mojo;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -13,7 +12,6 @@ import org.apache.maven.project.MavenProject;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -47,7 +45,7 @@ public class ApplicationMojo extends AbstractMojo {
         copyBundlesForSubModules(componentsDir);
 
         try {
-            Compression.zipDirectory(applicationDestination);
+            Compression.zipDirectory(applicationDestination, "");
         } catch (Exception e) {
             throw new MojoExecutionException("Failed zipping application.", e);
         }
diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java
index 185a5b8cc0f..e8d398393a9 100644
--- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java
+++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/Compression.java
@@ -12,11 +12,12 @@ import java.util.zip.ZipOutputStream;
  * @author Tony Vaagenes
  */
 public class Compression {
-    static public void zipDirectory(File dir) throws Exception {
+
+    public static void zipDirectory(File dir, String zipTopLevelDir) throws Exception {
         FileOutputStream zipFile = new FileOutputStream(new File(dir.getParent(), dir.getName() + ".zip"));
         ZipOutputStream zipOutputStream = new ZipOutputStream(zipFile);
         try {
-            addDirectory(zipOutputStream, dir.getName(), dir, "");
+            addDirectory(zipOutputStream, zipTopLevelDir, dir, "");
         } finally {
             zipOutputStream.close();
         }
-- 
cgit v1.2.3