Skip to content

Flink: Remove the scala version suffix from artifact names. #4193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openinx merged 1 commit into from
Feb 26, 2022
Merged

Flink: Remove the scala version suffix from artifact names. #4193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions flink/v1.12/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ String flinkVersion = '1.12.5'
String flinkMajorVersion = '1.12'
String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")

project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {

dependencies {
implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
Expand Down Expand Up @@ -111,7 +111,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
}
}

project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'

tasks.jar.dependsOn tasks.shadowJar
Expand All @@ -131,7 +131,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersio
}

dependencies {
implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}")
implementation project(':iceberg-aws')
implementation(project(':iceberg-aliyun')) {
exclude group: 'edu.umd.cs.findbugs', module: 'findbugs'
Expand Down
6 changes: 3 additions & 3 deletions flink/v1.13/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ String flinkVersion = '1.13.2'
String flinkMajorVersion = '1.13'
String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")

project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {

dependencies {
implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
Expand Down Expand Up @@ -111,7 +111,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
}
}

project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'

tasks.jar.dependsOn tasks.shadowJar
Expand All @@ -131,7 +131,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersio
}

dependencies {
implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}")
implementation project(':iceberg-aws')
implementation(project(':iceberg-aliyun')) {
exclude group: 'edu.umd.cs.findbugs', module: 'findbugs'
Expand Down
6 changes: 3 additions & 3 deletions flink/v1.14/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ String flinkVersion = '1.14.0'
String flinkMajorVersion = '1.14'
String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")

project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {

dependencies {
implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
Expand Down Expand Up @@ -109,7 +109,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
}
}

project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
apply plugin: 'com.github.johnrengelman.shadow'

tasks.jar.dependsOn tasks.shadowJar
Expand All @@ -129,7 +129,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersio
}

dependencies {
implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}")
implementation project(':iceberg-aws')
implementation(project(':iceberg-aliyun')) {
exclude group: 'edu.umd.cs.findbugs', module: 'findbugs'
Expand Down
36 changes: 18 additions & 18 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,30 +89,30 @@ if (!flinkVersions.isEmpty()) {
}

if (flinkVersions.contains("1.12")) {
include ":iceberg-flink:flink-1.12_${scalaVersion}"
include ":iceberg-flink:flink-runtime-1.12_${scalaVersion}"
project(":iceberg-flink:flink-1.12_${scalaVersion}").projectDir = file('flink/v1.12/flink')
project(":iceberg-flink:flink-1.12_${scalaVersion}").name = "iceberg-flink-1.12_${scalaVersion}"
project(":iceberg-flink:flink-runtime-1.12_${scalaVersion}").projectDir = file('flink/v1.12/flink-runtime')
project(":iceberg-flink:flink-runtime-1.12_${scalaVersion}").name = "iceberg-flink-runtime-1.12_${scalaVersion}"
include ":iceberg-flink:flink-1.12"
include ":iceberg-flink:flink-runtime-1.12"
project(":iceberg-flink:flink-1.12").projectDir = file('flink/v1.12/flink')
project(":iceberg-flink:flink-1.12").name = "iceberg-flink-1.12"
project(":iceberg-flink:flink-runtime-1.12").projectDir = file('flink/v1.12/flink-runtime')
project(":iceberg-flink:flink-runtime-1.12").name = "iceberg-flink-runtime-1.12"
}

if (flinkVersions.contains("1.13")) {
include ":iceberg-flink:flink-1.13_${scalaVersion}"
include ":iceberg-flink:flink-runtime-1.13_${scalaVersion}"
project(":iceberg-flink:flink-1.13_${scalaVersion}").projectDir = file('flink/v1.13/flink')
project(":iceberg-flink:flink-1.13_${scalaVersion}").name = "iceberg-flink-1.13_${scalaVersion}"
project(":iceberg-flink:flink-runtime-1.13_${scalaVersion}").projectDir = file('flink/v1.13/flink-runtime')
project(":iceberg-flink:flink-runtime-1.13_${scalaVersion}").name = "iceberg-flink-runtime-1.13_${scalaVersion}"
include ":iceberg-flink:flink-1.13"
include ":iceberg-flink:flink-runtime-1.13"
project(":iceberg-flink:flink-1.13").projectDir = file('flink/v1.13/flink')
project(":iceberg-flink:flink-1.13").name = "iceberg-flink-1.13"
project(":iceberg-flink:flink-runtime-1.13").projectDir = file('flink/v1.13/flink-runtime')
project(":iceberg-flink:flink-runtime-1.13").name = "iceberg-flink-runtime-1.13"
}

if (flinkVersions.contains("1.14")) {
include ":iceberg-flink:flink-1.14_${scalaVersion}"
include ":iceberg-flink:flink-runtime-1.14_${scalaVersion}"
project(":iceberg-flink:flink-1.14_${scalaVersion}").projectDir = file('flink/v1.14/flink')
project(":iceberg-flink:flink-1.14_${scalaVersion}").name = "iceberg-flink-1.14_${scalaVersion}"
project(":iceberg-flink:flink-runtime-1.14_${scalaVersion}").projectDir = file('flink/v1.14/flink-runtime')
project(":iceberg-flink:flink-runtime-1.14_${scalaVersion}").name = "iceberg-flink-runtime-1.14_${scalaVersion}"
include ":iceberg-flink:flink-1.14"
include ":iceberg-flink:flink-runtime-1.14"
project(":iceberg-flink:flink-1.14").projectDir = file('flink/v1.14/flink')
project(":iceberg-flink:flink-1.14").name = "iceberg-flink-1.14"
project(":iceberg-flink:flink-runtime-1.14").projectDir = file('flink/v1.14/flink-runtime')
project(":iceberg-flink:flink-runtime-1.14").name = "iceberg-flink-runtime-1.14"
}

if (sparkVersions.contains("3.0")) {
Expand Down