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:54 UTC
[1/3] incubator-rocketmq git commit: [ROCKETMQ-62] Polish assembly
release package structure
Repository: incubator-rocketmq
Updated Branches:
refs/heads/master 91675effe -> d695fd756
[ROCKETMQ-62] Polish assembly release package structure
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/3968998b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/3968998b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/3968998b
Branch: refs/heads/master
Commit: 3968998b6c1ac030841f591316ccf790c7f11dc9
Parents: 026efc2
Author: yukon <yu...@apache.org>
Authored: Mon Jan 16 17:55:22 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Mon Jan 16 17:55:35 2017 +0800
----------------------------------------------------------------------
pom.xml | 2 +-
release-client.xml | 2 +-
release.xml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/3968998b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dbd43ca..91ad94c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -377,7 +377,7 @@
</build>
</profile>
<profile>
- <id>release-server</id>
+ <id>release-all</id>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/3968998b/release-client.xml
----------------------------------------------------------------------
diff --git a/release-client.xml b/release-client.xml
index 949e81b..716be66 100644
--- a/release-client.xml
+++ b/release-client.xml
@@ -18,7 +18,7 @@
<assembly>
<id>client</id>
- <baseDirectory>apache-rocketmq</baseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<format>tar.gz</format>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/3968998b/release.xml
----------------------------------------------------------------------
diff --git a/release.xml b/release.xml
index decb512..032770e 100644
--- a/release.xml
+++ b/release.xml
@@ -17,8 +17,8 @@
-->
<assembly>
- <id>server</id>
- <baseDirectory>apache-rocketmq</baseDirectory>
+ <id>all</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<format>tar.gz</format>
[2/3] incubator-rocketmq git commit: [ROCKETMQ-62] Polish Maven
assembly release
Posted by yu...@apache.org.
[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>
[3/3] incubator-rocketmq git commit: [ROCKETMQ-62] Polish unit test
related dependency
Posted by yu...@apache.org.
[ROCKETMQ-62] Polish unit test related dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/d695fd75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/d695fd75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/d695fd75
Branch: refs/heads/master
Commit: d695fd756e05c1e25e5c9d48e69ef8c5b1ce8db4
Parents: 3968998
Author: yukon <yu...@apache.org>
Authored: Mon Jan 16 21:08:29 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Mon Jan 16 21:08:29 2017 +0800
----------------------------------------------------------------------
broker/pom.xml | 10 ----------
client/pom.xml | 5 -----
common/pom.xml | 5 -----
example/pom.xml | 5 -----
filtersrv/pom.xml | 5 -----
namesrv/pom.xml | 5 -----
pom.xml | 43 ++++++++++++++++++++++++++-----------------
remoting/pom.xml | 10 ----------
srvutil/pom.xml | 5 -----
store/pom.xml | 5 -----
tools/pom.xml | 5 -----
11 files changed, 26 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/broker/pom.xml
----------------------------------------------------------------------
diff --git a/broker/pom.xml b/broker/pom.xml
index fae61c2..91cfe0c 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -30,16 +30,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <!--<dependency>-->
- <!--<groupId>commons-beanutils</groupId>-->
- <!--<artifactId>commons-beanutils</artifactId>-->
- <!--<version>1.9.2</version>-->
- <!--</dependency>-->
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-common</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 1adfb6e..713523d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-common</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 2e41f2f..549dad9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-remoting</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/example/pom.xml
----------------------------------------------------------------------
diff --git a/example/pom.xml b/example/pom.xml
index 3e82297..c6dbf67 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -30,11 +30,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/filtersrv/pom.xml
----------------------------------------------------------------------
diff --git a/filtersrv/pom.xml b/filtersrv/pom.xml
index 1a8bf8b..b031357 100644
--- a/filtersrv/pom.xml
+++ b/filtersrv/pom.xml
@@ -30,11 +30,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/namesrv/pom.xml
----------------------------------------------------------------------
diff --git a/namesrv/pom.xml b/namesrv/pom.xml
index 87d33de..c505bfc 100644
--- a/namesrv/pom.xml
+++ b/namesrv/pom.xml
@@ -30,11 +30,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91ad94c..ca7ea1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,6 +411,27 @@
</profile>
</profiles>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>2.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.6.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -464,18 +485,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>2.6.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
@@ -511,15 +520,15 @@
<version>3.20.0-GA</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.4</version>
- </dependency>
- <dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>4.2.2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/remoting/pom.xml
----------------------------------------------------------------------
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 050be17..df46c35 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -31,16 +31,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/srvutil/pom.xml
----------------------------------------------------------------------
diff --git a/srvutil/pom.xml b/srvutil/pom.xml
index ef01639..4850b1e 100644
--- a/srvutil/pom.xml
+++ b/srvutil/pom.xml
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-remoting</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/store/pom.xml
----------------------------------------------------------------------
diff --git a/store/pom.xml b/store/pom.xml
index 8438f8c..083d414 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -38,11 +38,6 @@
<artifactId>jna</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/d695fd75/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index 506c473..0e99f9c 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -30,11 +30,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-client</artifactId>
</dependency>