From 026efc2b8a674ff56565be47ed847c033c65a139 Mon Sep 17 00:00:00 2001
From: yukon <yukon@apache.org>
Date: Mon, 16 Jan 2017 16:27:10 +0800
Subject: [PATCH] [ROCKETMQ-62] Polish Maven assembly release

---
 client/deploy.bat  | 16 -------------
 client/install.bat | 17 --------------
 client/pom.xml     | 50 -----------------------------------------
 pom.xml            | 56 +++++++++++++++++++++++++++-------------------
 release-client.xml |  2 +-
 release.xml        |  2 +-
 6 files changed, 35 insertions(+), 108 deletions(-)
 delete mode 100644 client/deploy.bat
 delete mode 100644 client/install.bat

diff --git a/client/deploy.bat b/client/deploy.bat
deleted file mode 100644
index ffc21442..00000000
--- a/client/deploy.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements.  See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License.  You may obtain a copy of the License at
-REM
-REM     http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-
-mvn -Dmaven.test.skip=true deploy -Pclient-shade
diff --git a/client/install.bat b/client/install.bat
deleted file mode 100644
index 31efffdf..00000000
--- a/client/install.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements.  See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License.  You may obtain a copy of the License at
-REM
-REM     http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-
-mvn -Dmaven.test.skip=true clean package install -Pclient-shade -U
-
diff --git a/client/pom.xml b/client/pom.xml
index 212804ae..1adfb6ea 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -29,56 +29,6 @@
     <artifactId>rocketmq-client</artifactId>
     <name>rocketmq-client ${project.version}</name>
 
-    <profiles>
-        <profile>
-            <id>client-shade</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-shade-plugin</artifactId>
-                        <version>2.4.3</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>shade</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
-                            <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <minimizeJar>false</minimizeJar>
-                            <createSourcesJar>true</createSourcesJar>
-                            <artifactSet>
-                                <includes>
-                                    <include>com.alibaba:fastjson</include>
-                                    <include>io.netty:netty-all</include>
-                                    <include>org.apache.rocketmq:rocketmq-client</include>
-                                    <include>org.apache.rocketmq:rocketmq-common</include>
-                                    <include>org.apache.rocketmq:rocketmq-remoting</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>io.netty</pattern>
-                                    <shadedPattern>org.apache.rocketmq.shade.io.netty</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.alibaba.fastjson</pattern>
-                                    <shadedPattern>org.apache.rocketmq.shade.com.alibaba.fastjson</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 9484b0fe..dbd43ca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,29 +235,6 @@
                     </includes>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <finalName>apache-rocketmq</finalName>
-                    <descriptors>
-                        <descriptor>release.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
-            <!--
-                        <plugin>
-                            <artifactId>maven-assembly-plugin</artifactId>
-                            <configuration>
-                                <finalName>apache-rocketmq-client-java-${project.version}</finalName>
-                                <descriptors>
-                                    <descriptor>release-client.xml</descriptor>
-                                </descriptors>
-                            </configuration>
-                        </plugin>
-            -->
-
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.10.4</version>
@@ -399,6 +376,39 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>release-server</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.6</version>
+                        <configuration>
+                            <finalName>apache-rocketmq</finalName>
+                            <descriptors>
+                                <descriptor>release.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>release-client</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <configuration>
+                            <finalName>apache-rocketmq</finalName>
+                            <descriptors>
+                                <descriptor>release-client.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <dependencyManagement>
diff --git a/release-client.xml b/release-client.xml
index b9f4073f..949e81b0 100644
--- a/release-client.xml
+++ b/release-client.xml
@@ -18,7 +18,7 @@
 
 <assembly>
     <id>client</id>
-    <baseDirectory>apache-rocketmq-client-java</baseDirectory>
+    <baseDirectory>apache-rocketmq</baseDirectory>
     <formats>
         <format>dir</format>
         <format>tar.gz</format>
diff --git a/release.xml b/release.xml
index 40a56df0..decb5120 100644
--- a/release.xml
+++ b/release.xml
@@ -17,7 +17,7 @@
   -->
 
 <assembly>
-    <id>broker</id>
+    <id>server</id>
     <baseDirectory>apache-rocketmq</baseDirectory>
     <formats>
         <format>dir</format>
-- 
GitLab