You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2021/12/12 18:40:39 UTC
[iceberg] branch master updated: Flink: Move iceberg-flink-runtime Flink version to match Spark (#3713)
This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 7af3a58 Flink: Move iceberg-flink-runtime Flink version to match Spark (#3713)
7af3a58 is described below
commit 7af3a587a4c9c8a5fb8a05450e26e10bba821c5f
Author: Kyle Bendickson <kj...@gmail.com>
AuthorDate: Sun Dec 12 10:40:32 2021 -0800
Flink: Move iceberg-flink-runtime Flink version to match Spark (#3713)
---
.github/workflows/flink-ci.yml | 2 +-
flink/v1.12/build.gradle | 4 ++--
flink/v1.13/build.gradle | 4 ++--
flink/v1.14/build.gradle | 4 ++--
settings.gradle | 18 +++++++++---------
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/flink-ci.yml b/.github/workflows/flink-ci.yml
index 840ec33..ebcbf91 100644
--- a/.github/workflows/flink-ci.yml
+++ b/.github/workflows/flink-ci.yml
@@ -73,7 +73,7 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
- - run: ./gradlew -DsparkVersions= -DhiveVersions= -DflinkVersions=${{ matrix.flink }} :iceberg-flink:iceberg-flink-${{ matrix.flink }}:check :iceberg-flink:iceberg-flink-${{ matrix.flink }}-runtime:check -Pquick=true -x javadoc
+ - run: ./gradlew -DsparkVersions= -DhiveVersions= -DflinkVersions=${{ matrix.flink }} :iceberg-flink:iceberg-flink-${{ matrix.flink }}:check :iceberg-flink:iceberg-flink-runtime-${{ matrix.flink }}:check -Pquick=true -x javadoc
- uses: actions/upload-artifact@v2
if: failure()
with:
diff --git a/flink/v1.12/build.gradle b/flink/v1.12/build.gradle
index 2dd474e..f8e6912 100644
--- a/flink/v1.12/build.gradle
+++ b/flink/v1.12/build.gradle
@@ -19,7 +19,7 @@
def flinkProjects = [
project(':iceberg-flink:iceberg-flink-1.12'),
- project(':iceberg-flink:iceberg-flink-1.12-runtime')
+ project(':iceberg-flink:iceberg-flink-runtime-1.12')
]
configure(flinkProjects) {
@@ -118,7 +118,7 @@ project(':iceberg-flink:iceberg-flink-1.12') {
}
}
-project(':iceberg-flink:iceberg-flink-1.12-runtime') {
+project(':iceberg-flink:iceberg-flink-runtime-1.12') {
apply plugin: 'com.github.johnrengelman.shadow'
tasks.jar.dependsOn tasks.shadowJar
diff --git a/flink/v1.13/build.gradle b/flink/v1.13/build.gradle
index 0e97de3..f3a66c7 100644
--- a/flink/v1.13/build.gradle
+++ b/flink/v1.13/build.gradle
@@ -19,7 +19,7 @@
def flinkProjects = [
project(':iceberg-flink:iceberg-flink-1.13'),
- project(':iceberg-flink:iceberg-flink-1.13-runtime')
+ project(':iceberg-flink:iceberg-flink-runtime-1.13')
]
configure(flinkProjects) {
@@ -118,7 +118,7 @@ project(':iceberg-flink:iceberg-flink-1.13') {
}
}
-project(':iceberg-flink:iceberg-flink-1.13-runtime') {
+project(':iceberg-flink:iceberg-flink-runtime-1.13') {
apply plugin: 'com.github.johnrengelman.shadow'
tasks.jar.dependsOn tasks.shadowJar
diff --git a/flink/v1.14/build.gradle b/flink/v1.14/build.gradle
index 2b2df13..dc2ce3c 100644
--- a/flink/v1.14/build.gradle
+++ b/flink/v1.14/build.gradle
@@ -19,7 +19,7 @@
def flinkProjects = [
project(':iceberg-flink:iceberg-flink-1.14'),
- project(':iceberg-flink:iceberg-flink-1.14-runtime')
+ project(':iceberg-flink:iceberg-flink-runtime-1.14')
]
configure(flinkProjects) {
@@ -116,7 +116,7 @@ project(':iceberg-flink:iceberg-flink-1.14') {
}
}
-project(':iceberg-flink:iceberg-flink-1.14-runtime') {
+project(':iceberg-flink:iceberg-flink-runtime-1.14') {
apply plugin: 'com.github.johnrengelman.shadow'
tasks.jar.dependsOn tasks.shadowJar
diff --git a/settings.gradle b/settings.gradle
index de23d25..d6d27bb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -79,29 +79,29 @@ if (!flinkVersions.isEmpty()) {
if (flinkVersions.contains("1.12")) {
include ':iceberg-flink:flink-1.12'
- include ':iceberg-flink:flink-1.12-runtime'
+ 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-1.12-runtime').projectDir = file('flink/v1.12/flink-runtime')
- project(':iceberg-flink:flink-1.12-runtime').name = 'iceberg-flink-1.12-runtime'
+ 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'
- include ':iceberg-flink:flink-1.13-runtime'
+ 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-1.13-runtime').projectDir = file('flink/v1.13/flink-runtime')
- project(':iceberg-flink:flink-1.13-runtime').name = 'iceberg-flink-1.13-runtime'
+ 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'
- include ':iceberg-flink:flink-1.14-runtime'
+ 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-1.14-runtime').projectDir = file('flink/v1.14/flink-runtime')
- project(':iceberg-flink:flink-1.14-runtime').name = 'iceberg-flink-1.14-runtime'
+ 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")) {