This is an automated email from the ASF dual-hosted git repository.
mbalassi pushed a commit to branch release-1.16.0.1-acs
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 683e8a2acafcf882129da59e129ae169a55ef527
Author: Marton Balassi <mar...@apple.com>
AuthorDate: Tue Oct 4 21:32:53 2022 +0200
[apple][build] Minor build fixes after 1.16-acs bump
---
.../flink-sql-connector-hive-3.1.3.0-apple/pom.xml | 2 +-
flink-dist/pom.xml | 2 +-
pom.xml | 4 ++++
rio.yml | 16 ++++++++--------
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/flink-connectors/flink-sql-connector-hive-3.1.3.0-apple/pom.xml
b/flink-connectors/flink-sql-connector-hive-3.1.3.0-apple/pom.xml
index b44f1f1e8e3..baaa8890ff5 100644
--- a/flink-connectors/flink-sql-connector-hive-3.1.3.0-apple/pom.xml
+++ b/flink-connectors/flink-sql-connector-hive-3.1.3.0-apple/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connectors</artifactId>
- <version>1.15.0-acs-SNAPSHOT</version>
+ <version>1.16.0-acs-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index d901c7faa4d..b617e6dd478 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -35,7 +35,7 @@ under the License.
<properties>
<zookeeper.optional.version>3.6.3</zookeeper.optional.version>
<japicmp.skip>true</japicmp.skip>
- <acs.flink.libs.version>1.15-SNAPSHOT</acs.flink.libs.version>
+ <acs.flink.libs.version>1.16-SNAPSHOT</acs.flink.libs.version>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index b13848152b0..725c111fa84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1610,6 +1610,10 @@ under the License.
<!-- AWS SDK config that does
not support license headers -->
<exclude>**/awssdk/global/handlers/execution.interceptors</exclude>
+
+ <!-- Apple Internal -->
+ <exclude>apple/**</exclude>
+ <exclude>rio.yml</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/rio.yml b/rio.yml
index 1685b89887c..7cf48663003 100644
--- a/rio.yml
+++ b/rio.yml
@@ -3,8 +3,8 @@ timeout: 120
pipelines:
# Pipeline to build Flink from Apple branch.
- - name: publish-release-1.15-acs
- branchName: release-1.15-acs
+ - name: publish-release-1.16-acs
+ branchName: release-1.16-acs
machine:
baseImage: docker.apple.com/thomas-weise/flink-ci:latest
env:
@@ -35,7 +35,7 @@ pipelines:
version: "1-r${RIO_BUILD_NUMBER}"
extraTags: [ "latest", "1-latest" ]
publish:
- - repo: docker.apple.com/acs-flink/flink-1.15-acs
+ - repo: docker.apple.com/acs-flink/flink-1.16-acs
- dockerfilePath: apple/docker/Dockerfile
target: hadoop
context: apple/docker/
@@ -43,10 +43,10 @@ pipelines:
version: "1-r${RIO_BUILD_NUMBER}"
extraTags: [ "latest", "1-latest" ]
publish:
- - repo: docker.apple.com/acs-flink/flink-1.15-acs-hadoop
+ - repo: docker.apple.com/acs-flink/flink-1.16-acs-hadoop
- - name: binary-release-1.15-acs
- branchName: release-1.15-acs
+ - name: binary-release-1.16-acs
+ branchName: release-1.16-acs
machine:
baseImage: docker.apple.com/thomas-weise/flink-ci:latest
build:
@@ -69,8 +69,8 @@ pipelines:
- publish:
- repo: oss-patched-binaries-local
- - name: pull-request-release-1.15-acs
- branchName: release-1.15-acs
+ - name: pull-request-release-1.16-acs
+ branchName: release-1.16-acs
timeout: 600
machine:
baseImage: docker.apple.com/thomas-weise/flink-ci:latest
