Skip to content

Commit d80c72d

Browse files
AntsthebulAntsthebul
authored
Merge branch 'main' into fix_table_popup
2 parents 4ebc324 + 3c4a0c3 commit d80c72d

File tree

13 files changed

+237
-158
lines changed

13 files changed

+237
-158
lines changed

‎.github/dependabot.yaml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,46 @@ updates:
2626
schedule:
2727
interval: "daily"
2828
target-branch: "v3.8.x"
29+
# Maintain dependencies for Java test projects
30+
- package-ecosystem: "maven"
31+
directory: "/deps/rabbitmq_mqtt/test/java_SUITE_data"
32+
schedule:
33+
interval: "daily"
34+
target-branch: "main"
35+
ignore:
36+
- dependency-name: "ch.qos.logback:logback-classic"
37+
versions: [ "[1.3,)" ]
38+
- package-ecosystem: "maven"
39+
directory: "deps/rabbitmq_stream/test/rabbit_stream_SUITE_data"
40+
schedule:
41+
interval: "daily"
42+
target-branch: "main"
43+
ignore:
44+
- dependency-name: "ch.qos.logback:logback-classic"
45+
versions: [ "[1.3,)" ]
46+
- package-ecosystem: "maven"
47+
directory: "deps/rabbitmq_stream_management/test/http_SUITE_data"
48+
schedule:
49+
interval: "daily"
50+
target-branch: "main"
51+
ignore:
52+
- dependency-name: "ch.qos.logback:logback-classic"
53+
versions: [ "[1.3,)" ]
54+
- package-ecosystem: "maven"
55+
directory: "deps/rabbitmq_amqp1_0/test/system_SUITE_data/java-tests"
56+
schedule:
57+
interval: "daily"
58+
target-branch: "main"
59+
ignore:
60+
- dependency-name: "ch.qos.logback:logback-classic"
61+
versions: [ "[1.3,)" ]
62+
- package-ecosystem: "maven"
63+
directory: "deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot"
64+
schedule:
65+
interval: "daily"
66+
target-branch: "main"
67+
- package-ecosystem: "maven"
68+
directory: "deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot_kotlin"
69+
schedule:
70+
interval: "daily"
71+
target-branch: "main"

‎MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ erlang_config.internal_erlang_from_github_release(
7272

7373
erlang_config.internal_erlang_from_github_release(
7474
name = "25_3",
75-
sha256 = "83a36f3d90deef36adb615bbfb46cd327f0b76b7668e1f7f253fd66b4ae24518",
76-
version = "25.3.2.2",
75+
sha256 = "8c1e8811201d1e9cc806b74393db16e89a119f412e16bb5f6181d54cd102eb4f",
76+
version = "25.3.2.3",
7777
)
7878

7979
erlang_config.internal_erlang_from_github_release(
8080
name = "26",
81-
sha256 = "d0c8e17f73e7146294ba39f499de086d0640058ec038c24021722ea612207d92",
82-
version = "26.0.1",
81+
sha256 = "47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193",
82+
version = "26.0.2",
8383
)
8484

8585
erlang_config.internal_erlang_from_http_archive(

‎WORKSPACE

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ http_file(
100100

101101
http_file(
102102
name = "otp_src_25_3",
103-
downloaded_file_path = "OTP-25.3.2.2.tar.gz",
104-
sha256 = "eeaa9e388fbfad90751fd75bf9207d87d7372b0a1a3266ff693c8015be91d634",
105-
urls = ["https://github.com/erlang/otp/archive/OTP-25.3.2.2.tar.gz"],
103+
downloaded_file_path = "OTP-25.3.2.3.tar.gz",
104+
sha256 = "93b0b2b02b789d3b51ed1c2e56fc40e2ee5a8394bf82686f06be5458e9b85994",
105+
urls = ["https://github.com/erlang/otp/archive/OTP-25.3.2.3.tar.gz"],
106106
)
107107

108108
http_file(
109109
name = "otp_src_26",
110-
downloaded_file_path = "OTP-26.0.1.tar.gz",
111-
sha256 = "dc02213328f88939013bedcbb7f170ffec60fc718ef685221c813b579f812602",
112-
urls = ["https://github.com/erlang/otp/archive/OTP-26.0.1.tar.gz"],
110+
downloaded_file_path = "OTP-26.0.2.tar.gz",
111+
sha256 = "4def5ed5e49815fb02fceae8a66e94abc1049f5de30f97d9ad12fdf3293a2470",
112+
urls = ["https://github.com/erlang/otp/archive/OTP-26.0.2.tar.gz"],
113113
)
114114

115115
load(
@@ -143,13 +143,13 @@ erlang_config(
143143
),
144144
internal_erlang_from_github_release(
145145
name = "25_3",
146-
sha256 = "83a36f3d90deef36adb615bbfb46cd327f0b76b7668e1f7f253fd66b4ae24518",
147-
version = "25.3.2.2",
146+
sha256 = "8c1e8811201d1e9cc806b74393db16e89a119f412e16bb5f6181d54cd102eb4f",
147+
version = "25.3.2.3",
148148
),
149149
internal_erlang_from_github_release(
150150
name = "26",
151-
sha256 = "d0c8e17f73e7146294ba39f499de086d0640058ec038c24021722ea612207d92",
152-
version = "26.0.1",
151+
sha256 = "4def5ed5e49815fb02fceae8a66e94abc1049f5de30f97d9ad12fdf3293a2470",
152+
version = "26.0.2",
153153
),
154154
internal_erlang_from_http_archive(
155155
name = "git_master",

‎deps/rabbitmq_amqp1_0/test/system_SUITE_data/java-tests/pom.xml

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,44 @@
77
<version>1.0-SNAPSHOT</version>
88
<name>rabbitmq-amqp1.0-java-tests</name>
99
<url>https://www.rabbitmq.com</url>
10+
<properties>
11+
<junit.jupiter.version>5.9.3</junit.jupiter.version>
12+
<qpid-jms-client.version>2.4.0</qpid-jms-client.version>
13+
<logback.version>1.2.12</logback.version>
14+
<spotless.version>2.37.0</spotless.version>
15+
<google-java-format.version>1.17.0</google-java-format.version>
16+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
17+
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
18+
</properties>
1019
<dependencies>
1120
<dependency>
12-
<groupId>junit</groupId>
13-
<artifactId>junit</artifactId>
14-
<version>4.13.1</version>
21+
<groupId>org.junit.jupiter</groupId>
22+
<artifactId>junit-jupiter-engine</artifactId>
23+
<version>${junit.jupiter.version}</version>
1524
<scope>test</scope>
1625
</dependency>
17-
<!-- <dependency> -->
18-
<!-- <groupId>org.apache.qpid</groupId> -->
19-
<!-- <artifactId>proton-j</artifactId> -->
20-
<!-- <version>0.13.0</version> -->
21-
<!-- <scope>test</scope> -->
22-
<!-- </dependency> -->
26+
2327
<dependency>
2428
<groupId>org.apache.qpid</groupId>
2529
<artifactId>qpid-jms-client</artifactId>
26-
<version>0.31.0</version>
30+
<version>${qpid-jms-client.version}</version>
2731
<scope>test</scope>
2832
</dependency>
33+
34+
<dependency>
35+
<groupId>ch.qos.logback</groupId>
36+
<artifactId>logback-classic</artifactId>
37+
<version>${logback.version}</version>
38+
<scope>test</scope>
39+
</dependency>
40+
2941
</dependencies>
3042
<build>
3143
<plugins>
3244
<plugin>
3345
<groupId>org.apache.maven.plugins</groupId>
3446
<artifactId>maven-compiler-plugin</artifactId>
35-
<version>3.8.1</version>
47+
<version>${maven-compiler-plugin.version}</version>
3648
<configuration>
3749
<source>1.8</source>
3850
<target>1.8</target>
@@ -41,7 +53,7 @@
4153
<plugin>
4254
<groupId>org.apache.maven.plugins</groupId>
4355
<artifactId>maven-surefire-plugin</artifactId>
44-
<version>2.22.2</version>
56+
<version>${maven-surefire-plugin.version}</version>
4557
<configuration>
4658
<systemPropertyVariables>
4759
<rmq_broker_uri>${rmq_broker_uri}</rmq_broker_uri>
@@ -53,6 +65,20 @@
5365
<argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
5466
</configuration>
5567
</plugin>
68+
<plugin>
69+
<groupId>com.diffplug.spotless</groupId>
70+
<artifactId>spotless-maven-plugin</artifactId>
71+
<version>${spotless.version}</version>
72+
<configuration>
73+
<java>
74+
<googleJavaFormat>
75+
<version>${google-java-format.version}</version>
76+
<style>GOOGLE</style>
77+
</googleJavaFormat>
78+
</java>
79+
</configuration>
80+
</plugin>
81+
5682
</plugins>
5783
</build>
5884
</project>

‎deps/rabbitmq_amqp1_0/test/system_SUITE_data/java-tests/src/test/java/com/rabbitmq/amqp1_0/tests/jms/RoundTripTest.java

Lines changed: 34 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,50 @@
22

33
package com.rabbitmq.amqp1_0.tests.jms;
44

5-
import java.util.*;
6-
7-
import junit.framework.Test;
8-
import junit.framework.TestCase;
9-
import junit.framework.TestSuite;
5+
import static org.junit.jupiter.api.Assertions.assertEquals;
6+
import static org.junit.jupiter.api.Assertions.assertNotNull;
107

11-
import javax.jms.Connection;
12-
import javax.jms.ConnectionFactory;
13-
import javax.jms.DeliveryMode;
14-
import javax.jms.Destination;
15-
import javax.jms.ExceptionListener;
16-
import javax.jms.JMSException;
17-
import javax.jms.Message;
18-
import javax.jms.MessageConsumer;
19-
import javax.jms.MessageProducer;
20-
import javax.jms.Session;
21-
import javax.jms.TextMessage;
8+
import jakarta.jms.*;
9+
import java.util.*;
2210
import javax.naming.Context;
23-
import javax.naming.InitialContext;
24-
25-
/**
26-
* Unit test for simple App.
27-
*/
28-
public class RoundTripTest
29-
extends TestCase
30-
{
31-
public static final String ADDRESS = "/jms-roundtrip-q";
32-
public static final String PAYLOAD = "Payload";
11+
import org.junit.jupiter.api.Test;
3312

34-
/**
35-
* Create the test case
36-
*
37-
* @param testName name of the test case
38-
*/
39-
public RoundTripTest(String testName)
40-
{
41-
super(testName);
42-
}
43-
44-
/**
45-
* @return the suite of tests being tested
46-
*/
47-
public static Test suite()
48-
{
49-
return new TestSuite(RoundTripTest.class);
50-
}
13+
/** Unit test for simple App. */
14+
public class RoundTripTest {
5115

52-
public void test_roundtrip () throws Exception
53-
{
54-
String uri = System.getProperty("rmq_broker_uri");
55-
String address = uri + ADDRESS;
56-
Hashtable<Object, Object> env = new Hashtable<Object, Object>();
57-
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.qpid.jms.jndi.JmsInitialContextFactory");
58-
env.put("connectionfactory.myFactoryLookup", uri);
59-
env.put("queue.myQueueLookup", "my-queue");
60-
env.put("jms.sendTimeout", 5);
61-
env.put("jms.requestTimeout", 5);
62-
javax.naming.Context context = new javax.naming.InitialContext(env);
16+
@Test
17+
public void test_roundtrip() throws Exception {
18+
String uri = System.getProperty("rmq_broker_uri", "amqp://localhost:5672");
19+
Hashtable<Object, Object> env = new Hashtable<>();
20+
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.qpid.jms.jndi.JmsInitialContextFactory");
21+
env.put("connectionfactory.myFactoryLookup", uri);
22+
env.put("queue.myQueueLookup", "my-queue");
23+
env.put("jms.sendTimeout", 5);
24+
env.put("jms.requestTimeout", 5);
25+
javax.naming.Context context = new javax.naming.InitialContext(env);
6326

64-
assertNotNull(uri);
27+
assertNotNull(uri);
6528

66-
ConnectionFactory factory = (ConnectionFactory) context.lookup("myFactoryLookup");
67-
Destination queue = (Destination) context.lookup("myQueueLookup");
29+
ConnectionFactory factory = (ConnectionFactory) context.lookup("myFactoryLookup");
30+
Destination queue = (Destination) context.lookup("myQueueLookup");
6831

69-
Connection connection = factory.createConnection("guest", "guest");
70-
connection.start();
32+
try (Connection connection = factory.createConnection("guest", "guest")) {
33+
connection.start();
7134

72-
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
35+
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
7336

74-
MessageProducer messageProducer = session.createProducer(queue);
75-
MessageConsumer messageConsumer = session.createConsumer(queue);
37+
MessageProducer messageProducer = session.createProducer(queue);
38+
MessageConsumer messageConsumer = session.createConsumer(queue);
7639

77-
TextMessage message = session.createTextMessage("Hello world!");
78-
messageProducer.send(message, DeliveryMode.NON_PERSISTENT,
79-
Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
80-
TextMessage receivedMessage = (TextMessage) messageConsumer.receive(2000L);
40+
TextMessage message = session.createTextMessage("Hello world!");
41+
messageProducer.send(
42+
message,
43+
DeliveryMode.NON_PERSISTENT,
44+
Message.DEFAULT_PRIORITY,
45+
Message.DEFAULT_TIME_TO_LIVE);
46+
TextMessage receivedMessage = (TextMessage) messageConsumer.receive(2000L);
8147

82-
assertEquals(message.getText(), receivedMessage.getText());
48+
assertEquals(message.getText(), receivedMessage.getText());
8349
}
50+
}
8451
}

‎deps/rabbitmq_amqp1_0/test/system_SUITE_data/java-tests/src/test/resources/logback-test.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<logger name="com.rabbitmq" level="info" />
9+
10+
<root level="warn">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

‎deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot/pom.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
<parent>
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-parent</artifactId>
32-
<version>2.4.1</version>
32+
<version>3.1.1</version>
3333
</parent>
3434

3535
<properties>
3636
<maven.compiler.source>1.8</maven.compiler.source>
3737
<maven.compiler.target>1.8</maven.compiler.target>
38+
<junit.jupiter.version>5.9.3</junit.jupiter.version>
3839
</properties>
3940

4041
<groupId>com.rabbitmq.examples</groupId>
@@ -54,11 +55,12 @@
5455
</dependency>
5556

5657
<dependency>
57-
<groupId>junit</groupId>
58-
<artifactId>junit</artifactId>
59-
<version>4.13.1</version>
58+
<groupId>org.junit.jupiter</groupId>
59+
<artifactId>junit-jupiter-params</artifactId>
60+
<version>${junit.jupiter.version}</version>
6061
<scope>test</scope>
6162
</dependency>
63+
6264
</dependencies>
6365

6466
<build>

0 commit comments

Comments
 (0)