Merge pull request #314 from kagkarlsson/m1_mac

M1 mac
kagkarlsson · Sep 2, 2022 · dde158b · dde158b
2 parents 783056e + a0df61a
commit dde158b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/db-scheduler/pom.xml b/db-scheduler/pom.xml
@@ -21,7 +21,7 @@
         <equals-verifier.version>3.10</equals-verifier.version>
         <bytebuddy.version>1.12.8</bytebuddy.version>
         <micro-jdbc.version>0.3</micro-jdbc.version>
-        <otj-pg-embedded.version>0.11.4</otj-pg-embedded.version>
+        <otj-pg-embedded.version>1.0.1</otj-pg-embedded.version>
         <postgresql.version>42.4.1</postgresql.version>
         <slf4j.version>1.7.36</slf4j.version>
         <test.excludedTags>compatibility</test.excludedTags>
@@ -77,6 +77,7 @@
             <optional>true</optional>
         </dependency>
 
+
         <!-- Test -->
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/ClusterTest.java b/db-scheduler/src/test/java/com/github/kagkarlsson/scheduler/ClusterTest.java
@@ -55,7 +55,7 @@ public class ClusterTest {
 //    );
 
 
-    @RepeatedTest(10)
+    @Test
     public void test_concurrency_optimistic_locking() throws InterruptedException {
         DEBUG_LOG.info("Starting test_concurrency_optimistic_locking");
         testConcurrencyForPollingStrategy(

diff --git a/.../src/test/java/com/github/kagkarlsson/scheduler/compatibility/MssqlCompatibilityTest.java b/.../src/test/java/com/github/kagkarlsson/scheduler/compatibility/MssqlCompatibilityTest.java
@@ -5,6 +5,7 @@
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.util.DriverDataSource;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.junit.jupiter.Container;
@@ -16,6 +17,7 @@
 @SuppressWarnings("rawtypes")
 @Tag("compatibility")
 @Testcontainers
+@Disabled
 public class MssqlCompatibilityTest extends CompatibilityTest {
 
     @Container

diff --git a/.../test/java/com/github/kagkarlsson/scheduler/compatibility/Oracle11gCompatibilityTest.java b/.../test/java/com/github/kagkarlsson/scheduler/compatibility/Oracle11gCompatibilityTest.java
@@ -10,13 +10,15 @@
 import javax.sql.DataSource;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Tag("compatibility")
 @Testcontainers
+@Disabled
 public class Oracle11gCompatibilityTest extends CompatibilityTest {
     @Container
     private static final OracleContainer ORACLE = new OracleContainer("oracleinanutshell/oracle-xe-11g:1.0.0");

diff --git a/db-scheduler/src/test/resources/oracle_tables.sql b/db-scheduler/src/test/resources/oracle_tables.sql
@@ -12,7 +12,5 @@ create table scheduled_tasks
     last_heartbeat       TIMESTAMP(6),
     version              NUMBER(19, 0),
     PRIMARY KEY (task_name, task_instance)
-);
+)
 
-CREATE INDEX execution_time_idx ON scheduled_tasks (execution_time);
-CREATE INDEX last_heartbeat_idx ON scheduled_tasks (last_heartbeat);
diff --git a/pom.xml b/pom.xml
@@ -95,10 +95,16 @@
 			<dependency>
 				<groupId>org.testcontainers</groupId>
 				<artifactId>testcontainers-bom</artifactId>
-				<version>1.15.1</version>
+				<version>1.17.3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<!-- Override to make testcontainers work on M1 -->
+			<dependency>
+				<groupId>net.java.dev.jna</groupId>
+				<artifactId>jna</artifactId>
+				<version>5.11.0</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>