Merge remote-tracking branch 'origin/3.2.5'
# Conflicts:
# README.md
# pom.xml
diff --git a/LICENSE b/LICENSE
index 685172e..ac7ab55 100644
--- a/LICENSE
+++ b/LICENSE
@@ -255,21 +255,3 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-For the com.alibaba.dubbo.common.concurrent package:
-
-This product bundles and repackages the following code in Google Guava 16.0.1, which is available under a
-"Apache License 2.0" license. For details, see https://github.com/google/guava/blob/v16.0.1/COPYING.
-
- * com.google.common.util.concurrent.ExecutionList
- * com.google.common.util.concurrent.ListenableFuture
- * com.google.common.util.concurrent.ListenableFutureTask
-
-For the package com.alibaba.dubbo.common.threadlocal:
-
-This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also
- under a "Apache License 2.0" license, see https://github.com/netty/netty/blob/4.1/LICENSE.txt:
-
- * io.netty.util.concurrent.FastThreadLocal
- * io.netty.util.internal.InternalThreadLocalMap
-
diff --git a/pom.xml b/pom.xml
index 208810e..88ac24d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
<groupId>com.alibaba</groupId>
<artifactId>hessian-lite</artifactId>
<packaging>jar</packaging>
- <version>3.2.7-SNAPSHOT</version>
+ <version>3.2.5</version>
<name>Hessian Lite(Alibaba embed version)</name>
<properties>
@@ -54,6 +60,64 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <doclint>none</doclint>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <show>public</show>
+ <charset>UTF-8</charset>
+ <encoding>UTF-8</encoding>
+ <docencoding>UTF-8</docencoding>
+ <links>
+ <link>http://docs.oracle.com/javase/7/docs/api</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -87,4 +151,58 @@
</plugin>
</plugins>
</build>
+
+ <url>https://github.com/dubbo/hessian-lite</url>
+ <inceptionYear>2011</inceptionYear>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <url>https://github.com/dubbo/hessian-lite</url>
+ <connection>scm:git:https://github.com/dubbo/hessian-lite.git</connection>
+ <developerConnection>scm:git:https://github.com/dubbo/hessian-lite.git</developerConnection>
+ </scm>
+ <mailingLists>
+ <mailingList>
+ <name>Development List</name>
+ <subscribe>dev-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>dev@dubbo.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Commits List</name>
+ <subscribe>commits-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>commits@dubbo.apache.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Issues List</name>
+ <subscribe>issues-subscribe@dubbo.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe@dubbo.apache.org</unsubscribe>
+ <post>issues@dubbo.apache.org</post>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>dubbo.io</id>
+ <name>The Dubbo Project Contributors</name>
+ <email>dev-subscribe@dubbo.apache.org</email>
+ <url>http://dubbo.apache.org/</url>
+ </developer>
+ </developers>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <issueManagement>
+ <system>Github Issues</system>
+ <url>https://github.com/dubbo/hessian-lite/issues</url>
+ </issueManagement>
</project>
