Skip to content

Commit 57dff30

Browse files
author
liyue25
committed
Merge branch 'pre_release' into '4.1.0-SNAPSHOT'
Pre release See merge request laf/journalQ!256
2 parents 3554a6a + 3e7bfeb commit 57dff30

File tree

100 files changed

+366
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+366
-232
lines changed

‎docker/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<artifactId>joyqueue</artifactId>
2020
<groupId>com.jd.joyqueue</groupId>
21-
<version>4.1.0-SNAPSHOT</version>
21+
<version>4.1.0</version>
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>
2424
<artifactId>joyqueue-docker</artifactId>

‎docker/server/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>joyqueue-docker</artifactId>
2222
<groupId>com.jd.joyqueue</groupId>
23-
<version>4.1.0-SNAPSHOT</version>
23+
<version>4.1.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>docker-server</artifactId>

‎docker/web/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>joyqueue-docker</artifactId>
2222
<groupId>com.jd.joyqueue</groupId>
23-
<version>4.1.0-SNAPSHOT</version>
23+
<version>4.1.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>docker-web</artifactId>

‎docs/cn/client.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ JoyQueue 支持Openmessaging协议，并提供Java版本的原生客户端。此
1414
<dependency>
1515
<groupId>com.jd.joyqueue</groupId>
1616
<artifactId>joyqueue-client-all</artifactId>
17-
<version>4.1.0-SNAPSHOT</version>
17+
<version>4.1.0</version>
1818
</dependency>
1919
```
2020

@@ -238,7 +238,7 @@ public class JoyQueueSimpleProducerInterceptor implements ProducerInterceptor, O
238238
<dependency>
239239
<groupId>com.jd.joyqueue</groupId>
240240
<artifactId>joyqueue-client-all</artifactId>
241-
<version>4.1.0-SNAPSHOT</version>
241+
<version>4.1.0</version>
242242
</dependency>
243243
<dependency>
244244
<groupId>io.openmessaging</groupId>
@@ -313,7 +313,7 @@ public class SimpleMessageListener implements MessageListener {
313313
<dependency>
314314
<groupId>com.jd.joyqueue</groupId>
315315
<artifactId>joyqueue-client-all</artifactId>
316-
<version>4.1.0-SNAPSHOT</version>
316+
<version>4.1.0</version>
317317
</dependency>
318318
<dependency>
319319
<groupId>io.openmessaging</groupId>

‎docs/cn/quickstart.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 25.202-b08, mixed mode)
2222
使用`server-start.sh`命令启动消息服务实例:
2323

2424
```bash
25-
$ joyqueue-server-4.1.0-SNAPSHOT/bin/server-start.sh
25+
$ joyqueue-server-4.1.0/bin/server-start.sh
2626

2727
......
2828

@@ -34,7 +34,7 @@ $ joyqueue-server-4.1.0-SNAPSHOT/bin/server-start.sh
3434
\___/ \___/ \__, |\__\_\\__,_|\___|\__,_|\___|
3535
|___/
3636

37-
ver. 4.1.0-SNAPSHOT
37+
ver. 4.1.0
3838

3939
[19:17:13:183] [main] [INFO] - com.jd.joyqueue.broker.Launcher.main(Launcher.java:35) - JoyQueue is started
4040
......
@@ -50,7 +50,7 @@ JoyQueue Web，默认连接本机的JoyQueue Server。如果JoyQueue Web与JoyQu
5050

5151
```bash
5252

53-
$ joyqueue-web-4.1.0-SNAPSHOT/bin/start.sh
53+
$ joyqueue-web-4.1.0/bin/start.sh
5454

5555
......
5656
2019-07-09 13:04:25.319 [main] INFO com.jd.laf.web.vertx.spring.SpringVertx - success starting Vert.x
@@ -92,7 +92,7 @@ $ joyqueue-web-4.1.0-SNAPSHOT/bin/start.sh
9292

9393
```bash
9494

95-
$ joyqueue-server-4.1.0-SNAPSHOT/bin/console-producer.sh -a joyqueue --token a768388469e144b0b6cbe87a6e339a3c -t joy_topic -b "Hello,JoyQueue"
95+
$ joyqueue-server-4.1.0/bin/console-producer.sh -a joyqueue --token a768388469e144b0b6cbe87a6e339a3c -t joy_topic -b "Hello,JoyQueue"
9696

9797
```
9898

@@ -101,7 +101,7 @@ $ joyqueue-web-4.1.0-SNAPSHOT/bin/start.sh
101101
使用`console-consumer.sh`来接收消息：
102102

103103
```bash
104-
$ joyqueue-server-4.1.0-SNAPSHOT/bin/console-consumer.sh -a joyqueue --token a768388469e144b0b6cbe87a6e339a3c -t joy_topic
104+
$ joyqueue-server-4.1.0/bin/console-consumer.sh -a joyqueue --token a768388469e144b0b6cbe87a6e339a3c -t joy_topic
105105

106106
Message{topic: joy_topic, partition: 0, index: 0, txId: null, key: null, body: Hello,JoyQueue}
107107
```

‎joyqueue-client/joyqueue-client-all-shaded/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>joyqueue-client</artifactId>
2222
<groupId>com.jd.joyqueue</groupId>
23-
<version>4.1.0-SNAPSHOT</version>
23+
<version>4.1.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎joyqueue-client/joyqueue-client-all-shaded/src/main/java/com/jd/joyqueue/FakeAllShade.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* Licensed under the Apache License, Version 2.0 (the "License");
3+
* you may not use this file except in compliance with the License.
4+
* You may obtain a copy of the License at
5+
*
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
13+
*/
14+
package com.jd.joyqueue;
15+
16+
/**
17+
* To avoid javadoc error
18+
**/
19+
public class FakeAllShade {
20+
}

‎joyqueue-client/joyqueue-client-all/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>joyqueue-client</artifactId>
2222
<groupId>com.jd.joyqueue</groupId>
23-
<version>4.1.0-SNAPSHOT</version>
23+
<version>4.1.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎joyqueue-client/joyqueue-client-all/src/main/java/com/jd/joyqueue/FakeAll.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* Licensed under the Apache License, Version 2.0 (the "License");
3+
* you may not use this file except in compliance with the License.
4+
* You may obtain a copy of the License at
5+
*
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
13+
*/
14+
package com.jd.joyqueue;
15+
16+
/**
17+
*
18+
* To avoid javadoc error
19+
*
20+
**/
21+
public class FakeAll {
22+
23+
}

‎joyqueue-client/joyqueue-client-core-shaded/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>joyqueue-client</artifactId>
2222
<groupId>com.jd.joyqueue</groupId>
23-
<version>4.1.0-SNAPSHOT</version>
23+
<version>4.1.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

0 commit comments

Comments
 (0)