You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/03/15 08:30:42 UTC
[incubator-servicecomb-java-chassis] branch master updated: SCB-404
Use different base folder for source/binary package (#601)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 539e940 SCB-404 Use different base folder for source/binary package (#601)
539e940 is described below
commit 539e940c926d57495b3d16eb24d5ccd04d3720a7
Author: Yang, Bo <oa...@gmail.com>
AuthorDate: Thu Mar 15 16:30:40 2018 +0800
SCB-404 Use different base folder for source/binary package (#601)
---
java-chassis-distribution/src/assembly/bin.xml | 11 ++++++-----
java-chassis-distribution/src/assembly/src.xml | 2 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java-chassis-distribution/src/assembly/bin.xml b/java-chassis-distribution/src/assembly/bin.xml
index 9cd89e2..cc9093f 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 522c75b..a8b9f05 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>
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.