Skip to content

Commit 6560df9

Browse files
LukasBrandLukasHiveMQ
authored andcommitted
Remove main classpath from systemTest source set.
1 parent 40594df commit 6560df9

File tree

11 files changed

+23
-15
lines changed

11 files changed

+23
-15
lines changed

src/systemTest/java/com/hivemq/cli/commands/cli/CipherSuitesTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class CipherSuitesTlsST {
4343
@SuppressWarnings("JUnitMalformedDeclaration")
4444
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
4545
.withTlsConfiguration(TlsConfiguration.builder()
46-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
46+
.withTlsVersions(TlsVersion.supportedAsList())
4747
.withCipherSuites(CipherSuite.getAllAsString())
4848
.withTlsEnabled(true)
4949
.build())

src/systemTest/java/com/hivemq/cli/commands/cli/publish/PublishConnectMTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class PublishConnectMTlsST {
4343
@SuppressWarnings("JUnitMalformedDeclaration")
4444
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
4545
.withTlsConfiguration(TlsConfiguration.builder()
46-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
46+
.withTlsVersions(TlsVersion.supportedAsList())
4747
.withClientAuthentication(true)
4848
.withTlsEnabled(true)
4949
.build())

src/systemTest/java/com/hivemq/cli/commands/cli/publish/PublishConnectTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class PublishConnectTlsST {
4949
@SuppressWarnings("JUnitMalformedDeclaration")
5050
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
5151
.withTlsConfiguration(TlsConfiguration.builder()
52-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
52+
.withTlsVersions(TlsVersion.supportedAsList())
5353
.withCipherSuites(CipherSuite.getAllAsString())
5454
.withTlsEnabled(true)
5555
.build())

src/systemTest/java/com/hivemq/cli/commands/cli/subscribe/SubscribeConnectMTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class SubscribeConnectMTlsST {
4646
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
4747
.withTlsConfiguration(TlsConfiguration.builder()
4848
.withTlsEnabled(true)
49-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
49+
.withTlsVersions(TlsVersion.supportedAsList())
5050
.withClientAuthentication(true)
5151
.build())
5252
.build();

src/systemTest/java/com/hivemq/cli/commands/cli/subscribe/SubscribeConnectTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class SubscribeConnectTlsST {
5151
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
5252
.withTlsConfiguration(TlsConfiguration.builder()
5353
.withTlsEnabled(true)
54-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
54+
.withTlsVersions(TlsVersion.supportedAsList())
5555
.build())
5656
.build();
5757

src/systemTest/java/com/hivemq/cli/commands/cli/test_broker/TestBrokerConnectMTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class TestBrokerConnectMTlsST {
4141
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
4242
.withTlsConfiguration(TlsConfiguration.builder()
4343
.withTlsEnabled(true)
44-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
44+
.withTlsVersions(TlsVersion.supportedAsList())
4545
.withClientAuthentication(true)
4646
.build())
4747
.build();

src/systemTest/java/com/hivemq/cli/commands/cli/test_broker/TestBrokerConnectTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class TestBrokerConnectTlsST {
4646
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
4747
.withTlsConfiguration(TlsConfiguration.builder()
4848
.withTlsEnabled(true)
49-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
49+
.withTlsVersions(TlsVersion.supportedAsList())
5050
.build())
5151
.build();
5252

src/systemTest/java/com/hivemq/cli/commands/shell/connect/ShellConnectMTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ShellConnectMTlsST {
4040
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
4141
.withTlsConfiguration(TlsConfiguration.builder()
4242
.withTlsEnabled(true)
43-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
43+
.withTlsVersions(TlsVersion.supportedAsList())
4444
.build())
4545
.build();
4646

src/systemTest/java/com/hivemq/cli/commands/shell/connect/ShellConnectTlsST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ShellConnectTlsST {
4141
private final @NotNull HiveMQExtension hivemq = HiveMQExtension.builder()
4242
.withTlsConfiguration(TlsConfiguration.builder()
4343
.withTlsEnabled(true)
44-
.withTlsVersions(List.of(TlsVersion.TLS_1_2, TlsVersion.TLS_1_3))
44+
.withTlsVersions(TlsVersion.supportedAsList())
4545
.build())
4646
.build();
4747

src/systemTest/java/com/hivemq/cli/utils/broker/HiveMQExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ private int generatePort() throws IOException {
254254
final String websocketsConfig = setupWebsockets();
255255
//@formatter:off
256256
return "<hivemq>\n" + " " +
257-
" <listeners>\n" + " " +
258-
" <tcp-listener>\n" +
257+
" <listeners>\n" + " " +
258+
" <tcp-listener>\n" +
259259
" <port>" + port + "</port>\n" +
260260
" <bind-address>" + BIND_ADDRESS + "</bind-address>\n" +
261261
" </tcp-listener>\n" +

0 commit comments

Comments
 (0)