#513 fix saturn:zip problem

vipshop · Oct 15, 2018 · 955da86 · 955da86
1 parent e72c70f
commit 955da86
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/saturn-plugin/src/main/java/com/vip/saturn/job/plugin/maven/SaturnJobRunMojo.java b/saturn-plugin/src/main/java/com/vip/saturn/job/plugin/maven/SaturnJobRunMojo.java
@@ -153,7 +153,7 @@ private String getSaturnVersion(MavenProject project) throws MojoExecutionExcept
 				}
 			}
 		}
-		throw new MojoExecutionException("cannot read the saturn-job-core dependency.");
+		throw new MojoExecutionException("cannot read the saturn-job-api dependency.");
 	}
 
 	private IvyGetArtifact getIvyGetArtifact(MavenProjectUtils mavenProjectUtils) throws MojoExecutionException {

diff --git a/saturn-plugin/src/main/java/com/vip/saturn/job/plugin/maven/SaturnJobZipMojo.java b/saturn-plugin/src/main/java/com/vip/saturn/job/plugin/maven/SaturnJobZipMojo.java
@@ -76,7 +76,7 @@ private String getSaturnVersion(MavenProject project) throws MojoExecutionExcept
 				}
 			}
 		}
-		throw new MojoExecutionException("cannot read the saturn-job-core dependency.");
+		throw new MojoExecutionException("cannot read the saturn-job-api dependency.");
 	}
 
 }
diff --git a/saturn-plugin/src/main/java/com/vip/saturn/job/plugin/utils/CommonUtils.java b/saturn-plugin/src/main/java/com/vip/saturn/job/plugin/utils/CommonUtils.java
@@ -9,7 +9,6 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
@@ -74,7 +73,7 @@ public static void zip(List<File> runtimeLibFiles, File saturnContainerDir, File
 		 */
 
 		for (File file : runtimeLibFiles) {
-			zip(file, "app" + FILE_SEPARATOR + "lib", zos);
+			zip(file, "app/lib", zos);
 		}
 		zos.close();
 	}
@@ -83,7 +82,7 @@ private static void zip(File file, String parent, ZipOutputStream zos) throws IO
 		if (file == null || !file.exists())
 			return;
 		if (file.isFile()) {
-			String entryName = parent == null ? file.getName() : parent + FILE_SEPARATOR + file.getName();
+			String entryName = parent == null ? file.getName() : parent + "/" + file.getName();
 			zos.putNextEntry(new ZipEntry(entryName));
 			try(FileInputStream fis = new FileInputStream(file)) {
 				int len = -1;
@@ -93,7 +92,7 @@ private static void zip(File file, String parent, ZipOutputStream zos) throws IO
 				}
 			}
 		} else if (file.isDirectory()) {
-			String entryName = parent == null ? file.getName() : parent + FILE_SEPARATOR + file.getName();
+			String entryName = parent == null ? file.getName() : parent + "/" + file.getName();
 			zos.putNextEntry(new ZipEntry(entryName + "/"));
 			File[] listFiles = file.listFiles();
 			if (listFiles != null) {