Skip to content

Commit d1a2c21

Browse files
authored
Merge pull request #29455 from abutch3r/disable-rm-sasl-tests-for-java23-individually
Disable SASL Tests for Java versions >22
2 parents ed7a428 + 63c8ed6 commit d1a2c21

File tree

6 files changed

+12
-0
lines changed

6 files changed

+12
-0
lines changed

dev/com.ibm.ws.microprofile.reactive.messaging_fat/fat/src/com/ibm/ws/microprofile/reactive/messaging/fat/kafka/checkpoint/CheckpointKafkaSaslPlainTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.Map;
2626
import java.util.Properties;
2727

28+
import componenttest.annotation.MaximumJavaLevel;
2829
import org.jboss.shrinkwrap.api.ShrinkWrap;
2930
import org.jboss.shrinkwrap.api.spec.WebArchive;
3031
import org.junit.AfterClass;
@@ -60,6 +61,7 @@
6061
* Basic test using a kafka broker with TLS enabled
6162
*/
6263
@RunWith(FATRunner.class)
64+
@MaximumJavaLevel(javaLevel = 22)
6365
@CheckpointTest
6466
public class CheckpointKafkaSaslPlainTest {
6567

dev/com.ibm.ws.microprofile.reactive.messaging_fat/fat/src/com/ibm/ws/microprofile/reactive/messaging/fat/kafka/liberty_login/LibertyLoginModuleTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Collections;
2020
import java.util.Map;
2121

22+
import componenttest.annotation.MaximumJavaLevel;
2223
import org.apache.kafka.common.config.SaslConfigs;
2324
import org.jboss.shrinkwrap.api.ShrinkWrap;
2425
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -48,6 +49,7 @@
4849
* Test the login module with an aes encoded password and configured encryption key
4950
*/
5051
@RunWith(FATRunner.class)
52+
@MaximumJavaLevel(javaLevel = 22)
5153
public class LibertyLoginModuleTest {
5254

5355
private static final String APP_NAME = "kafkaLoginModuleTest";

dev/com.ibm.ws.microprofile.reactive.messaging_fat/fat/src/com/ibm/ws/microprofile/reactive/messaging/fat/kafka/liberty_login/none/LibertyLoginModuleNoEncTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Map;
2020

21+
import componenttest.annotation.MaximumJavaLevel;
2122
import org.apache.kafka.common.config.SaslConfigs;
2223
import org.jboss.shrinkwrap.api.ShrinkWrap;
2324
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -44,6 +45,7 @@
4445
/**
4546
* Test the login module with an unencoded password - should still work
4647
*/
48+
@MaximumJavaLevel(javaLevel = 22)
4749
@RunWith(FATRunner.class)
4850
public class LibertyLoginModuleNoEncTest {
4951

dev/com.ibm.ws.microprofile.reactive.messaging_fat/fat/src/com/ibm/ws/microprofile/reactive/messaging/fat/kafka/liberty_login/special_chars/LibertyLoginModuleSpecialCharsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Map;
2020

21+
import componenttest.annotation.MaximumJavaLevel;
2122
import org.apache.kafka.common.config.SaslConfigs;
2223
import org.jboss.shrinkwrap.api.ShrinkWrap;
2324
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -44,6 +45,7 @@
4445
/**
4546
* Test the login module with an unencoded password - should still work
4647
*/
48+
@MaximumJavaLevel(javaLevel = 22)
4749
@RunWith(FATRunner.class)
4850
public class LibertyLoginModuleSpecialCharsTest {
4951

dev/com.ibm.ws.microprofile.reactive.messaging_fat/fat/src/com/ibm/ws/microprofile/reactive/messaging/fat/kafka/liberty_login/xor/LibertyLoginModuleXorTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Map;
2020

21+
import componenttest.annotation.MaximumJavaLevel;
2122
import org.apache.kafka.common.config.SaslConfigs;
2223
import org.jboss.shrinkwrap.api.ShrinkWrap;
2324
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -48,6 +49,7 @@
4849
* Test the login module with xor encoded password
4950
*/
5051
@RunWith(FATRunner.class)
52+
@MaximumJavaLevel(javaLevel = 22)
5153
@Mode(TestMode.FULL)
5254
public class LibertyLoginModuleXorTest {
5355

dev/com.ibm.ws.microprofile.reactive.messaging_fat/fat/src/com/ibm/ws/microprofile/reactive/messaging/fat/kafka/sasl_plain/KafkaSaslPlainTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static com.ibm.ws.microprofile.reactive.messaging.fat.kafka.common.KafkaUtils.kafkaPermissions;
1717
import static com.ibm.ws.microprofile.reactive.messaging.fat.kafka.common.KafkaUtils.kafkaStopServer;
1818

19+
import componenttest.annotation.MaximumJavaLevel;
1920
import org.jboss.shrinkwrap.api.ShrinkWrap;
2021
import org.jboss.shrinkwrap.api.spec.WebArchive;
2122
import org.junit.AfterClass;
@@ -45,6 +46,7 @@
4546
* Basic test using a kafka broker with TLS enabled
4647
*/
4748
@RunWith(FATRunner.class)
49+
@MaximumJavaLevel(javaLevel = 22)
4850
public class KafkaSaslPlainTest {
4951

5052
private static final String APP_NAME = "kafkaSaslTest";

0 commit comments

Comments
 (0)