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
The following commit(s) were added to refs/heads/2.6.2-release by this push:
new 7c90490 Support package NOTICE & LICENSE into sub-module jar.
7c90490 is described below
commit 7c90490f3855d95e507ee9598b2caf8876208fc1
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Mon May 14 20:20:35 2018 +0800
Support package NOTICE & LICENSE into sub-module jar.
---
distribution/pom.xml | 89 ++--------------------
distribution/src/assembly/release-bin.xml | 21 +----
.../dubbo/internal/com.alibaba.dubbo.rpc.Protocol | 2 +-
pom.xml | 52 ++++++++++++-
4 files changed, 58 insertions(+), 106 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 555d119..a7b53bb 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -35,295 +35,216 @@
<groupId>com.alibaba</groupId>
<artifactId>dubbo-cluster</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-common</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-config-spring</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter-cache</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-filter-validation</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting-netty</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting-netty4</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting-mina</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting-grizzly</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting-p2p</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-remoting-http</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-dubbo</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-injvm</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-rmi</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-hessian</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-http</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-webservice</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-thrift</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-memcached</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-redis</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-rpc-rest</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry-default</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry-multicast</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry-zookeeper</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-registry-redis</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-monitor-default</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container-spring</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container-log4j</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-container-logback</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-qos</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-serialization-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-serialization-fastjson</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-serialization-fst</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-serialization-hessian2</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-serialization-jdk</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo-serialization-kryo</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>hessian-lite</artifactId>
<version>3.2.2</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
</dependencies>
diff --git a/distribution/src/assembly/release-bin.xml
b/distribution/src/assembly/release-bin.xml
index 059079d..5e63907 100644
--- a/distribution/src/assembly/release-bin.xml
+++ b/distribution/src/assembly/release-bin.xml
@@ -32,6 +32,7 @@
</includes>
</fileSet>
</fileSets>
+
<dependencySets>
<dependencySet>
<useProjectArtifact>true</useProjectArtifact>
@@ -41,23 +42,9 @@
<includes>
<include>com.alibaba:*</include>
</includes>
+ <excludes>
+ <exclude>com.alibaba:fastjson</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
- <!--<moduleSets>-->
- <!--<moduleSet>-->
-
<!--<!–<useAllReactorProjects>true</useAllReactorProjects>–>-->
- <!--<includes>-->
- <!--<include>*:jar:*</include>-->
- <!--</includes>-->
- <!--<binaries>-->
- <!--<outputDirectory>lib/</outputDirectory>-->
- <!--<unpack>false</unpack>-->
- <!--<dependencySets>-->
- <!--<dependencySet>-->
- <!--<outputDirectory>lib/</outputDirectory>-->
- <!--</dependencySet>-->
- <!--</dependencySets>-->
- <!--</binaries>-->
- <!--</moduleSet>-->
- <!--</moduleSets>-->
</assembly>
diff --git
a/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol
b/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol
index 6cc8119..e4588f2 100644
---
a/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol
+++
b/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol
@@ -1 +1 @@
-memcached=com.alibaba.dubbo.rpc.protocol.memcached.MemcachedProtocol
+memcached=com.alibaba.dubbo.rpc.protocol.memcached.MemcachedProtocol
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 17f8586..d8ef21b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,6 +304,31 @@
</profiles>
<build>
+ <!-- Used for packaging NOTICE & LICENSE to each sub-module jar-->
+ <resources>
+ <resource>
+ <directory>src/main/resources/</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>../</directory>
+ <targetPath>META-INF/</targetPath>
+ <filtering>false</filtering>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF/</targetPath>
+ <filtering>false</filtering>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
@@ -494,6 +519,29 @@
</execution>
</executions>
</plugin>
+ <!--<plugin>-->
+ <!--<artifactId>maven-resources-plugin</artifactId>-->
+ <!--<version>3.0.1</version>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>copy-resources</id>-->
+ <!--<!– here the phase you need –>-->
+ <!--<phase>validate</phase>-->
+ <!--<goals>-->
+ <!--<goal>copy-resources</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<outputDirectory>MATE-INF/</outputDirectory>-->
+ <!--<resources>-->
+ <!--<resource>-->
+ <!--<directory>src/non-packaged-resources</directory>-->
+ <!--<filtering>true</filtering>-->
+ <!--</resource>-->
+ <!--</resources>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
</plugins>
<pluginManagement>
@@ -513,10 +561,6 @@
<version>3.0.0</version>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
- <plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
<version>1.2.4</version>
--
To stop receiving notification emails like this one, please contact
liu...@apache.org.
