Drop Java 8 from build matrix

lukas-krecan · Jun 12, 2022 · 5f75507 · 5f75507
1 parent bac50a9
commit 5f75507
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,18 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '11', '17', '18' ]
         # Kotlin needs access to java.util
         include:
-          - java: '8'
-            maven-opts: ''
-            maven-params: -pl '!spring/test/shedlock-springboot-future-test,!providers/etcd/shedlock-provider-etcd-jetcd'
           - java: '11'
             maven-opts: ''
             maven-params: -pl '!spring/test/shedlock-springboot-future-test'
           - java: '17'
             maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
             maven-params: ''
+          - java: '18'
+            maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
+            maven-params: ''
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}

diff --git a/...src/test/java/net/javacrumbs/shedlock/provider/opensearch/OpenSearchLockProviderTest.java b/...src/test/java/net/javacrumbs/shedlock/provider/opensearch/OpenSearchLockProviderTest.java
@@ -21,7 +21,6 @@
 import org.apache.http.HttpHost;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.client.RequestOptions;
@@ -42,10 +41,8 @@
 import static net.javacrumbs.shedlock.provider.opensearch.OpenSearchLockProvider.SCHEDLOCK_DEFAULT_INDEX;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
 
 @Testcontainers
-@DisabledOnJre(JAVA_8)
 public class OpenSearchLockProviderTest extends AbstractLockProviderIntegrationTest {
 
     @Container

diff --git a/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MariaR2dbcLockProviderIntegrationTest.java b/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MariaR2dbcLockProviderIntegrationTest.java
@@ -17,10 +17,7 @@
 
 import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.MariaDbConfig;
-import org.junit.jupiter.api.condition.DisabledOnJre;
-import org.junit.jupiter.api.condition.JRE;
 
-@DisabledOnJre(JRE.JAVA_8) // Not compatible
 public class MariaR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
     private static final DbConfig dbConfig = new MariaDbConfig();
 

diff --git a/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MsSqlR2dbcLockProviderIntegrationTest.java b/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MsSqlR2dbcLockProviderIntegrationTest.java
@@ -17,10 +17,7 @@
 
 import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.MsSqlServerConfig;
-import org.junit.jupiter.api.condition.DisabledOnJre;
-import org.junit.jupiter.api.condition.JRE;
 
-@DisabledOnJre(JRE.JAVA_8) // Not compatible
 public class MsSqlR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
     private static final DbConfig dbConfig = new MsSqlServerConfig();
 

diff --git a/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MySqlR2dbcLockProviderIntegrationTest.java b/...st/java/net/javacrumbs/shedlock/provider/r2dbc/MySqlR2dbcLockProviderIntegrationTest.java
@@ -17,10 +17,7 @@
 
 import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.MySqlConfig;
-import org.junit.jupiter.api.condition.DisabledOnJre;
-import org.junit.jupiter.api.condition.JRE;
 
-@DisabledOnJre(JRE.JAVA_8) // Not compatible
 public class MySqlR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
     private static final DbConfig dbConfig = new MySqlConfig();
 

diff --git a/...t/java/net/javacrumbs/shedlock/provider/r2dbc/OracleR2dbcLockProviderIntegrationTest.java b/...t/java/net/javacrumbs/shedlock/provider/r2dbc/OracleR2dbcLockProviderIntegrationTest.java
@@ -17,11 +17,7 @@
 
 import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.OracleServerConfig;
-import org.junit.jupiter.api.condition.DisabledOnJre;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-
-@DisabledOnJre(JAVA_8)
 public class OracleR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
     private static final DbConfig dbConfig = new OracleServerConfig();
 

diff --git a/...java/net/javacrumbs/shedlock/provider/r2dbc/PostgresR2dbcLockProviderIntegrationTest.java b/...java/net/javacrumbs/shedlock/provider/r2dbc/PostgresR2dbcLockProviderIntegrationTest.java
@@ -17,11 +17,7 @@
 
 import net.javacrumbs.shedlock.test.support.jdbc.DbConfig;
 import net.javacrumbs.shedlock.test.support.jdbc.PostgresConfig;
-import org.junit.jupiter.api.condition.DisabledOnJre;
 
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-
-@DisabledOnJre(JAVA_8) // Does not work on Java 8
 public class PostgresR2dbcLockProviderIntegrationTest extends AbstractR2dbcTest {
     private static final DbConfig dbConfig = new PostgresConfig();