From 2a88f1f7325b1c476d2e6e2c87b170abfac4215c Mon Sep 17 00:00:00 2001 From: Sergey Nuyanzin Date: Fri, 26 Apr 2024 13:51:45 +0200 Subject: [PATCH 1/2] [hotfix] Revert revisions --- flink-connector-opensearch-base/pom.xml | 2 +- flink-connector-opensearch-e2e-tests/pom.xml | 2 +- flink-connector-opensearch/pom.xml | 2 +- flink-connector-opensearch2-e2e-tests/pom.xml | 2 +- flink-connector-opensearch2/pom.xml | 2 +- flink-sql-connector-opensearch/pom.xml | 2 +- flink-sql-connector-opensearch2/pom.xml | 2 +- pom.xml | 4 +--- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/flink-connector-opensearch-base/pom.xml b/flink-connector-opensearch-base/pom.xml index 1e50c36..de813ea 100644 --- a/flink-connector-opensearch-base/pom.xml +++ b/flink-connector-opensearch-base/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT flink-connector-opensearch-base diff --git a/flink-connector-opensearch-e2e-tests/pom.xml b/flink-connector-opensearch-e2e-tests/pom.xml index 99a69df..95346ac 100644 --- a/flink-connector-opensearch-e2e-tests/pom.xml +++ b/flink-connector-opensearch-e2e-tests/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT flink-connector-opensearch-e2e-tests diff --git a/flink-connector-opensearch/pom.xml b/flink-connector-opensearch/pom.xml index 9ceaf4d..91d8d92 100644 --- a/flink-connector-opensearch/pom.xml +++ b/flink-connector-opensearch/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT flink-connector-opensearch diff --git a/flink-connector-opensearch2-e2e-tests/pom.xml b/flink-connector-opensearch2-e2e-tests/pom.xml index c9cd5c3..e294ad7 100644 --- a/flink-connector-opensearch2-e2e-tests/pom.xml +++ b/flink-connector-opensearch2-e2e-tests/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT flink-connector-opensearch2-e2e-tests diff --git a/flink-connector-opensearch2/pom.xml b/flink-connector-opensearch2/pom.xml index 2edb984..e1bbe18 100644 --- a/flink-connector-opensearch2/pom.xml +++ b/flink-connector-opensearch2/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT flink-connector-opensearch2 diff --git a/flink-sql-connector-opensearch/pom.xml b/flink-sql-connector-opensearch/pom.xml index 51b76e3..cdcf927 100644 --- a/flink-sql-connector-opensearch/pom.xml +++ b/flink-sql-connector-opensearch/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT flink-sql-connector-opensearch diff --git a/flink-sql-connector-opensearch2/pom.xml b/flink-sql-connector-opensearch2/pom.xml index 1e02bc4..88a52fa 100644 --- a/flink-sql-connector-opensearch2/pom.xml +++ b/flink-sql-connector-opensearch2/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT flink-sql-connector-opensearch2 diff --git a/pom.xml b/pom.xml index ea5c291..e775f25 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ under the License. 4.0.0 flink-connector-opensearch-parent - ${revision} + 2.0-SNAPSHOT Flink : Connectors : Opensearch : Parent pom https://flink.apache.org @@ -55,8 +55,6 @@ under the License. - 1.2-SNAPSHOT - ${flink.connector.opensearch.parent.revision} 1.18.0 1.26.1 2.16.2 From 60e1a4a14849fb488217546a7f00d106c9861c7b Mon Sep 17 00:00:00 2001 From: Sergey Nuyanzin Date: Sat, 11 May 2024 10:54:57 +0200 Subject: [PATCH 2/2] [hotfix] Use 1.1 branch during weekly instead of 1.0 --- .github/workflows/weekly.yml | 7 ++----- .../src/test/resources/archunit.properties | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index ba6746d..80c0ae6 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -30,9 +30,6 @@ jobs: strategy: matrix: flink_branches: [ { - flink: 1.17-SNAPSHOT, - branch: main - }, { flink: 1.18-SNAPSHOT, jdk: '8, 11', branch: main @@ -46,10 +43,10 @@ jobs: branch: main }, { flink: 1.17.2, - branch: v1.0 + branch: v1.1 }, { flink: 1.18.1, - branch: v1.0 + branch: v1.1 }] uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils with: diff --git a/flink-connector-opensearch2/src/test/resources/archunit.properties b/flink-connector-opensearch2/src/test/resources/archunit.properties index 519cc60..48011f9 100644 --- a/flink-connector-opensearch2/src/test/resources/archunit.properties +++ b/flink-connector-opensearch2/src/test/resources/archunit.properties @@ -17,7 +17,7 @@ # # By default we allow removing existing violations, but fail when new violations are added. -@freeze.store.default.allowStoreUpdate=true +freeze.store.default.allowStoreUpdate=true # Enable this if a new (frozen) rule has been added in order to create the initial store and record the existing violations. #freeze.store.default.allowStoreCreation=true