统一assembly插件写法

gaigaidshijie · Sep 5, 2018 · 1802429 · 1802429
1 parent 14ccca2
commit 1802429
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/vjmap/src/main/assembly/distribution.xml b/vjmap/src/main/assembly/distribution.xml
@@ -1,13 +1,14 @@
 <assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 
 	<id>zip</id>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<baseDirectory>${project.artifactId}</baseDirectory>
+
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>/</outputDirectory>
@@ -17,6 +18,7 @@
 			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
 		</dependencySet>
 	</dependencySets>
+
 	<files>
 		<file>
 			<source>src/main/assembly/vjmap.sh</source>

diff --git a/vjmxcli/pom.xml b/vjmxcli/pom.xml
@@ -49,7 +49,7 @@
 				<version>2.6</version>
 				<configuration>
 					<descriptors>
-						<descriptor>src/main/assembly/zip.xml</descriptor>
+						<descriptor>src/main/assembly/distribution.xml</descriptor>
 					</descriptors>
 					<appendAssemblyId>false</appendAssemblyId>
 				</configuration>
@@ -101,6 +101,7 @@
 							</execution>
 						</executions>
 					</plugin>
+
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-release-plugin</artifactId>
@@ -158,7 +159,7 @@
   </scm>
 
 	<developers>
-		<!--not noly me, write a name here just for sonatype requirement -->
+		<!--not just me, write a name here just for sonatype requirement -->
 		<developer>
 			<id>calvin</id>
 			<name>Calvin Xiao</name>

diff --git a/vjmxcli/src/main/assembly/zip.xml → vjmxcli/src/main/assembly/distribution.xml b/vjmxcli/src/main/assembly/zip.xml → vjmxcli/src/main/assembly/distribution.xml
@@ -1,10 +1,10 @@
 <assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 
 	<id>zip</id>
-	<baseDirectory>${project.build.finalName}</baseDirectory>
+	<baseDirectory>${project.artifactId}</baseDirectory>
 	<formats>
 		<format>zip</format>
 	</formats>
@@ -28,12 +28,16 @@
 			<filtered>true</filtered>
 			<lineEnding>unix</lineEnding>
 		</file>
+		<file>
+			<source>src/main/assembly/vjmxcli.sh</source>
+			<outputDirectory>/</outputDirectory>
+			<lineEnding>windows</lineEnding>
+		</file>
 		<file>
 			<source>README.md</source>
 			<outputDirectory>/</outputDirectory>
 			<destName>README.md</destName>
 			<lineEnding>unix</lineEnding>
 		</file>
-
 	</files>
 </assembly>