You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/01/16 13:10:55 UTC
[2/3] incubator-rocketmq git commit: [ROCKETMQ-62] Polish Maven
assembly release
[ROCKETMQ-62] Polish Maven assembly release
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/026efc2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/026efc2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/026efc2b
Branch: refs/heads/master
Commit: 026efc2b8a674ff56565be47ed847c033c65a139
Parents: 91675ef
Author: yukon <yu...@apache.org>
Authored: Mon Jan 16 16:27:10 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Mon Jan 16 17:55:35 2017 +0800
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/026efc2b/client/deploy.bat
----------------------------------------------------------------------
diff --git a/client/deploy.bat b/client/deploy.bat
deleted file mode 100644
index ffc2144..0000000
--- 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
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/026efc2b/client/install.bat
----------------------------------------------------------------------
diff --git a/client/install.bat b/client/install.bat
deleted file mode 100644
index 31efffd..0000000
--- 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
-
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/026efc2b/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 212804a..1adfb6e 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>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/026efc2b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9484b0f..dbd43ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,29 +236,6 @@
</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>
<configuration>
@@ -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>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/026efc2b/release-client.xml
----------------------------------------------------------------------
diff --git a/release-client.xml b/release-client.xml
index b9f4073..949e81b 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>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/026efc2b/release.xml
----------------------------------------------------------------------
diff --git a/release.xml b/release.xml
index 40a56df..decb512 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>