Add java 20 and 21-ea to main build

smallrye · Sep 13, 2023 · fde4ddb · fde4ddb
1 parent 10c8e08
commit fde4ddb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/build-main-branches.yml b/.github/workflows/build-main-branches.yml
@@ -25,6 +25,14 @@ jobs:
                         'name': '',
                         'version': '17',
                     },
+                    {
+                        'name': '',
+                        'version': '20',
+                    },
+                    {
+                        'name': '',
+                        'version': '21-ea',
+                    },
                     {
                         'version': '11',
                         'build_opts': '-Pslow-flaky-tests -Drevapi.skip=true',

diff --git a/.github/workflows/build-pull.yml b/.github/workflows/build-pull.yml
@@ -23,6 +23,14 @@ jobs:
                         'name': '',
                         'version': '17',
                     },
+                    {
+                        'name': '',
+                        'version': '20',
+                    },
+                    {
+                        'name': '',
+                        'version': '21-ea',
+                    },
                     {
                         'version': '11',
                         'build_opts': '-Pslow-flaky-tests -Drevapi.skip=true',

diff --git a/.../src/test/java/io/smallrye/reactive/messaging/kafka/config/ConfigOverrideFromEnvTest.java b/.../src/test/java/io/smallrye/reactive/messaging/kafka/config/ConfigOverrideFromEnvTest.java
@@ -13,7 +13,7 @@
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 import org.junitpioneer.jupiter.SetEnvironmentVariable;
 
@@ -26,7 +26,7 @@ public class ConfigOverrideFromEnvTest extends KafkaCompanionTestBase {
 
     @Test
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_MY_CHANNEL_TOPIC", value = TOPIC)
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     public void testOverridingTopicFromEnv() throws InterruptedException {
         MapBasedConfig config = kafkaConfig("mp.messaging.incoming.my-channel")
                 .with("graceful-shutdown", false)

diff --git a/...-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/config/EnvAndSysConfigTest.java b/...-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/config/EnvAndSysConfigTest.java
@@ -13,7 +13,7 @@
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 import org.junitpioneer.jupiter.SetEnvironmentVariable;
 import org.junitpioneer.jupiter.SetSystemProperty;
@@ -26,7 +26,7 @@ public class EnvAndSysConfigTest extends KafkaCompanionTestBase {
     public static final String TOPIC_2 = "EnvConfigTest-IN-2";
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_KAFKA_TOPIC", value = TOPIC_1)
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_KAFKA_VALUE_DESERIALIZER", value = "org.apache.kafka.common.serialization.StringDeserializer")
     public void testConsumerConfigurationComingFromEnv() throws InterruptedException {

diff --git a/...ssaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/impl/JsonHelperTest.java b/...ssaging-kafka/src/test/java/io/smallrye/reactive/messaging/kafka/impl/JsonHelperTest.java
@@ -10,7 +10,7 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 import org.junitpioneer.jupiter.SetEnvironmentVariable;
 
@@ -57,23 +57,23 @@ public void test() {
     }
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_BOOTSTRAP_SERVERS", value = "testServers")
     public void testConnectorConfigFromEnv() {
         JsonObject object = JsonHelper.asJsonObject(createTestConfig());
         assertThat(object.getString("bootstrap.servers")).isEqualTo("testServers");
     }
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_TESTCHANNEL_BOOTSTRAP_SERVERS", value = "testServers")
     public void testChannelConfigFromEnv() {
         JsonObject object = JsonHelper.asJsonObject(createTestConfig());
         assertThat(object.getString("bootstrap.servers")).isEqualTo("testServers");
     }
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_TESTCHANNEL_FOO_BAR", value = "a")
     public void testSysPropsOverrides() {
         Map<String, String> properties = Collections.singletonMap("mp.messaging.incoming.testChannel.foo.bar", "b");
@@ -85,7 +85,7 @@ public void testSysPropsOverrides() {
     }
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_TESTCHANNEL_FOO_BAR", value = "a")
     public void testSysPropsCaseSensitive() {
         Map<String, String> properties = Collections.singletonMap("mp.messaging.incoming.testChannel.FOO_BAR", "b");
@@ -97,7 +97,7 @@ public void testSysPropsCaseSensitive() {
     }
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_TESTCHANNEL_FOO_BAR", value = "a")
     public void testEnvOverrides() {
         Map<String, String> extraProperties = new HashMap<>();
@@ -111,7 +111,7 @@ public void testEnvOverrides() {
     }
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_FOO_BAR", value = "a")
     public void testConnectorSysPropsOverrides() {
         Map<String, String> properties = Collections.singletonMap("mp.messaging.connector.smallrye-kafka.foo.bar", "b");
@@ -123,7 +123,7 @@ public void testConnectorSysPropsOverrides() {
     }
 
     @Test
-    @DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+    @DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
     @SetEnvironmentVariable(key = "MP_MESSAGING_INCOMING_TESTCHANNEL_FOO_BAR", value = "a")
     public void testChannelOverridesConnector() {
         Map<String, String> properties = Collections.singletonMap("mp.messaging.connector.smallrye-kafka.foo.bar", "b");

diff --git a/...ider/src/test/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfigTest.java b/...ider/src/test/java/io/smallrye/reactive/messaging/providers/impl/ConnectorConfigTest.java
@@ -11,7 +11,7 @@
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 import org.junitpioneer.jupiter.SetEnvironmentVariable;
 
@@ -26,7 +26,7 @@
 @SetEnvironmentVariable(key = "MP_MESSAGING_CONNECTOR_SOME_CONNECTOR_ATTR3", value = "used")
 @SetEnvironmentVariable(key = "mp_messaging_connector_some_connector_attr4", value = "used")
 @SetEnvironmentVariable(key = "mp_messaging_connector_SOME_CONNECTOR_mixedcase", value = "should not be used")
-@DisabledOnJre(value = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
+@DisabledForJreRange(min = JRE.JAVA_17, disabledReason = "Environment cannot be modified on Java 17")
 public class ConnectorConfigTest {
 
     private SmallRyeConfig overallConfig;