🎉 Support build on MacOS M1 (Apple Silicon) (#7104)

- See this doc for details: https://github.com/airbytehq/airbyte/blob/master/docs/contributing-to-airbyte/developing-locally.md - Unit test does not work yet.

Author: h7kanna

airbyte-config/persistence/build.gradle

@@ -14,6 +14,6 @@ dependencies {
  implementation project(':airbyte-config:init')
  implementation project(':airbyte-json-validation')
  implementation 'com.google.cloud:google-cloud-secretmanager:1.7.2'
- testImplementation "org.testcontainers:postgresql:1.15.1"
+ testImplementation "org.testcontainers:postgresql:1.15.3"
  integrationTestJavaImplementation project(':airbyte-config:persistence')
 }

airbyte-db/jooq/build.gradle

@@ -13,7 +13,7 @@ dependencies {
 
  // jOOQ code generation
  implementation 'org.jooq:jooq-codegen:3.13.4'
- implementation "org.testcontainers:postgresql:1.15.1"
+ implementation "org.testcontainers:postgresql:1.15.3"
  // The jOOQ code generator only has access to classes added to the jooqGenerator configuration
  jooqGenerator project(':airbyte-db:lib')
 }

airbyte-db/lib/build.gradle

@@ -11,7 +11,7 @@ dependencies {
  implementation project(':airbyte-protocol:models')
  implementation project(':airbyte-json-validation')
  implementation "org.flywaydb:flyway-core:7.14.0"
- implementation "org.testcontainers:postgresql:1.15.1"
+ implementation "org.testcontainers:postgresql:1.15.3"
 
  testImplementation project(':airbyte-test-utils')
  testImplementation 'org.apache.commons:commons-lang3:3.11'

airbyte-e2e-testing/build.gradle

@@ -3,9 +3,11 @@ plugins {
  id "com.github.node-gradle.node" version "2.2.4"
 }
 
+def nodeVersion = System.getenv('NODE_VERSION') ?: '14.11.0'
+
 node {
  download = true
- version = "14.11.0"
+ version = nodeVersion
 }
 
 

airbyte-integrations/bases/base-java/Dockerfile

@@ -1,4 +1,5 @@
-FROM openjdk:14.0.2-slim
+ARG JDK_VERSION=14.0.2
+FROM openjdk:${JDK_VERSION}-slim
 COPY --from=airbyte/integration-base:dev /airbyte /airbyte
 
 WORKDIR /airbyte

airbyte-integrations/bases/base-java/build.gradle

@@ -14,8 +14,8 @@ dependencies {
 
  implementation project(':airbyte-protocol:models')
  implementation project(":airbyte-json-validation")
- implementation "org.testcontainers:testcontainers:1.15.1"
- implementation "org.testcontainers:jdbc:1.15.1"
+ implementation "org.testcontainers:testcontainers:1.15.3"
+ implementation "org.testcontainers:jdbc:1.15.3"
 
  implementation files(project(':airbyte-integrations:bases:base').airbyteDocker.outputs)
 }

airbyte-integrations/bases/base-standard-source-test-file/Dockerfile

@@ -1,4 +1,5 @@
-FROM openjdk:14.0.2-slim
+ARG JDK_VERSION=14.0.2
+FROM openjdk:${JDK_VERSION}-slim
 
 # Install Docker to launch worker images. Eventually should be replaced with Docker-java.
 # See https://gitter.im/docker-java/docker-java?at=5f3eb87ba8c1780176603f4e for more information on why we are not currently using Docker-java

airbyte-integrations/bases/standard-source-test/Dockerfile

@@ -1,4 +1,5 @@
-FROM openjdk:14.0.2-slim
+ARG JDK_VERSION=14.0.2
+FROM openjdk:${JDK_VERSION}-slim
 
 # Install Docker to launch worker images. Eventually should be replaced with Docker-java.
 # See https://gitter.im/docker-java/docker-java?at=5f3eb87ba8c1780176603f4e for more information on why we are not currently using Docker-java

airbyte-integrations/connector-templates/generator/build.gradle

@@ -3,9 +3,11 @@ plugins {
  id "com.github.node-gradle.node" version "2.2.4"
 }
 
+def nodeVersion = System.getenv('NODE_VERSION') ?: '14.11.0'
+
 node {
  download = true
- version = "14.11.0"
+ version = nodeVersion
 }
 
 assemble.dependsOn(npmInstall)

airbyte-integrations/connectors/destination-e2e-test/build.gradle

@@ -16,11 +16,11 @@ dependencies {
 
  testImplementation project(':airbyte-test-utils')
 
- testImplementation "org.testcontainers:postgresql:1.15.1"
+ testImplementation "org.testcontainers:postgresql:1.15.3"
 
  integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
 
- integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.1"
+ integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.3"
 
  implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
  integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)