Skip to content

Commit

Permalink
Upgrade to Micronaut 3.8.0 and related dependencies (#21077)
Browse files Browse the repository at this point in the history
* Upgrade to Micronaut 3.8.0 and related dependencies

* Define hostname/subdomain to be compatible with updated AWS SDK

* Use bucket name for hostname

* Pin dependencies to avoid behavior change

* Add comment
  • Loading branch information
jdpgrailsdev authored Jan 11, 2023
1 parent 8ef2872 commit e571b2b
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 21 deletions.
13 changes: 13 additions & 0 deletions airbyte-container-orchestrator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ dependencies {
implementation platform(libs.micronaut.bom)
implementation libs.bundles.micronaut

// Ensure that the versions defined in deps.toml are used
// instead of versions from transitive dependencies
implementation(libs.s3) {
// Force to avoid updated version brought in transitively from Micronaut 3.8+
// that is incompatible with our current Helm setup
force = true
}
implementation(libs.aws.java.sdk.s3) {
// Force to avoid updated version brought in transitively from Micronaut 3.8+
// that is incompatible wit hour current Helm setup
force = true
}

implementation 'io.fabric8:kubernetes-client:5.12.2'
implementation libs.bundles.datadog

Expand Down
38 changes: 24 additions & 14 deletions airbyte-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@ configurations.all {
}

dependencies {
annotationProcessor platform(libs.micronaut.bom)
annotationProcessor libs.bundles.micronaut.annotation.processor
annotationProcessor libs.micronaut.jaxrs.processor

implementation platform(libs.micronaut.bom)
implementation libs.bundles.micronaut
implementation libs.micronaut.jaxrs.server

// Ensure that the versions defined in deps.toml are used
// instead of versions from transitive dependencies
implementation(libs.flyway.core) {
force = true
}
implementation(libs.s3) {
// Force to avoid updated version brought in transitively from Micronaut 3.8+
// that is incompatible with our current Helm setup
force = true
}
implementation(libs.aws.java.sdk.s3) {
// Force to avoid updated version brought in transitively from Micronaut 3.8+
// that is incompatible with our current Helm setup
force = true
}

implementation project(':airbyte-analytics')
implementation project(':airbyte-api')
implementation project(':airbyte-commons-docker')
Expand Down Expand Up @@ -39,20 +63,6 @@ dependencies {
implementation 'io.sentry:sentry:6.3.1'
implementation 'io.swagger:swagger-annotations:1.6.2'

annotationProcessor platform(libs.micronaut.bom)
annotationProcessor libs.bundles.micronaut.annotation.processor
annotationProcessor libs.micronaut.jaxrs.processor

implementation platform(libs.micronaut.bom)
implementation libs.bundles.micronaut
implementation libs.micronaut.jaxrs.server

// Ensure that the versions defined in deps.toml are used
// instead of versions from transitive dependencies
implementation(libs.flyway.core) {
force = true
}

testImplementation project(':airbyte-test-utils')
testImplementation libs.postgresql
testImplementation libs.platform.testcontainers.postgresql
Expand Down
10 changes: 10 additions & 0 deletions airbyte-workers/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ dependencies {
implementation (libs.jooq) {
force = true
}
implementation(libs.s3) {
// Force to avoid updated version brought in transitively from Micronaut 3.8+
// that is incompatible with our current Helm setup
force = true
}
implementation(libs.aws.java.sdk.s3) {
// Force to avoid updated version brought in transitively from Micronaut 3.8+
// that is incompatible with our current Helm setup
force = true
}

implementation 'com.google.auth:google-auth-library-oauth2-http:1.4.0'
implementation 'com.auth0:java-jwt:3.19.2'
Expand Down
14 changes: 7 additions & 7 deletions deps.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ connectors-testcontainers-pulsar = "1.16.2"
connectors-testcontainers-scylla = "1.16.2"
connectors-testcontainers-tidb = "1.16.3"
datadog-version = "0.111.0"
fasterxml_version = "2.13.3"
fasterxml_version = "2.14.0"
flyway = "7.14.0"
glassfish_version = "2.31"
hikaricp = "5.0.1"
jmh = "1.36"
jooq = "3.13.4"
junit-jupiter = "5.9.0"
junit-jupiter = "5.9.1"
log4j = "2.17.2"
lombok = "1.18.24"
micronaut = "3.7.4"
micronaut-test = "3.7.0"
micronaut = "3.8.0"
micronaut-test = "3.8.0"
platform-testcontainers = "1.17.3"
postgresql = "42.3.5"
slf4j = "1.7.36"
Expand Down Expand Up @@ -111,8 +111,8 @@ hibernate-types = { module = "com.vladmihalcea:hibernate-types-52", version = "2
jakarta-inject = { module = "jakarta.annotation:jakarta.annotation-api", version = "2.1.1" }
javax-transaction = { module = "javax.transaction:javax.transaction-api", version = "1.3" }
micronaut-bom = { module = "io.micronaut:micronaut-bom", version.ref = "micronaut" }
micronaut-data-tx = { module = "io.micronaut.data:micronaut-data-tx", version = "3.8.1" }
micronaut-data-processor = { module = "io.micronaut.data:micronaut-data-processor", version = "3.8.1" }
micronaut-data-processor = { module = "io.micronaut.data:micronaut-data-processor", version = "3.9.3" }
micronaut-data-tx = { module = "io.micronaut.data:micronaut-data-tx", version = "3.9.3" }
micronaut-flyway = { module = "io.micronaut.flyway:micronaut-flyway", version = "5.4.1" }
micronaut-inject = { module = "io.micronaut:micronaut-inject" }
micronaut-http-client = { module = "io.micronaut:micronaut-http-client" }
Expand All @@ -125,7 +125,7 @@ micronaut-jdbc-hikari = { module = "io.micronaut.sql:micronaut-jdbc-hikari" }
micronaut-jooq = { module = "io.micronaut.sql:micronaut-jooq" }
micronaut-management = { module = "io.micronaut:micronaut-management" }
micronaut-runtime = { module = "io.micronaut:micronaut-runtime" }
micronaut-security = { module = "io.micronaut.security:micronaut-security", version = "3.8.3" }
micronaut-security = { module = "io.micronaut.security:micronaut-security", version = "3.9.0" }
micronaut-test-core = { module = "io.micronaut.test:micronaut-test-core", version.ref = "micronaut-test" }
micronaut-test-junit5 = { module = "io.micronaut.test:micronaut-test-junit5", version.ref = "micronaut-test" }
micronaut-validation = { module = "io.micronaut:micronaut-validation" }
Expand Down

0 comments on commit e571b2b

Please sign in to comment.