WillemJiang closed pull request #601: [SCB-404] Use different base folder for source/binary package URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/601
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/java-chassis-distribution/src/assembly/bin.xml b/java-chassis-distribution/src/assembly/bin.xml index 9cd89e2b9..cc9093f9d 100644 --- a/java-chassis-distribution/src/assembly/bin.xml +++ b/java-chassis-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>../samples</directory> - <outputDirectory>apache-servicecomb-incubating-java-chassis-distribution-${project.version}/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <excludes> <exclude>**/*.iml</exclude> <exclude>**/eclipse-classes/**</exclude> @@ -41,7 +42,7 @@ </fileSet> <fileSet> <directory>../</directory> - <outputDirectory>apache-servicecomb-incubating-java-chassis-distribution-${project.version}</outputDirectory> + <outputDirectory>/</outputDirectory> <includes> <include>DISCLAIMER</include> <include>README.md</include> @@ -49,7 +50,7 @@ </fileSet> <fileSet> <directory>src/release</directory> - <outputDirectory>apache-servicecomb-incubating-java-chassis-distribution-${project.version}</outputDirectory> + <outputDirectory>/</outputDirectory> <includes> <include>NOTICE</include> <include>LICENSE</include> @@ -61,7 +62,7 @@ <dependencySet> <useProjectArtifact>true</useProjectArtifact> <unpack>false</unpack> - <outputDirectory>apache-servicecomb-incubating-java-chassis-distribution-${project.version}/libs</outputDirectory> + <outputDirectory>/libs</outputDirectory> <scope>runtime</scope> </dependencySet> </dependencySets> diff --git a/java-chassis-distribution/src/assembly/src.xml b/java-chassis-distribution/src/assembly/src.xml index 522c75be3..a8b9f05c5 100644 --- a/java-chassis-distribution/src/assembly/src.xml +++ b/java-chassis-distribution/src/assembly/src.xml @@ -18,6 +18,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";> <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>${project.build.finalName}-src</baseDirectory> <formats> <format>zip</format> </formats> ---------------------------------------------------------------- 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
