This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/flink-connector-elasticsearch.git
The following commit(s) were added to refs/heads/main by this push:
new a5ee998 [hotfix] Fix Elasticsearch nightly CI failure (#55)
a5ee998 is described below
commit a5ee99887d7068eee709cd9271d519fd8aa10c79
Author: MartijnVisser <[email protected]>
AuthorDate: Tue Apr 4 18:45:57 2023 +0200
[hotfix] Fix Elasticsearch nightly CI failure (#55)
* [hotfix] Remove archunit to avoid issues with the weekly builds, given
that the version of Archunit can differ between Flink versions. Instead, it
will rely on flink-architecture-tests-test dependencies.
* [hotfix] Set correct groupId for `flink-connector-parent`
* [hotfix] Set japicmp to latest version of this released connector, which
is 3.0.0-1.16
* [hotfix] Update to Flink 1.17 and match other dependencies to the version
used in that Flink version
* [hotfix] Test CI builds against Flink 1.17.0 instead of Flink 1.16.0 and
run the weekly builds against 1.16-SNAPSHOT, 1.17-SNAPSHOT and 1.18-SNAPSHOT
* [hotfix] Allow manually running of weekly CI builds
* [hotfix] Resolve dependency convergence on `byte-buddy`
* [hotfix] To allow all Archunit rules to be evaluated without checking any
classes
---
.github/workflows/push_pr.yml | 2 +-
.github/workflows/release.yml | 31 ---------------
.github/workflows/weekly.yml | 3 +-
.../src/test/resources/archunit.properties | 2 +
.../src/test/resources/archunit.properties | 2 +
.../src/test/resources/archunit.properties | 2 +
pom.xml | 45 +++++++++++-----------
7 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index e1ba2d4..335f108 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -25,4 +25,4 @@ jobs:
compile_and_test:
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
- flink_version: 1.16.0
+ flink_version: 1.17.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index e080288..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-################################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-name: Release Build
-on:
- workflow_dispatch:
-jobs:
- compile_and_test:
- if: github.repository_owner == 'apache'
- strategy:
- matrix:
- flink: [1.16.1, 1.17.0]
- uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
- with:
- flink_version: ${{ matrix.flink }}
- run_dependency_convergence: false
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 76c0f74..f4645db 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -20,12 +20,13 @@ name: Nightly
on:
schedule:
- cron: "0 0 * * 0"
+ workflow_dispatch:
jobs:
compile_and_test:
if: github.repository_owner == 'apache'
strategy:
matrix:
- flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT]
+ flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
diff --git
a/flink-connector-elasticsearch-base/src/test/resources/archunit.properties
b/flink-connector-elasticsearch-base/src/test/resources/archunit.properties
index 15be88c..48011f9 100644
--- a/flink-connector-elasticsearch-base/src/test/resources/archunit.properties
+++ b/flink-connector-elasticsearch-base/src/test/resources/archunit.properties
@@ -29,3 +29,5 @@ freeze.store.default.allowStoreUpdate=true
#freeze.refreeze=true
freeze.store.default.path=archunit-violations
+
+archRule.failOnEmptyShould = false
diff --git
a/flink-connector-elasticsearch6/src/test/resources/archunit.properties
b/flink-connector-elasticsearch6/src/test/resources/archunit.properties
index 15be88c..48011f9 100644
--- a/flink-connector-elasticsearch6/src/test/resources/archunit.properties
+++ b/flink-connector-elasticsearch6/src/test/resources/archunit.properties
@@ -29,3 +29,5 @@ freeze.store.default.allowStoreUpdate=true
#freeze.refreeze=true
freeze.store.default.path=archunit-violations
+
+archRule.failOnEmptyShould = false
diff --git
a/flink-connector-elasticsearch7/src/test/resources/archunit.properties
b/flink-connector-elasticsearch7/src/test/resources/archunit.properties
index 15be88c..48011f9 100644
--- a/flink-connector-elasticsearch7/src/test/resources/archunit.properties
+++ b/flink-connector-elasticsearch7/src/test/resources/archunit.properties
@@ -29,3 +29,5 @@ freeze.store.default.allowStoreUpdate=true
#freeze.refreeze=true
freeze.store.default.path=archunit-violations
+
+archRule.failOnEmptyShould = false
diff --git a/pom.xml b/pom.xml
index 52f22f4..529c5a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,9 +20,9 @@ under the License.
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<parent>
- <groupId>io.github.zentol.flink</groupId>
+ <groupId>org.apache.flink</groupId>
<artifactId>flink-connector-parent</artifactId>
- <version>1.0</version>
+ <version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -50,19 +50,18 @@ under the License.
</modules>
<properties>
- <flink.version>1.16.0</flink.version>
- <flink.shaded.version>15.0</flink.shaded.version>
+ <flink.version>1.17.0</flink.version>
+ <flink.shaded.version>16.1</flink.shaded.version>
<jackson-bom.version>2.13.4.20221013</jackson-bom.version>
<junit4.version>4.13.2</junit4.version>
- <junit5.version>5.8.1</junit5.version>
- <assertj.version>3.21.0</assertj.version>
- <archunit.version>0.22.0</archunit.version>
+ <junit5.version>5.9.1</junit5.version>
+ <assertj.version>3.23.1</assertj.version>
<testcontainers.version>1.17.2</testcontainers.version>
- <mockito.version>2.21.0</mockito.version>
+ <mockito.version>3.4.6</mockito.version>
<japicmp.skip>false</japicmp.skip>
- <japicmp.referenceVersion>1.15.0</japicmp.referenceVersion>
+ <japicmp.referenceVersion>3.0.0-1.16</japicmp.referenceVersion>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.17.2</log4j.version>
@@ -323,33 +322,33 @@ under the License.
<version>2.24.0</version>
</dependency>
- <!-- For dependency convergence -->
+ <!-- For dependency convergence -->
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>2.1</version>
</dependency>
+ <!-- For dependency convergence on mockito/powermock
mismatch -->
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers-bom</artifactId>
- <version>${testcontainers.version}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.10.14</version>
</dependency>
+ <!-- For dependency convergence on mockito/powermock
mismatch -->
<dependency>
- <groupId>com.tngtech.archunit</groupId>
- <artifactId>archunit</artifactId>
- <version>${archunit.version}</version>
- <scope>test</scope>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>1.10.14</version>
</dependency>
<dependency>
- <groupId>com.tngtech.archunit</groupId>
- <artifactId>archunit-junit5</artifactId>
- <version>${archunit.version}</version>
- <scope>test</scope>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers-bom</artifactId>
+ <version>${testcontainers.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
