You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/05/21 14:33:55 UTC
[incubator-dubbo] 02/02: Add source-release assembly config
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.6.2-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 7c07339c55e9790eaed579a3aef93c51de45ab73
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon May 21 22:33:28 2018 +0800
Add source-release assembly config
---
distribution/pom.xml | 18 ++++++++--
.../assembly/{release-bin.xml => bin-release.xml} | 4 +--
.../{release-bin.xml => source-release.xml} | 41 +++++++++++-----------
pom.xml | 27 --------------
4 files changed, 38 insertions(+), 52 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 42ef107..fe9ea25 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -249,21 +249,33 @@
</dependencies>
<build>
- <finalName>dubbo-incubating</finalName>
+ <finalName>dubbo-incubating-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
- <id>release-bin</id>
+ <id>bin-release</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/release-bin.xml</descriptor>
+ <descriptor>src/assembly/bin-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>source-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/source-release.xml</descriptor>
</descriptors>
</configuration>
</execution>
diff --git a/distribution/src/assembly/release-bin.xml b/distribution/src/assembly/bin-release.xml
similarity index 94%
copy from distribution/src/assembly/release-bin.xml
copy to distribution/src/assembly/bin-release.xml
index 5e63907..2146b78 100644
--- a/distribution/src/assembly/release-bin.xml
+++ b/distribution/src/assembly/bin-release.xml
@@ -16,12 +16,12 @@
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>release-bin</id>
+ <id>bin-release</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${project.build.finalName}-${project.version}-bin-release</baseDirectory>
+ <baseDirectory>${project.build.finalName}-bin-release</baseDirectory>
<fileSets>
<fileSet>
<directory>../</directory>
diff --git a/distribution/src/assembly/release-bin.xml b/distribution/src/assembly/source-release.xml
similarity index 61%
rename from distribution/src/assembly/release-bin.xml
rename to distribution/src/assembly/source-release.xml
index 5e63907..d2bc2b7 100644
--- a/distribution/src/assembly/release-bin.xml
+++ b/distribution/src/assembly/source-release.xml
@@ -16,35 +16,36 @@
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>release-bin</id>
+ <id>source-release</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${project.build.finalName}-${project.version}-bin-release</baseDirectory>
+ <baseDirectory>${project.build.finalName}-source-release</baseDirectory>
+
<fileSets>
<fileSet>
<directory>../</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
<includes>
- <include>DISCLAIMER</include>
- <include>NOTICE</include>
- <include>LICENSE</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <unpack>false</unpack>
- <outputDirectory>/libs</outputDirectory>
- <scope>runtime</scope>
- <includes>
- <include>com.alibaba:*</include>
+ <include>**/*</include>
</includes>
<excludes>
- <exclude>com.alibaba:fastjson</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>*.enc</exclude>
+ <exclude>*.gpg</exclude>
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/cobertura.ser</exclude>
</excludes>
- </dependencySet>
- </dependencySets>
+ </fileSet>
+ </fileSets>
</assembly>
diff --git a/pom.xml b/pom.xml
index fd348f2..411db8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -530,33 +530,6 @@
<goals>deploy</goals>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.6</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>source-release</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
--
To stop receiving notification emails like this one, please contact
liujun@apache.org.