Merge remote-tracking branch 'upstream/master'
diff --git a/README.md b/README.md
index 5ee3363..f8edadc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# RocketMQ-Spring [](https://travis-ci.org/apache/rocketmq-spring) [](https://coveralls.io/github/apache/rocketmq-spring?branch=master)
-[](http://search.maven.org/#search%7Cga%7C1%7Cg:org.apache.rocketmq)
+[](https://search.maven.org/search?q=g:org.apache.rocketmq%20AND%20a:rocketmq-spring-all)
[](https://github.com/apache/rocketmq-spring/releases)
[](https://www.apache.org/licenses/LICENSE-2.0.html)
@@ -44,7 +44,7 @@
Please see the complete sample [rocketmq-spring-boot-samples](rocketmq-spring-boot-samples)
-Note: Current RELEASE.VERSION=2.0.2
+Note: Current RELEASE.VERSION=2.0.3
```xml
<!--add dependency in pom.xml-->
@@ -121,10 +121,10 @@
public void run(String... args) throws Exception {
try {
// Build a SpringMessage for sending in transaction
- Message msg = MessageBuilder.withPayload(..)...
+ Message msg = MessageBuilder.withPayload(..)...;
// In sendMessageInTransaction(), the first parameter transaction name ("test")
// must be same with the @RocketMQTransactionListener's member field 'transName'
- rocketMQTemplate.sendMessageInTransaction("test", "test-topic" msg, null);
+ rocketMQTemplate.sendMessageInTransaction("test", "test-topic", msg, null);
} catch (MQClientException e) {
e.printStackTrace(System.out);
}
@@ -385,7 +385,7 @@
// Step2. Use the extra RocketMQTemplate. e.g.
@Resource(name = "extRocketMQTemplate") // Must define the name to qualify to extra-defined RocketMQTemplate bean.
- private RocketMQTemplate extRocketMQTemplate;
+ private RocketMQTemplate extRocketMQTemplate;
// you can use the template as normal.
```
diff --git a/README_zh_CN.md b/README_zh_CN.md
index e5f075f..fe26aa8 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -1,6 +1,6 @@
# RocketMQ-Spring [](https://travis-ci.org/apache/rocketmq-spring)
-[](http://search.maven.org/#search%7Cga%7C1%7Cg:org.apache.rocketmq)
+[](https://search.maven.org/search?q=g:org.apache.rocketmq%20AND%20a:rocketmq-spring-all)
[](https://github.com/apache/rocketmq-spring/releases)
[](https://www.apache.org/licenses/LICENSE-2.0.html)
@@ -35,7 +35,7 @@
下面列出来了一些关键点，完整的示例请参考： [rocketmq-spring-boot-samples](rocketmq-spring-boot-samples)
-注意:当前的RELEASE.VERSION=2.0.1
+注意:当前的RELEASE.VERSION=2.0.3
```xml
<!--在pom.xml中添加依赖-->
diff --git a/pom.xml b/pom.xml
index d874f3d..921d16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-all</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache RocketMQ Spring Boot ${project.version}</name>
diff --git a/rocketmq-spring-boot-parent/pom.xml b/rocketmq-spring-boot-parent/pom.xml
index 8b5b54b..3c66f18 100644
--- a/rocketmq-spring-boot-parent/pom.xml
+++ b/rocketmq-spring-boot-parent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-all</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -38,9 +38,9 @@
<spring.boot.version>2.0.5.RELEASE</spring.boot.version>
<spring.version>5.1.0.RELEASE</spring.version>
- <rocketmq.spring.boot.version>2.0.3-SNAPSHOT</rocketmq.spring.boot.version>
+ <rocketmq.spring.boot.version>2.0.4-SNAPSHOT</rocketmq.spring.boot.version>
- <rocketmq-version>4.4.0</rocketmq-version>
+ <rocketmq-version>4.5.1</rocketmq-version>
<slf4j.version>1.7.25</slf4j.version>
<jackson.version>2.9.7</jackson.version>
diff --git a/rocketmq-spring-boot-samples/pom.xml b/rocketmq-spring-boot-samples/pom.xml
index 63a080f..c513a5d 100644
--- a/rocketmq-spring-boot-samples/pom.xml
+++ b/rocketmq-spring-boot-samples/pom.xml
@@ -33,10 +33,12 @@
<modules>
<module>rocketmq-produce-demo</module>
<module>rocketmq-consume-demo</module>
+ <module>rocketmq-produce-acl-demo</module>
+ <module>rocketmq-consume-acl-demo</module>
</modules>
<properties>
- <rocketmq-spring-boot-starter-version>2.0.3-SNAPSHOT</rocketmq-spring-boot-starter-version>
+ <rocketmq-spring-boot-starter-version>2.0.4-SNAPSHOT</rocketmq-spring-boot-starter-version>
</properties>
<dependencies>
diff --git a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
index fdddffd..fe99d38 100644
--- a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
+++ b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
@@ -30,7 +30,7 @@
consumerGroup = "group_define_in_Aliware_MQ"
//accessKey = "AK" // It will read by `rocketmq.consumer.access-key` key
//secretKey = "SK" // It will read by `rocketmq.consumer.access-key` key
-)
+ )
public class ACLStringConsumer implements RocketMQListener<String> {
@Override
public void onMessage(String message) {
diff --git a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
index d815e8c..342f44b 100644
--- a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
+++ b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
@@ -30,7 +30,7 @@
consumerGroup = "group_define_in_Aliware_MQ",
accessKey = "AK", // if accessKey is empty, it will read by `rocketmq.consumer.access-key` key
secretKey = "SK" // if accessKey is empty, it will read by `rocketmq.consumer.secret-key` key
-)
+ )
public class ACLStringTransactionalConsumer implements RocketMQListener<String> {
@Override
public void onMessage(String message) {
diff --git a/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerACLApplication.java b/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerACLApplication.java
index 0796c5e..1c40354 100644
--- a/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerACLApplication.java
+++ b/rocketmq-spring-boot-samples/rocketmq-produce-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerACLApplication.java
@@ -91,7 +91,7 @@
txProducerGroup = TX_PGROUP_NAME,
accessKey = "AK", // if not setting, it will read by `rocketmq.producer.access-key` key
secretKey = "SK" // if not setting, it will read by `rocketmq.producer.secret-key` key
- )
+ )
class TransactionListenerImpl implements RocketMQLocalTransactionListener {
private AtomicInteger transactionIndex = new AtomicInteger(0);
diff --git a/rocketmq-spring-boot-starter/pom.xml b/rocketmq-spring-boot-starter/pom.xml
index 14cf25e..5392ec8 100644
--- a/rocketmq-spring-boot-starter/pom.xml
+++ b/rocketmq-spring-boot-starter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-parent</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
<relativePath>../rocketmq-spring-boot-parent/pom.xml</relativePath>
</parent>
diff --git a/rocketmq-spring-boot/pom.xml b/rocketmq-spring-boot/pom.xml
index 914d35e..289a53f 100644
--- a/rocketmq-spring-boot/pom.xml
+++ b/rocketmq-spring-boot/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-parent</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
<relativePath>../rocketmq-spring-boot-parent/pom.xml</relativePath>
</parent>
