Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/java-sdk-dependency-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ jobs:
with:
build-root-directory: java-sdk/example
dependency-graph: generate-and-submit
gradle-version: "8.14.4"
gradle-version: "8.14.5"
- name: Submit Scala Spark example dependency graph
uses: gradle/actions/dependency-submission@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
with:
build-root-directory: java-sdk/scala_spark_example
dependency-graph: generate-and-submit
gradle-version: "8.14.4"
gradle-version: "8.14.5"
2 changes: 1 addition & 1 deletion java-sdk/buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ java {
kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_11 } }

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.10")
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
implementation("org.jlleitschuh.gradle:ktlint-gradle:14.0.1")
}
962 changes: 445 additions & 517 deletions java-sdk/gradle/verification-metadata.xml
Comment thread
jason810496 marked this conversation as resolved.
Resolved

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions java-sdk/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
distributionSha256Sum=6f74b601422d6d6fc4e1f9a1ab6522f642c2fdcbc15ae33ebd30ba3d7198e854
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
18 changes: 18 additions & 0 deletions java-sdk/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions java-sdk/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions java-sdk/scala_spark_example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ dependencies {
// Routes this bundle's Log4j 2 logging (and Spark's own) into Airflow task logs.
implementation("org.apache.airflow:airflow-sdk-log4j2:${projectVersion}")

// Spark 3.5.x ships its 2.13 artifacts built against Scala 2.13.8.
implementation("org.scala-lang:scala-library:2.13.8")
implementation("org.apache.spark:spark-sql_2.13:3.5.8")
// Spark 3.5.x uses Scala 2.13; keep the runtime on the latest compatible patch.
implementation("org.scala-lang:scala-library:2.13.18")
implementation("org.apache.spark:spark-sql_2.13:3.5.9")

// Spark pins Log4j 2 to 2.20.0 and airflow-sdk-log4j2 to 2.26.0; align the
// whole family onto one version so the AirflowAppender's api/core agree.
implementation(platform("org.apache.logging.log4j:log4j-bom:2.26.0"))
// Align Spark and airflow-sdk-log4j2 on one Log4j version so the
// AirflowAppender's api/core agree.
implementation(platform("org.apache.logging.log4j:log4j-bom:2.26.1"))
}

java {
Expand Down
28 changes: 15 additions & 13 deletions java-sdk/sdk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ plugins {
id("airflow-publish")
id("org.jetbrains.dokka") version "2.2.0"
id("org.jetbrains.dokka-javadoc") version "2.2.0"
// jsonschema2pojo 1.3.3 targets Java 17:
// https://github.com/joelittlejohn/jsonschema2pojo/blob/jsonschema2pojo-1.3.3/jsonschema2pojo-gradle-plugin/build.gradle#L45-L48
id("org.jsonschema2pojo") version "1.2.2"
kotlin("plugin.serialization") version "2.3.0"
kotlin("plugin.serialization") version "2.4.10"
}

val schemaBaseUrl = "https://airflow.staged.apache.org/schemas/supervisor-schema"
Expand All @@ -43,21 +45,21 @@ val schemaModelsDir = layout.buildDirectory.dir("generate-resources/main/src/mai
val discriminatorDir = layout.buildDirectory.dir("generated-resources/main/src/main/kotlin")

dependencies {
compileOnly("com.github.spotbugs:spotbugs-annotations:4.9.8")
compileOnly("com.github.spotbugs:spotbugs-annotations:4.10.3")
compileOnly("javax.annotation:javax.annotation-api:1.3.2")

implementation("com.fasterxml.jackson.core:jackson-annotations:2.21")
implementation("com.fasterxml.jackson.core:jackson-core:2.21.4")
implementation("com.fasterxml.jackson.core:jackson-databind:2.21.5")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.0")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.0")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.22")
implementation("com.fasterxml.jackson.core:jackson-core:2.22.1")
implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.22.1")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.1")
implementation("com.xenomachina:kotlin-argparser:2.0.7")
implementation("io.ktor:ktor-network:3.3.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.7.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
implementation("org.msgpack:msgpack-core:0.9.11")
implementation("org.msgpack:jackson-dataformat-msgpack:0.9.11")
implementation("io.ktor:ktor-network:3.5.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.8.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
implementation("org.msgpack:msgpack-core:0.9.12")
implementation("org.msgpack:jackson-dataformat-msgpack:0.9.12")

testImplementation(kotlin("test"))
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
Expand Down
Loading