WillemJiang closed pull request #155: [SCB-404] Use different base folder for source and binary package URL: https://github.com/apache/incubator-servicecomb-saga/pull/155
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/saga-distribution/src/assembly/bin.xml b/saga-distribution/src/assembly/bin.xml index c7858153..d51514aa 100644 --- a/saga-distribution/src/assembly/bin.xml +++ b/saga-distribution/src/assembly/bin.xml @@ -17,7 +17,8 @@ <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>${project.build.finalName}-bin</baseDirectory> <id>bin</id> <formats> <format>zip</format> @@ -25,7 +26,7 @@ <fileSets> <fileSet> <directory>../saga-demo</directory> - <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}/saga-demo</outputDirectory> + <outputDirectory>/saga-demo</outputDirectory> <excludes> <exclude>**/*.iml</exclude> <exclude>**/eclipse-classes/**</exclude> @@ -39,11 +40,11 @@ </fileSet> <fileSet> <directory>../docs</directory> - <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}/docs</outputDirectory> + <outputDirectory>/docs</outputDirectory> </fileSet> <fileSet> <directory>../</directory> - <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}</outputDirectory> + <outputDirectory>/</outputDirectory> <includes> <include>DISCLAIMER</include> @@ -54,7 +55,7 @@ <!-- include the NOTICE and LICENSE file from release directory --> <fileSet> <directory>src/release</directory> - <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}</outputDirectory> + <outputDirectory>/</outputDirectory> <includes> <include>NOTICE</include> <include>LICENSE</include> @@ -64,7 +65,7 @@ <!-- include alpha server exec into bin directory --> <fileSet> <directory>../alpha/alpha-server/target/saga/</directory> - <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}</outputDirectory> + <outputDirectory>/</outputDirectory> <includes> <include>alpha-server-${project.version}-exec.jar</include> </includes> @@ -75,7 +76,7 @@ <dependencySet> <useProjectArtifact>true</useProjectArtifact> <unpack>false</unpack> - <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}/libs</outputDirectory> + <outputDirectory>/libs</outputDirectory> <scope>runtime</scope> </dependencySet> </dependencySets> diff --git a/saga-distribution/src/assembly/src.xml b/saga-distribution/src/assembly/src.xml index 717fdf6c..305712f9 100644 --- a/saga-distribution/src/assembly/src.xml +++ b/saga-distribution/src/assembly/src.xml @@ -22,6 +22,8 @@ <formats> <format>zip</format> </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>${project.build.finalName}-src</baseDirectory> <fileSets> <!-- Binary Files --> <fileSet> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
