Skip to content

Commit 67b01e7

Browse files
authored
Update Mockito for running tests on Mac M1 (#7208)
* Update Mockito for running tests on Mac M1 * Added comments for JNA library dependency
1 parent e821919 commit 67b01e7

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

airbyte-db/jooq/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ dependencies {
1414
// jOOQ code generation
1515
implementation 'org.jooq:jooq-codegen:3.13.4'
1616
implementation "org.testcontainers:postgresql:1.15.3"
17+
// These are required because gradle might be using lower version of Jna from other
18+
// library transitive dependency. Can be removed if we can figure out which library is the cause.
19+
// Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
20+
implementation 'net.java.dev.jna:jna:5.8.0'
21+
implementation 'net.java.dev.jna:jna-platform:5.8.0'
22+
1723
// The jOOQ code generator only has access to classes added to the jooqGenerator configuration
1824
jooqGenerator project(':airbyte-db:lib')
1925
}

airbyte-db/lib/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ dependencies {
1212
implementation project(':airbyte-json-validation')
1313
implementation "org.flywaydb:flyway-core:7.14.0"
1414
implementation "org.testcontainers:postgresql:1.15.3"
15+
// These are required because gradle might be using lower version of Jna from other
16+
// library transitive dependency. Can be removed if we can figure out which library is the cause.
17+
// Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
18+
implementation 'net.java.dev.jna:jna:5.8.0'
19+
implementation 'net.java.dev.jna:jna-platform:5.8.0'
20+
1521

1622
testImplementation project(':airbyte-test-utils')
1723
testImplementation 'org.apache.commons:commons-lang3:3.11'

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,10 @@ subprojects {
230230
implementation 'software.amazon.awssdk:s3:2.16.84'
231231

232232

233-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
234-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
235-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1'
236-
testImplementation 'org.mockito:mockito-junit-jupiter:3.9.0'
233+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
234+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
235+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
236+
testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
237237
testImplementation 'org.assertj:assertj-core:3.21.0'
238238
}
239239

0 commit comments

Comments
 (0)